feat: self-contained auth modules + login UI + icons

2017-09-10 23:00:03 -04:00
parent 52630127cd
commit cac3d21c6e
22 changed files with 341 additions and 249 deletions
--- a/server/authentication/azure.js
+++ b/server/authentication/azure.js
@@ -8,24 +8,29 @@

 const AzureAdOAuth2Strategy = require('passport-azure-ad-oauth2').Strategy

-module.exports = (passport, conf) => {
-  const jwt = require('jsonwebtoken')
-  passport.use('azure_ad_oauth2',
-    new AzureAdOAuth2Strategy({
-      clientID: conf.clientId,
-      clientSecret: conf.clientSecret,
-      callbackURL: conf.callbackURL,
-      resource: conf.resource,
-      tenant: conf.tenant
-    }, (accessToken, refreshToken, params, profile, cb) => {
-      let waadProfile = jwt.decode(params.id_token)
-      waadProfile.id = waadProfile.oid
-      waadProfile.provider = 'azure'
-      wiki.db.User.processProfile(waadProfile).then((user) => {
-        return cb(null, user) || true
-      }).catch((err) => {
-        return cb(err, null) || true
-      })
-    }
-    ))
+module.exports = {
+  key: 'azure',
+  title: 'Azure Active Directory',
+  props: ['clientId', 'clientSecret', 'callbackURL', 'resource', 'tenant'],
+  init (passport, conf) {
+    const jwt = require('jsonwebtoken')
+    passport.use('azure_ad_oauth2',
+      new AzureAdOAuth2Strategy({
+        clientID: conf.clientId,
+        clientSecret: conf.clientSecret,
+        callbackURL: conf.callbackURL,
+        resource: conf.resource,
+        tenant: conf.tenant
+      }, (accessToken, refreshToken, params, profile, cb) => {
+        let waadProfile = jwt.decode(params.id_token)
+        waadProfile.id = waadProfile.oid
+        waadProfile.provider = 'azure'
+        wiki.db.User.processProfile(waadProfile).then((user) => {
+          return cb(null, user) || true
+        }).catch((err) => {
+          return cb(err, null) || true
+        })
+      }
+      ))
+  }
 }
--- a/server/authentication/facebook.js
+++ b/server/authentication/facebook.js
@@ -8,19 +8,24 @@

 const FacebookStrategy = require('passport-facebook').Strategy

-module.exports = (passport, conf) => {
-  passport.use('facebook',
-    new FacebookStrategy({
-      clientID: conf.clientId,
-      clientSecret: conf.clientSecret,
-      callbackURL: conf.callbackURL,
-      profileFields: ['id', 'displayName', 'email']
-    }, function (accessToken, refreshToken, profile, cb) {
-      wiki.db.User.processProfile(profile).then((user) => {
-        return cb(null, user) || true
-      }).catch((err) => {
-        return cb(err, null) || true
-      })
-    }
-    ))
+module.exports = {
+  key: 'facebook',
+  title: 'Facebook',
+  props: ['clientId', 'clientSecret', 'callbackURL'],
+  init (passport, conf) {
+    passport.use('facebook',
+      new FacebookStrategy({
+        clientID: conf.clientId,
+        clientSecret: conf.clientSecret,
+        callbackURL: conf.callbackURL,
+        profileFields: ['id', 'displayName', 'email']
+      }, function (accessToken, refreshToken, profile, cb) {
+        wiki.db.User.processProfile(profile).then((user) => {
+          return cb(null, user) || true
+        }).catch((err) => {
+          return cb(err, null) || true
+        })
+      }
+      ))
+  }
 }
--- a/server/authentication/github.js
+++ b/server/authentication/github.js
@@ -8,19 +8,24 @@

 const GitHubStrategy = require('passport-github2').Strategy

-module.exports = (passport, conf) => {
-  passport.use('github',
-    new GitHubStrategy({
-      clientID: conf.clientId,
-      clientSecret: conf.clientSecret,
-      callbackURL: conf.callbackURL,
-      scope: ['user:email']
-    }, (accessToken, refreshToken, profile, cb) => {
-      wiki.db.User.processProfile(profile).then((user) => {
-        return cb(null, user) || true
-      }).catch((err) => {
-        return cb(err, null) || true
-      })
-    }
-    ))
+module.exports = {
+  key: 'github',
+  title: 'GitHub',
+  props: ['clientId', 'clientSecret', 'callbackURL'],
+  init (passport, conf) {
+    passport.use('github',
+      new GitHubStrategy({
+        clientID: conf.clientId,
+        clientSecret: conf.clientSecret,
+        callbackURL: conf.callbackURL,
+        scope: ['user:email']
+      }, (accessToken, refreshToken, profile, cb) => {
+        wiki.db.User.processProfile(profile).then((user) => {
+          return cb(null, user) || true
+        }).catch((err) => {
+          return cb(err, null) || true
+        })
+      }
+      ))
+  }
 }
--- a/server/authentication/google.js
+++ b/server/authentication/google.js
@@ -8,18 +8,23 @@

 const GoogleStrategy = require('passport-google-oauth20').Strategy

-module.exports = (passport, conf) => {
-  passport.use('google',
-    new GoogleStrategy({
-      clientID: conf.clientId,
-      clientSecret: conf.clientSecret,
-      callbackURL: conf.callbackURL
-    }, (accessToken, refreshToken, profile, cb) => {
-      wiki.db.User.processProfile(profile).then((user) => {
-        return cb(null, user) || true
-      }).catch((err) => {
-        return cb(err, null) || true
-      })
-    }
-    ))
+module.exports = {
+  key: 'google',
+  title: 'Google ID',
+  props: ['clientId', 'clientSecret', 'callbackURL'],
+  init (passport, conf) {
+    passport.use('google',
+      new GoogleStrategy({
+        clientID: conf.clientId,
+        clientSecret: conf.clientSecret,
+        callbackURL: conf.callbackURL
+      }, (accessToken, refreshToken, profile, cb) => {
+        wiki.db.User.processProfile(profile).then((user) => {
+          return cb(null, user) || true
+        }).catch((err) => {
+          return cb(err, null) || true
+        })
+      }
+      ))
+  }
 }
--- a/server/authentication/ldap.js
+++ b/server/authentication/ldap.js
@@ -9,32 +9,37 @@
 const LdapStrategy = require('passport-ldapauth').Strategy
 const fs = require('fs')

-module.exports = (passport, conf) => {
-  passport.use('ldapauth',
-    new LdapStrategy({
-      server: {
-        url: conf.url,
-        bindDn: conf.bindDn,
-        bindCredentials: conf.bindCredentials,
-        searchBase: conf.searchBase,
-        searchFilter: conf.searchFilter,
-        searchAttributes: ['displayName', 'name', 'cn', 'mail'],
-        tlsOptions: (conf.tlsEnabled) ? {
-          ca: [
-            fs.readFileSync(conf.tlsCertPath)
-          ]
-        } : {}
-      },
-      usernameField: 'email',
-      passReqToCallback: false
-    }, (profile, cb) => {
-      profile.provider = 'ldap'
-      profile.id = profile.dn
-      wiki.db.User.processProfile(profile).then((user) => {
-        return cb(null, user) || true
-      }).catch((err) => {
-        return cb(err, null) || true
-      })
-    }
-    ))
+module.exports = {
+  key: 'ldap',
+  title: 'LDAP / Active Directory',
+  props: ['url', 'bindDn', 'bindCredentials', 'searchBase', 'searchFilter', 'tlsEnabled', 'tlsCertPath'],
+  init (passport, conf) {
+    passport.use('ldapauth',
+      new LdapStrategy({
+        server: {
+          url: conf.url,
+          bindDn: conf.bindDn,
+          bindCredentials: conf.bindCredentials,
+          searchBase: conf.searchBase,
+          searchFilter: conf.searchFilter,
+          searchAttributes: ['displayName', 'name', 'cn', 'mail'],
+          tlsOptions: (conf.tlsEnabled) ? {
+            ca: [
+              fs.readFileSync(conf.tlsCertPath)
+            ]
+          } : {}
+        },
+        usernameField: 'email',
+        passReqToCallback: false
+      }, (profile, cb) => {
+        profile.provider = 'ldap'
+        profile.id = profile.dn
+        wiki.db.User.processProfile(profile).then((user) => {
+          return cb(null, user) || true
+        }).catch((err) => {
+          return cb(err, null) || true
+        })
+      }
+      ))
+  }
 }
--- a/server/authentication/local.js
+++ b/server/authentication/local.js
@@ -8,25 +8,30 @@

 const LocalStrategy = require('passport-local').Strategy

-module.exports = (passport, conf) => {
-  passport.use('local',
-    new LocalStrategy({
-      usernameField: 'email',
-      passwordField: 'password'
-    }, (uEmail, uPassword, done) => {
-      wiki.db.User.findOne({ email: uEmail, provider: 'local' }).then((user) => {
-        if (user) {
-          return user.validatePassword(uPassword).then(() => {
-            return done(null, user) || true
-          }).catch((err) => {
-            return done(err, null)
-          })
-        } else {
-          return done(new Error('INVALID_LOGIN'), null)
-        }
-      }).catch((err) => {
-        done(err, null)
-      })
-    }
-    ))
+module.exports = {
+  key: 'local',
+  title: 'Local',
+  props: [],
+  init (passport, conf) {
+    passport.use('local',
+      new LocalStrategy({
+        usernameField: 'email',
+        passwordField: 'password'
+      }, (uEmail, uPassword, done) => {
+        wiki.db.User.findOne({ email: uEmail, provider: 'local' }).then((user) => {
+          if (user) {
+            return user.validatePassword(uPassword).then(() => {
+              return done(null, user) || true
+            }).catch((err) => {
+              return done(err, null)
+            })
+          } else {
+            return done(new Error('INVALID_LOGIN'), null)
+          }
+        }).catch((err) => {
+          done(err, null)
+        })
+      }
+      ))
+  }
 }
--- a/server/authentication/microsoft.js
+++ b/server/authentication/microsoft.js
@@ -8,18 +8,23 @@

 const WindowsLiveStrategy = require('passport-windowslive').Strategy

-module.exports = (passport, conf) => {
-  passport.use('windowslive',
-    new WindowsLiveStrategy({
-      clientID: conf.clientId,
-      clientSecret: conf.clientSecret,
-      callbackURL: conf.callbackURL
-    }, function (accessToken, refreshToken, profile, cb) {
-      wiki.db.User.processProfile(profile).then((user) => {
-        return cb(null, user) || true
-      }).catch((err) => {
-        return cb(err, null) || true
-      })
-    }
-    ))
+module.exports = {
+  key: 'microsoft',
+  title: 'Microsoft Account',
+  props: ['clientId', 'clientSecret', 'callbackURL'],
+  init (passport, conf) {
+    passport.use('windowslive',
+      new WindowsLiveStrategy({
+        clientID: conf.clientId,
+        clientSecret: conf.clientSecret,
+        callbackURL: conf.callbackURL
+      }, function (accessToken, refreshToken, profile, cb) {
+        wiki.db.User.processProfile(profile).then((user) => {
+          return cb(null, user) || true
+        }).catch((err) => {
+          return cb(err, null) || true
+        })
+      }
+      ))
+  }
 }
--- a/server/authentication/slack.js
+++ b/server/authentication/slack.js
@@ -8,18 +8,23 @@

 const SlackStrategy = require('passport-slack').Strategy

-module.exports = (passport, conf) => {
-  passport.use('slack',
-    new SlackStrategy({
-      clientID: conf.clientId,
-      clientSecret: conf.clientSecret,
-      callbackURL: conf.callbackURL
-    }, (accessToken, refreshToken, profile, cb) => {
-      wiki.db.User.processProfile(profile).then((user) => {
-        return cb(null, user) || true
-      }).catch((err) => {
-        return cb(err, null) || true
-      })
-    }
-    ))
+module.exports = {
+  key: 'slack',
+  title: 'Slack',
+  props: ['clientId', 'clientSecret', 'callbackURL'],
+  init (passport, conf) {
+    passport.use('slack',
+      new SlackStrategy({
+        clientID: conf.clientId,
+        clientSecret: conf.clientSecret,
+        callbackURL: conf.callbackURL
+      }, (accessToken, refreshToken, profile, cb) => {
+        wiki.db.User.processProfile(profile).then((user) => {
+          return cb(null, user) || true
+        }).catch((err) => {
+          return cb(err, null) || true
+        })
+      }
+      ))
+  }
 }