wiki-security-passportjs 0.8.1 → 0.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wiki-security-passportjs",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "description": "Security plugin for Federated Wiki, using passport.js",
   "author": "Paul Rodwell <paul.rodwell@btinternet.com> (http://rodwell.me)",
   "license": "MIT",

package/server/social.coffee

@@ -28,7 +28,6 @@ module.exports = exports = (log, loga, argv) ->
 
   owner = ''
   ownerName = ''
-  user = {}
   wikiName = argv.url
   wikiHost = argv.wiki_domain
 
@@ -215,10 +214,12 @@ module.exports = exports = (log, loga, argv) ->
             username_query = 'params.user_id'
 
           try
-            user.oauth2 = {
-              id: extractUserInfo(argv.oauth2_IdField, 'params.user_id')
-              username: extractUserInfo(argv.oauth2_UsernameField, 'params.user_id')
-              displayName: extractUserInfo(argv.oauth2_DisplayNameField, 'params.user_id')
+            user = {
+              oauth2: {
+                id: extractUserInfo(argv.oauth2_IdField, 'params.user_id')
+                username: extractUserInfo(argv.oauth2_UsernameField, 'params.user_id')
+                displayName: extractUserInfo(argv.oauth2_DisplayNameField, 'params.user_id')
+              }
             }
           catch e
             console.error('*** Error extracting user info:', e)
@@ -239,11 +240,13 @@ module.exports = exports = (log, loga, argv) ->
         # callbackURL is optional, and if it exists must match that given in
         # the OAuth application settings - so we don't specify it.
         }, (accessToken, refreshToken, profile, cb) ->
-          user.github = {
-            id: profile.id
-            username: profile.username
-            displayName: profile.displayName
-            emails: profile.emails
+          user = {
+            github: {
+              id: profile.id
+              username: profile.username
+              displayName: profile.displayName
+              emails: profile.emails
+            }
           }
           cb(null, user)))
 
@@ -259,10 +262,12 @@ module.exports = exports = (log, loga, argv) ->
         consumerSecret: argv.twitter_consumerSecret
         callbackURL: callbackProtocol + '//' + callbackHost + '/auth/twitter/callback'
         }, (accessToken, refreshToken, profile, cb) ->
-          user.twitter = {
-            id: profile.id
-            username: profile.username
-            displayName: profile.displayName
+          user = {
+            twitter: {
+              id: profile.id
+              username: profile.username
+              displayName: profile.displayName
+            }
           }
           cb(null, user)))
 
@@ -278,11 +283,12 @@ module.exports = exports = (log, loga, argv) ->
         clientSecret: argv.google_clientSecret
         callbackURL: callbackProtocol + '//' + callbackHost + '/auth/google/callback'
         }, (accessToken, refreshToken, profile, cb) ->
-          user.google = {
+          user = { google: { 
             id: profile.id
             displayName: profile.displayName
             emails: profile.emails
-          }
+            }
+            }
           cb(null, user)))
 
     app.use(passport.initialize())
@@ -408,7 +414,7 @@ module.exports = exports = (log, loga, argv) ->
         res.header 'Access-Control-Allow-Origin', req.get('Origin')||'*'
         res.header 'Access-Control-Allow-Credentials', 'true'
         # protect unclaimed by adding "add owner isnt ''" - maybe via parameter
-        return next() if (isAuthorized(req) and owner !== '') or allowedToView(req)
+        return next() if (isAuthorized(req) and (owner isnt '')) or allowedToView(req)
         return res.redirect("/view/#{m[1]}") if m = req.url.match /\/(.*)\.html/
         return res.json(['Login Required']) if req.url == '/system/sitemap.json'
 
@@ -535,7 +541,7 @@ module.exports = exports = (log, loga, argv) ->
 
     app.get '/logout', (req, res) ->
       console.log 'Logout...'
-      req.logout()
+      req.session.reset()
       res.send("OK")
 
   security