@midwayjs/passport 3.4.0 → 3.4.4

package/dist/passport/authenticator.d.ts

@@ -61,7 +61,7 @@ export declare class PassportAuthenticator {
             }>;
         };
     }>;
-    serializeUser(fn: any, req?: any, done?: any): number;
+    serializeUser(user: any, req: any, done: any): void;
     /**
      * Registers a function used to deserialize user objects out of the session.
      *
@@ -75,7 +75,7 @@ export declare class PassportAuthenticator {
      *
      * @api public
      */
-    deserializeUser(fn: any, req?: any, done?: any): number;
+    deserializeUser(obj: any, req: any, done: any): void;
     /**
      * Registers a function used to transform auth info.
      *
@@ -114,12 +114,15 @@ export declare class PassportAuthenticator {
      *
      * @api public
      */
-    transformAuthInfo(fn: any, req?: any, done?: any): number;
+    transformAuthInfo(info: any, req: any, done: any): void;
     logInToSession(req: IncomingMessage & {
         session: any;
     }, user: any): Promise<void>;
     logOutFromSession(req: any, options?: {
         keepSessionInfo?: boolean;
     }): Promise<void>;
+    addSerializer(fn: any): void;
+    addDeserializer(fn: any): void;
+    addInfoTransformer(fn: any): void;
 }
 //# sourceMappingURL=authenticator.d.ts.map

package/dist/passport/authenticator.js

@@ -198,18 +198,7 @@ let PassportAuthenticator = class PassportAuthenticator {
             };
         };
     }
-    serializeUser(fn, req, done) {
-        if (typeof fn === 'function') {
-            return this._serializers.push(fn);
-        }
-        // private implementation that traverses the chain of serializers, attempting
-        // to serialize a user
-        const user = fn;
-        // For backwards compatibility
-        if (typeof req === 'function') {
-            done = req;
-            req = undefined;
-        }
+    serializeUser(user, req, done) {
         const stack = this._serializers;
         (function pass(i, err, obj) {
             // serializers use 'pass' as an error to skip processing
@@ -254,18 +243,7 @@ let PassportAuthenticator = class PassportAuthenticator {
      *
      * @api public
      */
-    deserializeUser(fn, req, done) {
-        if (typeof fn === 'function') {
-            return this._deserializers.push(fn);
-        }
-        // private implementation that traverses the chain of deserializers,
-        // attempting to deserialize a user
-        const obj = fn;
-        // For backwards compatibility
-        if (typeof req === 'function') {
-            done = req;
-            req = undefined;
-        }
+    deserializeUser(obj, req, done) {
         const stack = this._deserializers;
         (function pass(i, err, user) {
             // deserializers use 'pass' as an error to skip processing
@@ -340,18 +318,7 @@ let PassportAuthenticator = class PassportAuthenticator {
      *
      * @api public
      */
-    transformAuthInfo(fn, req, done) {
-        if (typeof fn === 'function') {
-            return this._infoTransformers.push(fn);
-        }
-        // private implementation that traverses the chain of transformers,
-        // attempting to transform auth info
-        const info = fn;
-        // For backwards compatibility
-        if (typeof req === 'function') {
-            done = req;
-            req = undefined;
-        }
+    transformAuthInfo(info, req, done) {
         const stack = this._infoTransformers;
         (function pass(i, err, tinfo) {
             // transformers use 'pass' as an error to skip processing
@@ -440,6 +407,15 @@ let PassportAuthenticator = class PassportAuthenticator {
             });
         });
     }
+    addSerializer(fn) {
+        this._serializers.push(fn);
+    }
+    addDeserializer(fn) {
+        this._deserializers.push(fn);
+    }
+    addInfoTransformer(fn) {
+        this._infoTransformers.push(fn);
+    }
 };
 __decorate([
     (0, decorator_1.ApplicationContext)(),

package/dist/passport/passport.service.js

@@ -34,6 +34,9 @@ function PassportStrategy(Strategy, name) {
                     done(err, null);
                 }
             };
+            Object.defineProperty(cb, 'length', {
+                value: this.validate.length + 1,
+            });
             this.strategy = new Strategy(this.getStrategyOptions(), cb);
             if (name) {
                 this.passport.use(name, this.strategy);
@@ -42,13 +45,13 @@ function PassportStrategy(Strategy, name) {
                 this.passport.use(this.strategy);
             }
             if (this['serializeUser']) {
-                this.passport.serializeUser(this['serializeUser']);
+                this.passport.addSerializer(this['serializeUser']);
             }
             if (this['deserializeUser']) {
-                this.passport.deserializeUser(this['deserializeUser']);
+                this.passport.addDeserializer(this['deserializeUser']);
             }
             if (this['transformAuthInfo']) {
-                this.passport.transformAuthInfo(this['transformAuthInfo']);
+                this.passport.addInfoTransformer(this['transformAuthInfo']);
             }
         }
         getStrategy() {
@@ -99,7 +102,19 @@ function PassportMiddleware(strategy) {
                     }
                     // authenticate
                     const authenticate = this.passport.authenticate(strategyList, authOptions);
-                    const authenticateResult = await authenticate(req);
+                    let authenticateResult;
+                    try {
+                        authenticateResult = await authenticate(req);
+                    }
+                    catch (err) {
+                        if (err instanceof core_1.MidwayHttpError) {
+                            throw err;
+                        }
+                        else {
+                            // 如果验证流程里有错误，抛出一个 500 错误
+                            throw new core_1.httpError.InternalServerErrorError(err);
+                        }
+                    }
                     // success
                     if (authenticateResult.successResult) {
                         const breakNext = await this.onceSucceed(options, authenticateResult.successResult.user, authenticateResult.successResult.info, req, res);
@@ -166,7 +181,19 @@ function PassportMiddleware(strategy) {
                     }
                     // authenticate
                     const authenticate = this.passport.authenticate(strategyList, authOptions);
-                    const authenticateResult = await authenticate(req);
+                    let authenticateResult;
+                    try {
+                        authenticateResult = await authenticate(req);
+                    }
+                    catch (err) {
+                        if (err instanceof core_1.MidwayHttpError) {
+                            throw err;
+                        }
+                        else {
+                            // 如果验证流程里有错误，抛出一个 500 错误
+                            throw new core_1.httpError.InternalServerErrorError(err);
+                        }
+                    }
                     // success
                     if (authenticateResult.successResult) {
                         const breakNext = await this.onceSucceed(options, authenticateResult.successResult.user, authenticateResult.successResult.info, req, ctx);

package/dist/passport/session.stratey.d.ts

@@ -29,6 +29,6 @@ export declare class SessionStrategy extends Strategy {
      * @param {Object} options
      * @api protected
      */
-    authenticate(req: any, options: any): import("@midwayjs/core/dist/error/http").UnauthorizedError;
+    authenticate(req: any, options: any): void;
 }
 //# sourceMappingURL=session.stratey.d.ts.map

package/dist/passport/session.stratey.js

@@ -31,7 +31,7 @@ class SessionStrategy extends strategy_1.Strategy {
      */
     authenticate(req, options) {
         if (!req.session) {
-            return new core_1.httpError.UnauthorizedError('Login sessions require session support，please enable it.');
+            throw new core_1.httpError.UnauthorizedError('Login sessions require session support，please enable it.');
         }
         options = options || {};
         let su;
@@ -45,7 +45,7 @@ class SessionStrategy extends strategy_1.Strategy {
             const paused = options.pauseStream ? (0, pause_1.pause)(req) : null;
             this._deserializeUser(su, req, (err, user) => {
                 if (err) {
-                    return new core_1.httpError.UnauthorizedError(err.message);
+                    throw new core_1.httpError.UnauthorizedError(err.message);
                 }
                 if (!user) {
                     delete req.session[this.options.sessionUserProperty].user;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@midwayjs/passport",
   "description": "midway passport component",
-  "version": "3.4.0",
+  "version": "3.4.4",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "files": [
@@ -22,18 +22,18 @@
   "author": "Nawbc",
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/core": "^3.4.0",
-    "@midwayjs/decorator": "^3.4.0",
-    "@midwayjs/express": "^3.4.0",
-    "@midwayjs/jwt": "^3.4.0",
-    "@midwayjs/koa": "^3.4.0",
-    "@midwayjs/mock": "^3.4.0",
-    "@midwayjs/web": "^3.4.0",
+    "@midwayjs/core": "^3.4.4",
+    "@midwayjs/decorator": "^3.4.4",
+    "@midwayjs/express": "^3.4.4",
+    "@midwayjs/jwt": "^3.4.4",
+    "@midwayjs/koa": "^3.4.4",
+    "@midwayjs/mock": "^3.4.4",
+    "@midwayjs/web": "^3.4.4",
     "@types/passport-local": "1.0.34",
     "express-session": "1.17.3",
     "passport-jwt": "4.0.0",
     "passport-local": "1.0.0",
     "passport-openidconnect": "0.1.1"
   },
-  "gitHead": "e48ea9cb52c6e70ab25b68f1188006100eab8184"
+  "gitHead": "f6b5a3ff3d19ae2a0d33a5a14357bee2a8463767"
 }