Merge pull request #567 from Martii/Issue-484postFixes

Misc fixes for #484 

Auto-merge

Author: Martii

libs/passportVerify.js

@@ -43,15 +43,15 @@ exports.verify = function (aId, aStrategy, aUsername, aLoggedIn, aDone) {
   findDeadorAlive(User, query, true,
     function (aAlive, aUser, aRemoved) {
       var pos = aUser ? aUser.auths.indexOf(digest) : -1;
-      var opendIdPos = -1;
+      var openIdIdPos = -1;
       if (aRemoved) { aDone(null, false, 'user was removed'); }
 
       // Set up for OpenId to OAuth Migration
-      if (!digest && ids.length > 0) { 
+      if (!digest && ids.length > 0) {
         digest = ids[1];
         if (aUser) {
           pos = aUser.auths.indexOf(digest);
-          opendIdPos = aUser.auths.indexOf(ids[0]);
+          openIdIdPos = aUser.auths.indexOf(ids[0]);
         }
       }
 
@@ -92,9 +92,9 @@ exports.verify = function (aId, aStrategy, aUsername, aLoggedIn, aDone) {
         aUser.save(function (aErr, aUser) {
           return aDone(aErr, aUser);
         });
-      } else if (opendIdPos > 0) {
+      } else if (openIdIdPos > 0) {
         // Migrate from OpenID to OAuth
-        aUser.auths[opendIdPos] = digest;
+        aUser.auths[openIdIdPos] = digest;
         aUser.save(function (aErr, aUser) {
           return aDone(aErr, aUser);
         });

views/includes/header.html

@@ -29,3 +29,4 @@
     </div>
   </div>
 </nav>
+{{> includes/headerReminders.html }}

views/includes/headerReminders.html

@@ -0,0 +1,6 @@
+<div>
+  <div class="alert alert-info alert-dismissible" role="alert">
+    <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+    <p><i class="fa fa-fw fa-exclamation-triangle"></i> <b>REMINDER:</b> Don't miss out reading the <a class="alert-link" href="/announcements/Google_Authentication_Deprecation">Google Authentication Deprecation</a> with migration  announcement.</p>
+  </div>
+</div>