Allow new strategies to existing sessions cleanerly (sp!) (#2077)

* Up dev limiter just a bit since it's too short sometimes.

Post #1893

Auto-merge

Author: Martii

controllers/auth.js

@@ -463,7 +463,7 @@ exports.callback = function (aReq, aRes, aNext) {
       aUser.authed = now;
 
       // Check probationary status vs lastAuthed for alt IP circumvention prevention
-      if (aUser._probationary && lastAuthed) {
+      if (aUser._probationary && lastAuthed && !newstrategy) {
         if (!moment().isAfter(moment(lastAuthed).add(waitAuthCapMin, 'minutes'))) {
           aUser.save(function (aErr, aUser) {
             if (aErr) {

models/settings.json

@@ -49,7 +49,7 @@
   "pro": 15
  },
  "waitAuthCapMin": {
-  "dev": 1,
+  "dev": 2,
   "pro": 1440
  },
  "waitCaptchaCapMin": {

routes.js

@@ -256,6 +256,12 @@ var authCapLimiter = rateLimit({
         retryAfter: waitAuthCapMin * 60 + (isDev ? fudgeSec : fudgeMin)
       }
     });
+  },
+  skip: function (aReq, aRes) {
+    if (aReq.session.newstrategy) {
+      // NOTE: Still counting by design
+      return true;
+    }
   }
 });