Fix new registration and changing default authentication method for G…

…oogle using OAuth.

libs/passportVerify.js

@@ -17,15 +17,15 @@ exports.verify = function (aId, aStrategy, aUsername, aLoggedIn, aDone) {
   var shasum = crypto.createHash('sha256');
   var digest = null;
   var query = {};
-  var aIds = [];
+  var ids = [];
 
   if (aId instanceof Array) {
-    aIds = aId.map(function (aId) {
+    ids = aId.map(function (aId) {
       var shasum = crypto.createHash('sha256');
       shasum.update(String(aId));
       return shasum.digest('hex');
     });
-    query.auths = { '$in': aIds };
+    query.auths = { '$in': ids };
   } else if (aStrategy === 'github') {
     // We only keep plaintext ids for GH since that's all we need
     digest = aId;
@@ -42,9 +42,19 @@ exports.verify = function (aId, aStrategy, aUsername, aLoggedIn, aDone) {
 
   findDeadorAlive(User, query, true,
     function (aAlive, aUser, aRemoved) {
-      var pos = aUser ? aUser.auths.indexOf(digest || aIds[0]) : -1;
+      var pos = aUser ? aUser.auths.indexOf(digest) : -1;
+      var opendIdPos = -1;
       if (aRemoved) { aDone(null, false, 'user was removed'); }
 
+      // Set up for OpenId to OAuth Migration
+      if (!digest && ids.length > 0) { 
+        digest = ids[1];
+        if (aUser) {
+          pos = aUser.auths.indexOf(digest);
+          opendIdPos = aUser.auths.indexOf(ids[0]);
+        }
+      }
+
       if (!aUser) {
         User.findOne({ 'name': aUsername }, function (aErr, aUser) {
           if (aUser && aLoggedIn) {
@@ -82,9 +92,9 @@ exports.verify = function (aId, aStrategy, aUsername, aLoggedIn, aDone) {
         aUser.save(function (aErr, aUser) {
           return aDone(aErr, aUser);
         });
-      } else if (aIds.length > 0 && pos > -1) {
+      } else if (opendIdPos > 0) {
         // Migrate from OpenID to OAuth
-        aUser.auths[pos] = aIds[1];
+        aUser.auths[opendIdPos] = digest;
         aUser.save(function (aErr, aUser) {
           return aDone(aErr, aUser);
         });

package.json

@@ -21,6 +21,7 @@
     "github": "0.2.3",
     "highlight.js": "8.4.0",
     "jquery": "2.1.3",
+    "jwt-simple": "0.2.0",
     "less-middleware": "1.0.4",
     "marked": "0.3.3",
     "method-override": "2.3.1",
@@ -52,8 +53,7 @@
     "select2": "3.5.2-browserify",
     "select2-bootstrap-css": "1.4.6",
     "serve-favicon": "2.2.0",
-    "underscore": "1.7.0",
-    "jwt-simple": "0.2.0"
+    "underscore": "1.7.0"
   },
   "repository": {
     "type": "git",