liz/wikijs-fork
liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Incorrect indentation (eslint)

Browse Source
This commit is contained in:
NGPixel 2017-06-24 16:31:32 -04:00 committed by Nicolas Giard
parent f37cbac332
commit a1b6dfb308
8 changed files with 72 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.vscode/settings.json vendored
View File

@ -1,8 +1,8 @@
{ {
"eslint.enable": true, "eslint.enable": true,
"eslint.autoFixOnSave": false, "eslint.autoFixOnSave": true,
"puglint.enable": true, "puglint.enable": true,
"standard.enable": false, "standard.enable": false,
"editor.formatOnSave": true, "editor.formatOnSave": false,
"editor.tabSize": 2 "editor.tabSize": 2
} }

26
server/libs/auth.js
View File

@ -32,8 +32,7 @@ module.exports = function (passport) {
new LocalStrategy({ new LocalStrategy({
usernameField: 'email', usernameField: 'email',
passwordField: 'password' passwordField: 'password'
}, }, (uEmail, uPassword, done) => {
(uEmail, uPassword, done) => {
db.User.findOne({ email: uEmail, provider: 'local' }).then((user) => { db.User.findOne({ email: uEmail, provider: 'local' }).then((user) => {
if (user) { if (user) {
return user.validatePassword(uPassword).then(() => { return user.validatePassword(uPassword).then(() => {
@ -60,8 +59,7 @@ module.exports = function (passport) {
clientID: appconfig.auth.google.clientId, clientID: appconfig.auth.google.clientId,
clientSecret: appconfig.auth.google.clientSecret, clientSecret: appconfig.auth.google.clientSecret,
callbackURL: appconfig.host + '/login/google/callback' callbackURL: appconfig.host + '/login/google/callback'
}, }, (accessToken, refreshToken, profile, cb) => {
(accessToken, refreshToken, profile, cb) => {
db.User.processProfile(profile).then((user) => { db.User.processProfile(profile).then((user) => {
return cb(null, user) || true return cb(null, user) || true
}).catch((err) => { }).catch((err) => {
@ -80,8 +78,7 @@ module.exports = function (passport) {
clientID: appconfig.auth.microsoft.clientId, clientID: appconfig.auth.microsoft.clientId,
clientSecret: appconfig.auth.microsoft.clientSecret, clientSecret: appconfig.auth.microsoft.clientSecret,
callbackURL: appconfig.host + '/login/ms/callback' callbackURL: appconfig.host + '/login/ms/callback'
}, }, function (accessToken, refreshToken, profile, cb) {
function (accessToken, refreshToken, profile, cb) {
db.User.processProfile(profile).then((user) => { db.User.processProfile(profile).then((user) => {
return cb(null, user) || true return cb(null, user) || true
}).catch((err) => { }).catch((err) => {
@ -101,8 +98,7 @@ module.exports = function (passport) {
clientSecret: appconfig.auth.facebook.clientSecret, clientSecret: appconfig.auth.facebook.clientSecret,
callbackURL: appconfig.host + '/login/facebook/callback', callbackURL: appconfig.host + '/login/facebook/callback',
profileFields: ['id', 'displayName', 'email'] profileFields: ['id', 'displayName', 'email']
}, }, function (accessToken, refreshToken, profile, cb) {
function (accessToken, refreshToken, profile, cb) {
db.User.processProfile(profile).then((user) => { db.User.processProfile(profile).then((user) => {
return cb(null, user) || true return cb(null, user) || true
}).catch((err) => { }).catch((err) => {
@ -121,9 +117,8 @@ module.exports = function (passport) {
clientID: appconfig.auth.github.clientId, clientID: appconfig.auth.github.clientId,
clientSecret: appconfig.auth.github.clientSecret, clientSecret: appconfig.auth.github.clientSecret,
callbackURL: appconfig.host + '/login/github/callback', callbackURL: appconfig.host + '/login/github/callback',
scope: [ 'user:email' ] scope: ['user:email']
}, }, (accessToken, refreshToken, profile, cb) => {
(accessToken, refreshToken, profile, cb) => {
db.User.processProfile(profile).then((user) => { db.User.processProfile(profile).then((user) => {
return cb(null, user) || true return cb(null, user) || true
}).catch((err) => { }).catch((err) => {
@ -142,8 +137,7 @@ module.exports = function (passport) {
clientID: appconfig.auth.slack.clientId, clientID: appconfig.auth.slack.clientId,
clientSecret: appconfig.auth.slack.clientSecret, clientSecret: appconfig.auth.slack.clientSecret,
callbackURL: appconfig.host + '/login/slack/callback' callbackURL: appconfig.host + '/login/slack/callback'
}, }, (accessToken, refreshToken, profile, cb) => {
(accessToken, refreshToken, profile, cb) => {
db.User.processProfile(profile).then((user) => { db.User.processProfile(profile).then((user) => {
return cb(null, user) || true return cb(null, user) || true
}).catch((err) => { }).catch((err) => {
@ -174,8 +168,7 @@ module.exports = function (passport) {
}, },
usernameField: 'email', usernameField: 'email',
passReqToCallback: false passReqToCallback: false
}, }, (profile, cb) => {
(profile, cb) => {
profile.provider = 'ldap' profile.provider = 'ldap'
profile.id = profile.dn profile.id = profile.dn
db.User.processProfile(profile).then((user) => { db.User.processProfile(profile).then((user) => {
@ -199,8 +192,7 @@ module.exports = function (passport) {
callbackURL: appconfig.host + '/login/azure/callback', callbackURL: appconfig.host + '/login/azure/callback',
resource: appconfig.auth.azure.resource, resource: appconfig.auth.azure.resource,
tenant: appconfig.auth.azure.tenant tenant: appconfig.auth.azure.tenant
}, }, (accessToken, refreshToken, params, profile, cb) => {
(accessToken, refreshToken, params, profile, cb) => {
let waadProfile = jwt.decode(params.id_token) let waadProfile = jwt.decode(params.id_token)
waadProfile.id = waadProfile.oid waadProfile.id = waadProfile.oid
waadProfile.provider = 'azure' waadProfile.provider = 'azure'

2
server/libs/db.js
View File

@ -19,7 +19,7 @@ module.exports = {
* *
* @return {Object} DB instance * @return {Object} DB instance
*/ */
init () { init() {
let self = this let self = this
let dbModelsPath = path.join(SERVERPATH, 'models') let dbModelsPath = path.join(SERVERPATH, 'models')