Added support for Hapi

.travis.yml

@@ -1,13 +1,12 @@
 language: node_js
- + +sudo: false
- +
- + +node_js:
- +   - '5'
- +   - '4'
- +
- + cache:
- +   directories:
- +   - node_modules
- +
- + after_script:
- +     npm run coverage
+sudo: false
+node_js:
+ - '5'
+ - '4'
+
+ cache:
+  directories:
+    - node_modules
+
+ after_script:
+  npm run coverage

github-auth.js

@@ -1,76 +1,61 @@
+var error = require('eraro')({
+  package: 'github-auth'
+})
 
-var GitHubStrategy = require('passport-github').Strategy
-var _ = require('lodash')
+var CommonAuth = require('./lib/common-github-auth')
+var ExpressAuth = require('./lib/express-github-auth')
+var HapiAuth = require('./lib/hapi-github-auth')
 
 module.exports = function (options) {
   var seneca = this
-  var service = 'github'
+  var internals = {}
 
-  var params = {
-    clientID: options.clientID,
-    clientSecret: options.clientSecret,
-    callbackURL: options.urlhost + (options.callbackUrl || '/auth/github/callback')
+  internals.accepted_framworks = [
+    'express',
+    'hapi'
+  ]
+  internals.options = options
+
+  if (!options.framework) {
+    options.framework = 'express'
   }
-  params = _.extend(params, options.serviceParams || {})
 
-  var authPlugin = new GitHubStrategy(params,
-    function (accessToken, refreshToken, profile, done) {
-      seneca.act(
-        {
-          role: 'auth',
-          prepare: 'github_login_data',
-          accessToken: accessToken,
-          refreshToken: refreshToken,
-          profile: profile
-        }, done)
+  internals.choose_framework = function () {
+    if (internals.options.framework === 'express') {
+      internals.load_express_implementation()
     }
-  )
-
-  var prepareLoginData = function (args, cb) {
-    var accessToken = args.accessToken
-    var refreshToken = args.refreshToken
-    var profile = args.profile
-
-    var data = {
-      identifier: '' + profile.id,
-      nick: profile.username,
-      username: profile.username,
-      credentials: {
-        access: accessToken,
-        refresh: refreshToken
-      },
-      userdata: profile,
-      when: new Date().toISOString()
+    else {
+      internals.load_hapi_implementation()
     }
+  }
 
-    data = _.extend({}, data, profile)
-    if (data.emails && data.emails.length > 0 && data.emails[0].value) {
-      data.email = data.emails[0].value
-      data.nick = data.email
-    }
-    if (data.name && _.isObject(data.name)) {
-      data.firstName = data.name.givenName
-      data.lastName = data.name.familyName
-      data.name = data.name || (data.firstName + ' ' + data.lastName)
-      delete data.name
+  internals.check_options = function () {
+    if (seneca.options().plugin.web && seneca.options().plugin.web.framework) {
+      internals.options.framework = seneca.options().plugin.web.framework
     }
-    data.name = data.name || data.displayName
 
-    data[ service + '_id' ] = data.identifier
-
-    data.service = data.service || {}
-    data.service[ service ] = {
-      credentials: data.credentials,
-      userdata: data.userdata,
-      when: data.when
+    if (internals.accepted_framworks.indexOf(internals.options.framework) === -1) {
+      throw error('Framework type <' + internals.options.framework + '> not supported.')
     }
+  }
 
-    cb(null, data)
+  internals.load_express_implementation = function () {
+    seneca.use(ExpressAuth, internals.options)
+    seneca.use(CommonAuth, internals.options)
   }
 
-  seneca.add({role: 'auth', prepare: 'github_login_data'}, prepareLoginData)
+  internals.load_hapi_implementation = function () {
+    seneca.use(HapiAuth, internals.options)
+    seneca.use(CommonAuth, internals.options)
+  }
+
+  function init (args, done) {
+    internals.check_options()
+    internals.choose_framework()
+    done()
+  }
 
-  seneca.act({role: 'auth', cmd: 'register_service', service: service, plugin: authPlugin, conf: options})
+  seneca.add('init: github-auth', init)
 
   return {
     name: 'github-auth'

lib/common-github-auth.js

@@ -0,0 +1,54 @@
+var _ = require('lodash')
+
+module.exports = function (options) {
+  var seneca = this
+  var service = 'github'
+
+  var prepareLoginData = function (args, cb) {
+    var accessToken = args.accessToken
+    var refreshToken = args.refreshToken
+    var profile = args.profile
+
+    var data = {
+      identifier: '' + profile.id,
+      nick: profile.username,
+      username: profile.username,
+      credentials: {
+        access: accessToken,
+        refresh: refreshToken
+      },
+      userdata: profile,
+      when: new Date().toISOString()
+    }
+
+    data = _.extend({}, data, profile)
+    if (data.emails && data.emails.length > 0 && data.emails[0].value) {
+      data.email = data.emails[0].value
+      data.nick = data.email
+    }
+    if (data.name && _.isObject(data.name)) {
+      data.firstName = data.name.givenName
+      data.lastName = data.name.familyName
+      data.name = data.name || (data.firstName + ' ' + data.lastName)
+      delete data.name
+    }
+    data.name = data.name || data.displayName
+
+    data[ service + '_id' ] = data.identifier
+
+    data.service = data.service || {}
+    data.service[ service ] = {
+      credentials: data.credentials,
+      userdata: data.userdata,
+      when: data.when
+    }
+
+    cb(null, data)
+  }
+
+  seneca.add({role: 'auth', prepare: 'github_login_data'}, prepareLoginData)
+
+  return {
+    name: 'common-github-auth'
+  }
+}

lib/express-github-auth.js

@@ -0,0 +1,40 @@
+
+var GitHubStrategy = require('passport-github').Strategy
+var _ = require('lodash')
+
+module.exports = function (options) {
+  var seneca = this
+  var service = 'github'
+
+  var params = {
+    clientID: options.clientID,
+    clientSecret: options.clientSecret,
+    callbackURL: options.urlhost + (options.callbackUrl || '/auth/github/callback')
+  }
+  params = _.extend(params, options.serviceParams || {})
+
+  var authPlugin = new GitHubStrategy(params,
+    function (accessToken, refreshToken, profile, done) {
+      seneca.act(
+        {
+          role: 'auth',
+          prepare: 'github_login_data',
+          accessToken: accessToken,
+          refreshToken: refreshToken,
+          profile: profile
+        }, done)
+    }
+  )
+
+  function init (args, done) {
+    seneca.act({role: 'auth', cmd: 'register_service', service: service, plugin: authPlugin, conf: options})
+    done()
+  }
+
+  seneca.add('init: express-github-auth', init)
+
+
+  return {
+    name: 'express-github-auth'
+  }
+}

lib/hapi-github-auth.js

@@ -0,0 +1,65 @@
+var _ = require('lodash')
+
+module.exports = function (opts) {
+  var seneca = this
+  var options = opts
+  var service = 'github'
+
+  seneca.add('role: auth, cmd: loginGithub', function (args, done) {
+    var msg = _.extend({}, args, {role: 'auth', trigger: 'service-login-github', service: 'github'})
+    delete msg.cmd
+    seneca.act(msg, function (err, data) {
+      done(err, data)
+    })
+  })
+
+  function init_strategy (strategy) {
+    seneca.act('role: web, get: server', function (err, data) {
+      if (err) {
+        throw new Error('Cannot retrieve server: ' + err)
+      }
+
+      if (!data) {
+        throw new Error('Cannot retrieve server')
+      }
+
+      var server = data.server
+      server.auth.strategy('github', 'bell', {
+        provider: 'github',
+        password: options.password,
+        clientId: options.clientId,
+        clientSecret: options.clientSecret,
+        isSecure: _.has(options, 'isSecure') ? options.isSecure : true
+      })
+
+      seneca.act(
+        'role: web',
+        {
+          plugin: 'auth',
+          config: strategy,
+          use: {
+            prefix: '/auth/',
+            pin: {role: 'auth', cmd: '*'},
+            auth: 'github',
+            map: {
+              loginGithub: {GET: true, POST: true, auth: 'github', alias: 'login_github'}
+            }
+          }
+        }, function (err, result) {
+          console.log('Register', err, result)
+        })
+    })
+  }
+
+  function init (args, done) {
+    init_strategy(options)
+    seneca.act({role: 'auth', cmd: 'register_service', service: service, conf: options})
+    done()
+  }
+
+  seneca.add('init: hapi-github-auth', init)
+
+  return {
+    name: 'hapi-github-auth'
+  }
+}