Просмотр исходного кода

Merge pull request #2749 from overleaf/ew-ta-google-2fa-error

fix ERR_HTTP_HEADERS_SENT error with oauth and 2fa

GitOrigin-RevId: b70bd79fb544121337be27349a967d52da115930
Miguel Serrano 6 лет назад
Родитель
Сommit
f39a650823

+ 1 - 1
services/web/app/src/Features/Authentication/AuthenticationController.js

@@ -124,7 +124,7 @@ const AuthenticationController = (module.exports = {
         return next(error)
       }
       if (results.some(result => result && result.doNotFinish)) {
-        return next()
+        return
       }
 
       if (user.must_reconfirm) {

+ 4 - 5
services/web/test/unit/src/Authentication/AuthenticationControllerTests.js

@@ -1238,12 +1238,11 @@ describe('AuthenticationController', function() {
           this.user,
           this.req,
           this.res,
-          error => {
-            expect(error).to.not.exist
-            expect(this.res.json.callCount).to.equal(0)
-            done()
-          }
+          this.next
         )
+        expect(this.next.callCount).to.equal(0)
+        expect(this.res.json.callCount).to.equal(0)
+        done()
       })
 
       it('call next with hook errors', function(done) {