Skip to content

Commit befa89b

Browse files
a60814billya60814billy
committed
Merge branch 'use_javascript_standard_style'
Introduce JavaScript Standard Style Signed-off-by: BoHong Li <a60814billy@gmail.com>
2 parents 747da67 + 5bc642d commit befa89b

40 files changed

Lines changed: 10539 additions & 10844 deletions

‎app.js‎

Lines changed: 556 additions & 554 deletions
Large diffs are not rendered by default.

‎lib/auth.js‎

Lines changed: 175 additions & 173 deletions
Original file line numberDiff line numberDiff line change
@@ -1,190 +1,192 @@
1-
//auth
2-
//external modules
3-
var passport = require('passport');
4-
var FacebookStrategy = require('passport-facebook').Strategy;
5-
var TwitterStrategy = require('passport-twitter').Strategy;
6-
var GithubStrategy = require('passport-github').Strategy;
7-
var GitlabStrategy = require('passport-gitlab2').Strategy;
8-
var DropboxStrategy = require('passport-dropbox-oauth2').Strategy;
9-
var GoogleStrategy = require('passport-google-oauth20').Strategy;
10-
var LdapStrategy = require('passport-ldapauth');
11-
var LocalStrategy = require('passport-local').Strategy;
12-
var validator = require('validator');
1+
// auth
2+
// external modules
3+
var passport = require('passport')
4+
var FacebookStrategy = require('passport-facebook').Strategy
5+
var TwitterStrategy = require('passport-twitter').Strategy
6+
var GithubStrategy = require('passport-github').Strategy
7+
var GitlabStrategy = require('passport-gitlab2').Strategy
8+
var DropboxStrategy = require('passport-dropbox-oauth2').Strategy
9+
var GoogleStrategy = require('passport-google-oauth20').Strategy
10+
var LdapStrategy = require('passport-ldapauth')
11+
var LocalStrategy = require('passport-local').Strategy
12+
var validator = require('validator')
1313

14-
//core
15-
var config = require('./config.js');
16-
var logger = require("./logger.js");
17-
var models = require("./models");
14+
// core
15+
var config = require('./config.js')
16+
var logger = require('./logger.js')
17+
var models = require('./models')
1818

19-
function callback(accessToken, refreshToken, profile, done) {
20-
//logger.info(profile.displayName || profile.username);
21-
var stringifiedProfile = JSON.stringify(profile);
22-
models.User.findOrCreate({
23-
where: {
24-
profileid: profile.id.toString()
25-
},
26-
defaults: {
27-
profile: stringifiedProfile,
28-
accessToken: accessToken,
29-
refreshToken: refreshToken
30-
}
31-
}).spread(function (user, created) {
32-
if (user) {
33-
var needSave = false;
34-
if (user.profile != stringifiedProfile) {
35-
user.profile = stringifiedProfile;
36-
needSave = true;
37-
}
38-
if (user.accessToken != accessToken) {
39-
user.accessToken = accessToken;
40-
needSave = true;
41-
}
42-
if (user.refreshToken != refreshToken) {
43-
user.refreshToken = refreshToken;
44-
needSave = true;
45-
}
46-
if (needSave) {
47-
user.save().then(function () {
48-
if (config.debug)
49-
logger.info('user login: ' + user.id);
50-
return done(null, user);
51-
});
52-
} else {
53-
if (config.debug)
54-
logger.info('user login: ' + user.id);
55-
return done(null, user);
56-
}
57-
}
58-
}).catch(function (err) {
59-
logger.error('auth callback failed: ' + err);
60-
return done(err, null);
61-
});
19+
function callback (accessToken, refreshToken, profile, done) {
20+
// logger.info(profile.displayName || profile.username);
21+
var stringifiedProfile = JSON.stringify(profile)
22+
models.User.findOrCreate({
23+
where: {
24+
profileid: profile.id.toString()
25+
},
26+
defaults: {
27+
profile: stringifiedProfile,
28+
accessToken: accessToken,
29+
refreshToken: refreshToken
30+
}
31+
}).spread(function (user, created) {
32+
if (user) {
33+
var needSave = false
34+
if (user.profile !== stringifiedProfile) {
35+
user.profile = stringifiedProfile
36+
needSave = true
37+
}
38+
if (user.accessToken !== accessToken) {
39+
user.accessToken = accessToken
40+
needSave = true
41+
}
42+
if (user.refreshToken !== refreshToken) {
43+
user.refreshToken = refreshToken
44+
needSave = true
45+
}
46+
if (needSave) {
47+
user.save().then(function () {
48+
if (config.debug) { logger.info('user login: ' + user.id) }
49+
return done(null, user)
50+
})
51+
} else {
52+
if (config.debug) { logger.info('user login: ' + user.id) }
53+
return done(null, user)
54+
}
55+
}
56+
}).catch(function (err) {
57+
logger.error('auth callback failed: ' + err)
58+
return done(err, null)
59+
})
6260
}
6361

64-
//facebook
65-
if (config.facebook) {
66-
module.exports = passport.use(new FacebookStrategy({
67-
clientID: config.facebook.clientID,
68-
clientSecret: config.facebook.clientSecret,
69-
callbackURL: config.serverurl + '/auth/facebook/callback'
70-
}, callback));
71-
}
72-
//twitter
73-
if (config.twitter) {
62+
function registerAuthMethod () {
63+
// facebook
64+
if (config.facebook) {
65+
passport.use(new FacebookStrategy({
66+
clientID: config.facebook.clientID,
67+
clientSecret: config.facebook.clientSecret,
68+
callbackURL: config.serverurl + '/auth/facebook/callback'
69+
}, callback))
70+
}
71+
// twitter
72+
if (config.twitter) {
7473
passport.use(new TwitterStrategy({
75-
consumerKey: config.twitter.consumerKey,
76-
consumerSecret: config.twitter.consumerSecret,
77-
callbackURL: config.serverurl + '/auth/twitter/callback'
78-
}, callback));
79-
}
80-
//github
81-
if (config.github) {
74+
consumerKey: config.twitter.consumerKey,
75+
consumerSecret: config.twitter.consumerSecret,
76+
callbackURL: config.serverurl + '/auth/twitter/callback'
77+
}, callback))
78+
}
79+
// github
80+
if (config.github) {
8281
passport.use(new GithubStrategy({
83-
clientID: config.github.clientID,
84-
clientSecret: config.github.clientSecret,
85-
callbackURL: config.serverurl + '/auth/github/callback'
86-
}, callback));
87-
}
88-
//gitlab
89-
if (config.gitlab) {
82+
clientID: config.github.clientID,
83+
clientSecret: config.github.clientSecret,
84+
callbackURL: config.serverurl + '/auth/github/callback'
85+
}, callback))
86+
}
87+
// gitlab
88+
if (config.gitlab) {
9089
passport.use(new GitlabStrategy({
91-
baseURL: config.gitlab.baseURL,
92-
clientID: config.gitlab.clientID,
93-
clientSecret: config.gitlab.clientSecret,
94-
callbackURL: config.serverurl + '/auth/gitlab/callback'
95-
}, callback));
96-
}
97-
//dropbox
98-
if (config.dropbox) {
90+
baseURL: config.gitlab.baseURL,
91+
clientID: config.gitlab.clientID,
92+
clientSecret: config.gitlab.clientSecret,
93+
callbackURL: config.serverurl + '/auth/gitlab/callback'
94+
}, callback))
95+
}
96+
// dropbox
97+
if (config.dropbox) {
9998
passport.use(new DropboxStrategy({
100-
apiVersion: '2',
101-
clientID: config.dropbox.clientID,
102-
clientSecret: config.dropbox.clientSecret,
103-
callbackURL: config.serverurl + '/auth/dropbox/callback'
104-
}, callback));
105-
}
106-
//google
107-
if (config.google) {
99+
apiVersion: '2',
100+
clientID: config.dropbox.clientID,
101+
clientSecret: config.dropbox.clientSecret,
102+
callbackURL: config.serverurl + '/auth/dropbox/callback'
103+
}, callback))
104+
}
105+
// google
106+
if (config.google) {
108107
passport.use(new GoogleStrategy({
109-
clientID: config.google.clientID,
110-
clientSecret: config.google.clientSecret,
111-
callbackURL: config.serverurl + '/auth/google/callback'
112-
}, callback));
113-
}
108+
clientID: config.google.clientID,
109+
clientSecret: config.google.clientSecret,
110+
callbackURL: config.serverurl + '/auth/google/callback'
111+
}, callback))
112+
}
114113
// ldap
115-
if (config.ldap) {
114+
if (config.ldap) {
116115
passport.use(new LdapStrategy({
117-
server: {
118-
url: config.ldap.url || null,
119-
bindDn: config.ldap.bindDn || null,
120-
bindCredentials: config.ldap.bindCredentials || null,
121-
searchBase: config.ldap.searchBase || null,
122-
searchFilter: config.ldap.searchFilter || null,
123-
searchAttributes: config.ldap.searchAttributes || null,
124-
tlsOptions: config.ldap.tlsOptions || null
125-
},
116+
server: {
117+
url: config.ldap.url || null,
118+
bindDn: config.ldap.bindDn || null,
119+
bindCredentials: config.ldap.bindCredentials || null,
120+
searchBase: config.ldap.searchBase || null,
121+
searchFilter: config.ldap.searchFilter || null,
122+
searchAttributes: config.ldap.searchAttributes || null,
123+
tlsOptions: config.ldap.tlsOptions || null
124+
}
126125
},
127-
function(user, done) {
128-
var profile = {
129-
id: 'LDAP-' + user.uidNumber,
130-
username: user.uid,
131-
displayName: user.displayName,
132-
emails: user.mail ? [user.mail] : [],
133-
avatarUrl: null,
134-
profileUrl: null,
135-
provider: 'ldap',
126+
function (user, done) {
127+
var profile = {
128+
id: 'LDAP-' + user.uidNumber,
129+
username: user.uid,
130+
displayName: user.displayName,
131+
emails: user.mail ? [user.mail] : [],
132+
avatarUrl: null,
133+
profileUrl: null,
134+
provider: 'ldap'
135+
}
136+
var stringifiedProfile = JSON.stringify(profile)
137+
models.User.findOrCreate({
138+
where: {
139+
profileid: profile.id.toString()
140+
},
141+
defaults: {
142+
profile: stringifiedProfile
136143
}
137-
var stringifiedProfile = JSON.stringify(profile);
138-
models.User.findOrCreate({
139-
where: {
140-
profileid: profile.id.toString()
141-
},
142-
defaults: {
143-
profile: stringifiedProfile,
144-
}
145-
}).spread(function (user, created) {
146-
if (user) {
147-
var needSave = false;
148-
if (user.profile != stringifiedProfile) {
149-
user.profile = stringifiedProfile;
150-
needSave = true;
151-
}
152-
if (needSave) {
153-
user.save().then(function () {
154-
if (config.debug)
155-
logger.info('user login: ' + user.id);
156-
return done(null, user);
157-
});
158-
} else {
159-
if (config.debug)
160-
logger.info('user login: ' + user.id);
161-
return done(null, user);
162-
}
163-
}
164-
}).catch(function (err) {
165-
logger.error('ldap auth failed: ' + err);
166-
return done(err, null);
167-
});
168-
}));
169-
}
144+
}).spread(function (user, created) {
145+
if (user) {
146+
var needSave = false
147+
if (user.profile !== stringifiedProfile) {
148+
user.profile = stringifiedProfile
149+
needSave = true
150+
}
151+
if (needSave) {
152+
user.save().then(function () {
153+
if (config.debug) { logger.info('user login: ' + user.id) }
154+
return done(null, user)
155+
})
156+
} else {
157+
if (config.debug) { logger.info('user login: ' + user.id) }
158+
return done(null, user)
159+
}
160+
}
161+
}).catch(function (err) {
162+
logger.error('ldap auth failed: ' + err)
163+
return done(err, null)
164+
})
165+
}))
166+
}
170167
// email
171-
if (config.email) {
168+
if (config.email) {
172169
passport.use(new LocalStrategy({
173-
usernameField: 'email'
170+
usernameField: 'email'
174171
},
175-
function(email, password, done) {
176-
if (!validator.isEmail(email)) return done(null, false);
177-
models.User.findOne({
178-
where: {
179-
email: email
180-
}
181-
}).then(function (user) {
182-
if (!user) return done(null, false);
183-
if (!user.verifyPassword(password)) return done(null, false);
184-
return done(null, user);
185-
}).catch(function (err) {
186-
logger.error(err);
187-
return done(err);
188-
});
189-
}));
172+
function (email, password, done) {
173+
if (!validator.isEmail(email)) return done(null, false)
174+
models.User.findOne({
175+
where: {
176+
email: email
177+
}
178+
}).then(function (user) {
179+
if (!user) return done(null, false)
180+
if (!user.verifyPassword(password)) return done(null, false)
181+
return done(null, user)
182+
}).catch(function (err) {
183+
logger.error(err)
184+
return done(err)
185+
})
186+
}))
187+
}
188+
}
189+
190+
module.exports = {
191+
registerAuthMethod: registerAuthMethod
190192
}

0 commit comments

Comments
 (0)