allow calling authenticate without callback #125

lib/framework/koa.js

@@ -97,6 +97,19 @@ function authenticate(passport, name, options, callback) {
         callback.reject(err)
       }
     }
+  } else {
+    // support the inline usage of `passport.authenticate` without a callback, e.g.
+    // ```
+    // const [user] = await passport.authenticate('jwt')(ctx)
+    // ```
+    // In this case we want to forward both the error and result to the returned promise.
+    callback = function(err, user, info, status) {
+      if (err) {
+        return callback.reject(err)
+      } else {
+        return callback.resolve([user, info, status])
+      }
+    }
   }
 
   const middleware = promisify(_authenticate(passport, name, options, callback))
@@ -142,11 +155,17 @@ function authenticate(passport, name, options, callback) {
       middleware(req, res).then(resolve, reject)
     })
 
-    return p.then(cont => {
-      // cont equals `false` when `res.redirect` or `res.end` got called
-      // in this case, call next to continue through Koa's middleware stack
-      if (cont !== false) {
-        return next()
+    return p.then(result => {
+      if (next) {
+        // cont equals `false` when `res.redirect` or `res.end` got called
+        // in this case, call next to continue through Koa's middleware stack
+        if (result !== false) {
+          return next()
+        }
+      } else {
+        // when not providing a callback to `passport.authenticate` the result of that usually goes
+        // into the callback is returned from the Promise instead
+        return result
       }
     })
   }