dependencies updated, linting done

Author: Kristina Matuleviciute

.eslintrc

@@ -0,0 +1,3 @@
+{
+  "extends": ["seneca"]
+}

example/config.template.js

@@ -1,7 +1,7 @@
 module.exports = {
-  "github-auth": {
-    "clientID":     "",
-    "clientSecret": "",
-    "urlhost":      "http://local.host:3000"
+  'github-auth': {
+    'clientID': '',
+    'clientSecret': '',
+    'urlhost': 'http://local.host:3000'
   }
 }

example/github-auth-example.js

@@ -1,35 +1,35 @@
 /* Copyright (c) 2012-2013 Richard Rodger, MIT License */
-"use strict";
+'use strict'
 
 
-var http = require('http')
+var Http = require('http')
 
-var express = require('express')
-var argv    = require('optimist').argv
+var Express = require('express')
+var argv = require('optimist').argv
 
 
 // create a seneca instance
-var seneca  = require('seneca')()
+var seneca = require('seneca')()
 
 // use the user and auth plugins
 // the user plugin gives you user account business logic
 seneca.use('user')
 
 // the auth plugin handles HTTP authentication
-seneca.use('auth',{
+seneca.use('auth', {
   // redirects after login are needed for traditional multi-page web apps
-  redirect:{
-    login:{win:'/account',fail:'/login#failed'},
-    register:{win:'/account',fail:'/#failed'},
+  redirect: {
+    login: {win: '/account', fail: '/login#failed'},
+    register: {win: '/account', fail: '/#failed'}
   }
 })
 
 // load configuration for plugins
 // top level properties match plugin names
 // copy template config.template.js to config.mine.js and customize
-seneca.use('options','config.mine.js')
+seneca.use('options', 'config.mine.js')
 
-//seneca.use('../google-auth.js')
+// seneca.use('../google-auth.js')
 
 var conf = {
   port: argv.p || 3000
@@ -39,57 +39,56 @@ seneca.use('github-auth')
 
 
 // use the express module in the normal way
-var app = express()
+var app = Express()
 app.enable('trust proxy')
 
-app.use(express.cookieParser())
-app.use(express.query())
-app.use(express.bodyParser())
-app.use(express.methodOverride())
-app.use(express.json())
+app.use(Express.cookieParser())
+app.use(Express.query())
+app.use(Express.bodyParser())
+app.use(Express.methodOverride())
+app.use(Express.json())
 
-app.use(express.session({secret:'seneca'}))
+app.use(Express.session({secret: 'seneca'}))
 
-app.use(express.static(__dirname + '/public'))
+app.use(Express.static(__dirname + '/public'))
 
 
 // add any middleware provided by seneca plugins
 
 
-app.use( seneca.export('web') )
+app.use(seneca.export('web'))
 
 
 // some express views
-app.engine('ejs',require('ejs-locals'))
+app.engine('ejs', require('ejs-locals'))
 app.set('views', __dirname + '/views')
-app.set('view engine','ejs')
+app.set('view engine', 'ejs')
 
-app.get('/login', function(req, res){
-  res.render('login.ejs',{})
+app.get('/login', function (req, res) {
+  res.render('login.ejs', {})
 })
 
 
 // when rendering the account page, use the req.seneca.user object
 // to get user details. This is automatically set up by the auth plugin
-app.get('/account', function(req, res){
-  res.render('account.ejs',{locals:{user:req.seneca.user}})
+app.get('/account', function (req, res) {
+  res.render('account.ejs', {locals: {user: req.seneca.user}})
 })
 
 // create some test accounts
 // the "pin" creates a more convenient api, avoiding the need for
 // a full action specification: seneca.act( {role:'user', cmd:'register', ... } )
-var u = seneca.pin({role:'user',cmd:'*'})
-u.register({nick:'u1',name:'nu1',email:'u1@example.com',password:'u1',active:true})
-u.register({nick:'u2',name:'nu2',email:'u2@example.com',password:'u2',active:true})
-u.register({nick:'a1',name:'na1',email:'a1@example.com',password:'a1',active:true,admin:true})
+var u = seneca.pin({role: 'user', cmd: '*'})
+u.register({nick: 'u1', name: 'nu1', email: 'u1@example.com', password: 'u1', active: true})
+u.register({nick: 'u2', name: 'nu2', email: 'u2@example.com', password: 'u2', active: true})
+u.register({nick: 'a1', name: 'na1', email: 'a1@example.com', password: 'a1', active: true, admin: true})
 
 
 // create a HTTP server using the core Node API
 // this lets the admin plugin use web sockets
-var server = http.createServer(app)
+var server = Http.createServer(app)
 server.listen(conf.port)
 
 // visit http://localhost[:port]/admin to see the admin page
 // you'll need to logged in as an admin - user 'a1' above
-seneca.use('admin',{server:server})
-
+seneca.use('admin', {server: server})

example/public/js/user-accounts.js

@@ -1,38 +1,39 @@
-$(function(){
+ /* global $ */
+ var Http = require('http')
+ $(function () {
+   $('#login').submit(function () {
+     var data = {
+       username: $('#username').val(),
+       password: $('#password').val()
+     }
+     Http.post('/auth/login', data, showAccount)
+     return false
+   })
 
-  $('#login').submit(function(){
-    var data = {
-      username: $('#username').val(),
-      password: $('#password').val()
-    }
-    http.post('/auth/login',data,showAccount)
-    return false
-  })
+   $('#logout').click(function () {
+     Http.post('/auth/logout', {}, showLogin)
+   })
 
-  $('#logout').click(function(){
-    http.post('/auth/logout',{},showLogin)
-  })
 
+   Http.get('/auth/instance', showAccount)
+ })
 
-  http.get('/auth/instance',showAccount)
-})
 
+ function showAccount (err, instance) {
+   if (err) return console.log(err)
 
-function showAccount(err,instance) {
-  if( err ) return console.log(err);
+   if (instance.user) {
+     $('#user_name').text(instance.user.name)
+     $('#user_email').text(instance.user.email)
 
-  if( instance.user ) {
-    $('#user_name').text(instance.user.name)
-    $('#user_email').text(instance.user.email)
+     $('#content_login').slideUp()
+     $('#content_account').slideDown()
+   }
+ }
 
-    $('#content_login').slideUp()
-    $('#content_account').slideDown()
-  }
-}
+ function showLogin (err) {
+   if (err) return console.log(err)
 
-function showLogin(err) {
-  if( err ) return console.log(err);
-
-  $('#content_login').slideDown()
-  $('#content_account').slideUp()
-}
+   $('#content_login').slideDown()
+   $('#content_account').slideUp()
+ }

github-auth.js

@@ -3,14 +3,13 @@ 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')
+    clientID: options.clientID,
+    clientSecret: options.clientSecret,
+    callbackURL: options.urlhost + (options.callbackUrl || '/auth/github/callback')
   }
   params = _.extend(params, options.serviceParams || {})
 
@@ -27,7 +26,7 @@ module.exports = function (options) {
     }
   )
 
-  var prepareLoginData = function(args, cb){
+  var prepareLoginData = function (args, cb) {
     var accessToken = args.accessToken
     var refreshToken = args.refreshToken
     var profile = args.profile
@@ -42,14 +41,14 @@ module.exports = function (options) {
       },
       userdata: profile,
       when: new Date().toISOString()
-    };
+    }
 
     data = _.extend({}, data, profile)
-    if (data.emails && data.emails.length > 0 && data.emails[0].value){
+    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)){
+    if (data.name && _.isObject(data.name)) {
       data.firstName = data.name.givenName
       data.lastName = data.name.familyName
       data.name = data.name || (data.firstName + ' ' + data.lastName)

package.json

@@ -29,10 +29,18 @@
   "bugs": {
     "url": "https://github.com/nherment/seneca-github-auth/issues"
   },
+  "scripts": {
+    "lint": "lab test -dL"
+  },
   "homepage": "https://github.com/nherment/seneca-github-auth",
   "dependencies": {
-    "passport-github": "0.1.5",
-    "lodash": "~3.10.0"
+    "passport-github": "1.1.0",
+    "lodash": "~4.2.1",
+    "eslint-config-seneca": "1.x.x",
+    "eslint-plugin-standard": "1.x.x",
+    "eslint-plugin-hapi": "4.x.x",
+     "lab": "8.0.1",
+     "seneca": "plugin"
   },
   "peerDependencies": {
     "seneca-auth": "*",