@midwayjs/passport 3.0.0-beta.8 → 3.0.2

package/README.md

@@ -87,7 +87,7 @@ import { Inject, Provide } from '@midwayjs/decorator';
 import { PassportMiddleware } from '@midwayjs/passport';
 import { Context } from '@midwayjs/express';
 
-@Provide('local') // 此处可以使用一个简短的identifier
+@Provide()
 export class LocalPassportMiddleware extends PassportMiddleware(LocalStrategy) {
   // 设置 AuthenticateOptions
   getAuthenticateOptions(): Promise<passport.AuthenticateOptions> | passport.AuthenticateOptions {
@@ -107,7 +107,7 @@ import { Provide, Post, Inject, Controller } from '@midwayjs/decorator';
 @Controller('/')
 export class LocalController {
 
-  @Post('/passport/local', { middleware: ['local'] })
+  @Post('/passport/local', { middleware: [LocalPassportMiddleware] })
   async localPassport() {
     console.log('local user: ', this.ctx.req.user);
     return this.ctx.req.user;
@@ -186,7 +186,7 @@ export class JwtController {
   @Inject()
   ctx: any;
 
-  @Post('/passport/jwt', { middleware: ['jwtPassportMiddleware'] })
+  @Post('/passport/jwt', { middleware: [JwtPassportMiddleware] })
   async jwtPassport() {
     console.log('jwt user: ', this.ctx.req.user);
     return this.ctx.req.user;
@@ -259,10 +259,10 @@ export class AuthController {
   @Inject()
   ctx: any;
 
-  @Get('/github', { middleware: ['githubPassportMiddleware'] })
+  @Get('/github', { middleware: [GithubPassportMiddleware] })
   async githubOAuth() {}
 
-  @Get('/github/cb', { middleware: ['githubPassportMiddleware'] })
+  @Get('/github/cb', { middleware: [GithubPassportMiddleware] })
   async githubOAuthCallback() {
     return this.ctx.req.user;
   }

package/dist/config/config.default.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.passport = void 0;
 exports.passport = {
-    session: false,
+    session: true,
     userProperty: 'user',
 };
 //# sourceMappingURL=config.default.js.map

package/dist/config/config.default.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.default.js","sourceRoot":"","sources":["../../src/config/config.default.ts"],"names":[],"mappings":";;;AAAa,QAAA,QAAQ,GAAG;IACtB,OAAO,EAAE,IAAI;IACb,YAAY,EAAE,MAAM;CACrB,CAAC","sourcesContent":["export const passport = {\n  session: true,\n  userProperty: 'user',\n};\n"]}

package/dist/configuration.d.ts

@@ -1,6 +1,7 @@
+import { IMidwayContainer, MidwayApplicationManager, MidwayConfigService } from '@midwayjs/core';
 export declare class PassportConfiguration {
-    app: any;
-    passportConfig: any;
-    onReady(): Promise<void>;
+    applicationManager: MidwayApplicationManager;
+    configService: MidwayConfigService;
+    onReady(container: IMidwayContainer): Promise<void>;
 }
 //# sourceMappingURL=configuration.d.ts.map

package/dist/configuration.js

@@ -13,23 +13,29 @@ exports.PassportConfiguration = void 0;
 const decorator_1 = require("@midwayjs/decorator");
 const DefaultConfig = require("./config/config.default");
 const util_1 = require("./util");
+const core_1 = require("@midwayjs/core");
 let PassportConfiguration = class PassportConfiguration {
-    async onReady() {
+    async onReady(container) {
+        const passportConfig = this.configService.getConfiguration('passport');
         const passport = (0, util_1.getPassport)();
-        this.app.useMiddleware(passport.initialize());
-        if (this.passportConfig.session) {
-            this.app.useMiddleware(passport.session());
-        }
+        this.applicationManager
+            .getApplications(['express', 'koa', 'egg', 'faas'])
+            .forEach(app => {
+            app.useMiddleware(passport.initialize());
+            if (passportConfig.session) {
+                app.useMiddleware(passport.session());
+            }
+        });
     }
 };
 __decorate([
-    (0, decorator_1.App)(),
-    __metadata("design:type", Object)
-], PassportConfiguration.prototype, "app", void 0);
+    (0, decorator_1.Inject)(),
+    __metadata("design:type", core_1.MidwayApplicationManager)
+], PassportConfiguration.prototype, "applicationManager", void 0);
 __decorate([
-    (0, decorator_1.Config)('passport'),
-    __metadata("design:type", Object)
-], PassportConfiguration.prototype, "passportConfig", void 0);
+    (0, decorator_1.Inject)(),
+    __metadata("design:type", core_1.MidwayConfigService)
+], PassportConfiguration.prototype, "configService", void 0);
 PassportConfiguration = __decorate([
     (0, decorator_1.Configuration)({
         namespace: 'passport',

package/dist/configuration.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../src/configuration.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAA4D;AAC5D,yDAAyD;AACzD,iCAAqC;AACrC,yCAIwB;AAUxB,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAOhC,KAAK,CAAC,OAAO,CAAC,SAA2B;QACvC,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QACvE,MAAM,QAAQ,GAAG,IAAA,kBAAW,GAAE,CAAC;QAC/B,IAAI,CAAC,kBAAkB;aACpB,eAAe,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;aAClD,OAAO,CAAC,GAAG,CAAC,EAAE;YACb,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;YACzC,IAAI,cAAc,CAAC,OAAO,EAAE;gBAC1B,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;aACvC;QACH,CAAC,CAAC,CAAC;IACP,CAAC;CACF,CAAA;AAjBC;IADC,IAAA,kBAAM,GAAE;8BACW,+BAAwB;iEAAC;AAG7C;IADC,IAAA,kBAAM,GAAE;8BACM,0BAAmB;4DAAC;AALxB,qBAAqB;IARjC,IAAA,yBAAa,EAAC;QACb,SAAS,EAAE,UAAU;QACrB,aAAa,EAAE;YACb;gBACE,OAAO,EAAE,aAAa;aACvB;SACF;KACF,CAAC;GACW,qBAAqB,CAmBjC;AAnBY,sDAAqB","sourcesContent":["import { Inject, Configuration } from '@midwayjs/decorator';\nimport * as DefaultConfig from './config/config.default';\nimport { getPassport } from './util';\nimport {\n  IMidwayContainer,\n  MidwayApplicationManager,\n  MidwayConfigService,\n} from '@midwayjs/core';\n\n@Configuration({\n  namespace: 'passport',\n  importConfigs: [\n    {\n      default: DefaultConfig,\n    },\n  ],\n})\nexport class PassportConfiguration {\n  @Inject()\n  applicationManager: MidwayApplicationManager;\n\n  @Inject()\n  configService: MidwayConfigService;\n\n  async onReady(container: IMidwayContainer) {\n    const passportConfig = this.configService.getConfiguration('passport');\n    const passport = getPassport();\n    this.applicationManager\n      .getApplications(['express', 'koa', 'egg', 'faas'])\n      .forEach(app => {\n        app.useMiddleware(passport.initialize());\n        if (passportConfig.session) {\n          app.useMiddleware(passport.session());\n        }\n      });\n  }\n}\n"]}

package/dist/decorator/strategy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"strategy.js","sourceRoot":"","sources":["../../src/decorator/strategy.ts"],"names":[],"mappings":";;;AAAA,mDAAgE;AAEhE,SAAgB,cAAc;IAC5B,OAAO,MAAM,CAAC,EAAE;QACd,IAAA,iBAAK,EAAC,qBAAS,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC;QACnC,IAAA,mBAAO,GAAE,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC,CAAC;AACJ,CAAC;AALD,wCAKC","sourcesContent":["import { Provide, Scope, ScopeEnum } from '@midwayjs/decorator';\n\nexport function CustomStrategy(): ClassDecorator {\n  return target => {\n    Scope(ScopeEnum.Singleton)(target);\n    Provide()(target);\n  };\n}\n"]}

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,iDAAyE;AAAhE,8GAAA,qBAAqB,OAAiB;AAC/C,uDAAqC;AACrC,qDAAmC","sourcesContent":["export { PassportConfiguration as Configuration } from './configuration';\nexport * from './decorator/strategy';\nexport * from './service/passport';\n"]}

package/dist/interface.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"interface.js","sourceRoot":"","sources":["../src/interface.ts"],"names":[],"mappings":";;;AAUA,MAAsB,gBAAgB;CAGrC;AAHD,4CAGC;AAMD,MAAsB,0BAA0B;CAG/C;AAHD,gEAGC","sourcesContent":["import * as passport from 'passport';\n\nexport interface IPassportStrategy {\n  validate(...args): any;\n  getStrategyOptions(): any;\n  serializeUser?(user: any, done: (err: any, id?: any) => void): void;\n  deserializeUser?(id: any, done: (err: any, user?: any) => void): void;\n  transformAuthInfo?(info: any, done: (err: any, info: any) => void): void;\n}\n\nexport abstract class AbstractStrategy implements IPassportStrategy {\n  abstract validate(...args): any;\n  abstract getStrategyOptions(): any;\n}\n\nexport interface IPassportMiddleware {\n  authenticate?(options: passport.AuthenticateOptions, callback: Function);\n}\n\nexport abstract class AbstractPassportMiddleware implements IPassportMiddleware {\n  abstract getAuthenticateOptions(): Promise<passport.AuthenticateOptions> | passport.AuthenticateOptions;\n  authenticate?(options: passport.AuthenticateOptions, callback?: Function);\n}\n"]}

package/dist/proxy/framework/koa.js

@@ -39,6 +39,10 @@ function initialize(passport) {
         const login = req.login;
         ctx.login = ctx.logIn = function (user, options) {
             return new Promise((resolve, reject) => {
+                // fix session manager missing
+                if (!req._sessionManager) {
+                    req._sessionManager = passport._sm;
+                }
                 login.call(req, user, options, err => {
                     if (err)
                         reject(err);

package/dist/proxy/framework/koa.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"koa.js","sourceRoot":"","sources":["../../../src/proxy/framework/koa.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb;;GAEG;AACH,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAErC;;GAEG;AACH,MAAM,WAAW,GAAG,OAAO,CAAC,oCAAoC,CAAC,CAAC;AAClE,MAAM,aAAa,GAAG,OAAO,CAAC,sCAAsC,CAAC,CAAC;AACtE,MAAM,aAAa,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC;AAElD;;;;;GAKG;AACH,SAAS,UAAU,CAAC,QAAQ;IAC1B,MAAM,UAAU,GAAG,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC;IACpD,OAAO,SAAS,kBAAkB,CAAC,GAAG,EAAE,IAAI;QAC1C,iCAAiC;QACjC,MAAM,YAAY,GAAG,QAAQ,CAAC,aAAa,IAAI,MAAM,CAAC;QACtD,qCAAqC;QACrC,iDAAiD;QACjD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,YAAY,CAAC,EAAE;YACzC,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,EAAE,YAAY,EAAE;gBAC3C,UAAU,EAAE,IAAI;gBAChB,GAAG,EAAE;oBACH,OAAO,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;gBACjC,CAAC;gBACD,GAAG,EAAE,UAAU,GAAG;oBAChB,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC;gBAChC,CAAC;aACF,CAAC,CAAC;SACJ;QAED,6CAA6C;QAC7C,MAAM,GAAG,GAAG,aAAa,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;QAE7C,iCAAiC;QACjC,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC;QACxB,GAAG,CAAC,KAAK,GAAG,GAAG,CAAC,KAAK,GAAG,UAAU,IAAI,EAAE,OAAO;YAC7C,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC3C,8BAA8B;gBAC9B,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE;oBACxB,GAAG,CAAC,eAAe,GAAG,QAAQ,CAAC,GAAG,CAAC;iBACpC;gBACD,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE;oBACnC,IAAI,GAAG;wBAAE,MAAM,CAAC,GAAG,CAAC,CAAC;;wBAChB,OAAO,EAAE,CAAC;gBACjB,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;QAEF,iEAAiE;QACjE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC/C,GAAG,CAAC,eAAe,GAAG,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACpD,GAAG,CAAC,iBAAiB,GAAG,GAAG,CAAC,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAExD,OAAO,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;YACpC,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAED;;;;;;;;GAQG;AACH,SAAS,YAAY,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ;IACrD,sBAAsB;IACtB,IAAI,OAAO,OAAO,KAAK,UAAU,EAAE;QACjC,QAAQ,GAAG,OAAO,CAAC;QACnB,OAAO,GAAG,EAAE,CAAC;KACd;IACD,OAAO,GAAG,OAAO,IAAI,EAAE,CAAC;IAExB,IAAI,QAAQ,EAAE;QACZ,wEAAwE;QACxE,yEAAyE;QACzE,+DAA+D;QAC/D,0EAA0E;QAC1E,wEAAwE;QACxE,oEAAoE;QACpE,8CAA8C;QAC9C,MAAM,SAAS,GAAG,QAAQ,CAAC;QAC3B,QAAQ,GAAG,UAAU,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM;YAC1C,IAAI;gBACF,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;qBAChD,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;qBACnC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;aACvC;YAAC,OAAO,GAAG,EAAE;gBACZ,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;aACtB;QACH,CAAC,CAAC;KACH;IAED,MAAM,UAAU,GAAG,SAAS,CAC1B,aAAa,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,CACjD,CAAC;IAEF,OAAO,SAAS,oBAAoB,CAAC,GAAG,EAAE,IAAI;QAC5C,8CAA8C;QAC9C,sDAAsD;QACtD,MAAM,CAAC,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACxC,wBAAwB;YACxB,MAAM,GAAG,GAAG,aAAa,CACvB,GAAG,EACH,OAAO,CAAC,cAAc,IAAI,QAAQ,CAAC,aAAa,IAAI,MAAM,CAC3D,CAAC;YAEF,SAAS,iBAAiB,CAAC,OAAO;gBAChC,IAAI,OAAO;oBAAE,GAAG,CAAC,IAAI,GAAG,OAAO,CAAC;gBAChC,OAAO,CAAC,KAAK,CAAC,CAAC;YACjB,CAAC;YAED,wBAAwB;YACxB,MAAM,GAAG,GAAG;gBACV,QAAQ,EAAE,UAAU,GAAG;oBACrB,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;oBAClB,OAAO,CAAC,KAAK,CAAC,CAAC;gBACjB,CAAC;gBACD,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC;gBACtB,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC;gBAC5B,GAAG,EAAE,iBAAiB;gBACtB,IAAI,EAAE,iBAAiB;gBACvB,IAAI,UAAU,CAAC,MAAM;oBACnB,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC;gBACtB,CAAC;gBACD,IAAI,UAAU;oBACZ,OAAO,GAAG,CAAC,MAAM,CAAC;gBACpB,CAAC;aACF,CAAC;YAEF,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC;YAEd,mCAAmC;YACnC,IAAI,QAAQ,EAAE;gBACZ,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC;gBAC3B,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC;aAC1B;YAED,8BAA8B;YAC9B,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACnB,kEAAkE;YAClE,qEAAqE;YACrE,IAAI,IAAI,KAAK,KAAK,EAAE;gBAClB,OAAO,IAAI,EAAE,CAAC;aACf;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAED;;;;;;;;GAQG;AACH,SAAS,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ;IAClD,OAAO,GAAG,OAAO,IAAI,EAAE,CAAC;IACxB,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAEnC,OAAO,YAAY,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;AACzD,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,CAAC,OAAO,GAAG;IACf,OAAO;QACL,UAAU,EAAE,UAAU;QACtB,YAAY,EAAE,YAAY;QAC1B,SAAS,EAAE,SAAS;KACrB,CAAC;AACJ,CAAC,CAAC;AAEF,SAAS,SAAS,CAAC,iBAAiB;IAClC,OAAO,UAAU,GAAG,EAAE,GAAG;QACvB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;gBAC1C,IAAI,GAAG;oBAAE,MAAM,CAAC,GAAG,CAAC,CAAC;;oBAChB,OAAO,CAAC,MAAM,CAAC,CAAC;YACvB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC","sourcesContent":["'use strict';\n\n/**\n * Module dependencies.\n */\nconst passport = require('passport');\n\n/**\n * Passport's default/connect middleware.\n */\nconst _initialize = require('passport/lib/middleware/initialize');\nconst _authenticate = require('passport/lib/middleware/authenticate');\nconst createReqMock = require('./request').create;\n\n/**\n * Passport's initialization middleware for Koa.\n *\n * @return {GeneratorFunction}\n * @api private\n */\nfunction initialize(passport) {\n  const middleware = promisify(_initialize(passport));\n  return function passportInitialize(ctx, next) {\n    // koa <-> connect compatibility:\n    const userProperty = passport._userProperty || 'user';\n    // check ctx.req has the userProperty\n    // eslint-disable-next-line no-prototype-builtins\n    if (!ctx.req.hasOwnProperty(userProperty)) {\n      Object.defineProperty(ctx.req, userProperty, {\n        enumerable: true,\n        get: function () {\n          return ctx.state[userProperty];\n        },\n        set: function (val) {\n          ctx.state[userProperty] = val;\n        },\n      });\n    }\n\n    // create mock object for express' req object\n    const req = createReqMock(ctx, userProperty);\n\n    // add Promise-based login method\n    const login = req.login;\n    ctx.login = ctx.logIn = function (user, options) {\n      return new Promise<void>((resolve, reject) => {\n        // fix session manager missing\n        if (!req._sessionManager) {\n          req._sessionManager = passport._sm;\n        }\n        login.call(req, user, options, err => {\n          if (err) reject(err);\n          else resolve();\n        });\n      });\n    };\n\n    // add aliases for passport's request extensions to Koa's context\n    ctx.logout = ctx.logOut = req.logout.bind(req);\n    ctx.isAuthenticated = req.isAuthenticated.bind(req);\n    ctx.isUnauthenticated = req.isUnauthenticated.bind(req);\n\n    return middleware(req, ctx).then(() => {\n      return next();\n    });\n  };\n}\n\n/**\n * Passport's authenticate middleware for Koa.\n *\n * @param {String|Array} name\n * @param {Object} options\n * @param {GeneratorFunction} callback\n * @return {GeneratorFunction}\n * @api private\n */\nfunction authenticate(passport, name, options, callback) {\n  // normalize arguments\n  if (typeof options === 'function') {\n    callback = options;\n    options = {};\n  }\n  options = options || {};\n\n  if (callback) {\n    // When the callback is set, neither `next`, `res.redirect` or `res.end`\n    // are called. That is, a workaround to catch the `callback` is required.\n    // The `passportAuthenticate()` method below will therefore set\n    // `callback.resolve` and `callback.reject`. Then, once the authentication\n    // finishes, the modified callback calls the original one and afterwards\n    // triggers either `callback.resolve` or `callback.reject` to inform\n    // `passportAuthenticate()` that we are ready.\n    const _callback = callback;\n    callback = function (err, user, info, status) {\n      try {\n        Promise.resolve(_callback(err, user, info, status))\n          .then(() => callback.resolve(false))\n          .catch(err => callback.reject(err));\n      } catch (err) {\n        callback.reject(err);\n      }\n    };\n  }\n\n  const middleware = promisify(\n    _authenticate(passport, name, options, callback)\n  );\n\n  return function passportAuthenticate(ctx, next) {\n    // this functions wraps the connect middleware\n    // to catch `next`, `res.redirect` and `res.end` calls\n    const p = new Promise((resolve, reject) => {\n      // mock the `req` object\n      const req = createReqMock(\n        ctx,\n        options.assignProperty || passport._userProperty || 'user'\n      );\n\n      function setBodyAndResolve(content) {\n        if (content) ctx.body = content;\n        resolve(false);\n      }\n\n      // mock the `res` object\n      const res = {\n        redirect: function (url) {\n          ctx.redirect(url);\n          resolve(false);\n        },\n        set: ctx.set.bind(ctx),\n        setHeader: ctx.set.bind(ctx),\n        end: setBodyAndResolve,\n        send: setBodyAndResolve,\n        set statusCode(status) {\n          ctx.status = status;\n        },\n        get statusCode() {\n          return ctx.status;\n        },\n      };\n\n      req.res = res;\n\n      // update the custom callback above\n      if (callback) {\n        callback.resolve = resolve;\n        callback.reject = reject;\n      }\n\n      // call the connect middleware\n      middleware(req, res).then(resolve, reject);\n    });\n\n    return p.then(cont => {\n      // cont equals `false` when `res.redirect` or `res.end` got called\n      // in this case, call next to continue through Koa's middleware stack\n      if (cont !== false) {\n        return next();\n      }\n    });\n  };\n}\n\n/**\n * Passport's authorize middleware for Koa.\n *\n * @param {String|Array} name\n * @param {Object} options\n * @param {GeneratorFunction} callback\n * @return {GeneratorFunction}\n * @api private\n */\nfunction authorize(passport, name, options, callback) {\n  options = options || {};\n  options.assignProperty = 'account';\n\n  return authenticate(passport, name, options, callback);\n}\n\n/**\n * Framework support for Koa.\n *\n * This module provides support for using Passport with Koa. It exposes\n * middleware that conform to the `fn*(next)` signature and extends\n * Node's built-in HTTP request object with useful authentication-related\n * functions.\n *\n * @return {Object}\n * @api protected\n */\nmodule.exports = function () {\n  return {\n    initialize: initialize,\n    authenticate: authenticate,\n    authorize: authorize,\n  };\n};\n\nfunction promisify(expressMiddleware) {\n  return function (req, res) {\n    return new Promise((resolve, reject) => {\n      expressMiddleware(req, res, (err, result) => {\n        if (err) reject(err);\n        else resolve(result);\n      });\n    });\n  };\n}\n"]}

package/dist/proxy/framework/request.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../src/proxy/framework/request.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable */\n\n// Koa and Express are fundamental different in how they deal with extensions\n// to the incoming request.\n// Express pollutes Node's IncomingRequest directly, while Koa keeps Node's\n// IncomingRequest untouched and adds is own high-level request object.\n// These both approaches are not directly compatible with each other, since\n// properties/methods found in Express' `req` object are now spread between\n// Koa's context, Koa's request object and the original incoming request.\n// This makes moking the Express `req` object an ugly task. With ES6 we could\n// simply use a Proxy, e.g.:\n//\n// function createReqMock(ctx) {\n//   // Use a proxy that forwards `req` reads to either `ctx.passport`,\n//   // Node's request, Koa's request or Koa's context. Writes are persistet\n//   // into `ctx.passport`.\n//   return Proxy.create(handler(ctx.passport, {\n//     get: function(receiver, key) {\n//       return ctx.passport[key] || ctx.req[key] || ctx.request[key] || ctx[key]\n//     }\n//   }))\n// }\n//\n// However, the current Proxy implementation does not allow debugging.\n// See: https://github.com/rkusa/koa-passport/issues/17\n//\n// Until this is fixed, koa-passport tries to properly delegate every possible\n// used property/method.\n\n// Property/Method names to be delegated\nlet keys = [\n  // passport\n  '_passport',\n  'authInfo',\n\n  // http.IncomingMessage\n  'httpVersion',\n  'headers',\n  'trailers',\n  'setTimeout',\n  'method',\n  'url',\n  'statusCode',\n  'socket',\n  'connection',\n  'protocol',\n\n  // Koa's context\n  'cookies',\n  'throw',\n  'ip',\n\n  // Others. Are not supported directly - require proper plugins/middlewares.\n  'param',\n  'params',\n  'route',\n  'xhr',\n  'baseUrl',\n  'session',\n  'body',\n  'flash',\n];\n\n// remove duplicates\nkeys = keys.filter((key, i, self) => {\n  return self.indexOf(key) === i;\n});\n\n// create a delegate for each key\nconst properties = {\n  // mock express' .get('trust proxy')\n  app: {\n    // getter returning a mock for `req.app` containing\n    // the `.get()` method\n    get: function () {\n      const ctx = this.ctx;\n      return {\n        get: function (key) {\n          if (key === 'trust proxy') {\n            return ctx.app.proxy;\n          }\n\n          return undefined;\n        },\n      };\n    },\n  },\n};\n\nkeys.forEach(key => {\n  properties[key] = {\n    get: function () {\n      const obj = getObject(this.ctx, key);\n      if (!obj) return undefined;\n\n      // if its a function, call with the proper context\n      if (typeof obj[key] === 'function') {\n        return function () {\n          return obj[key].apply(obj, arguments);\n        };\n      }\n\n      // otherwise, simply return it\n      return obj[key];\n    },\n    set: function (value) {\n      const obj = getObject(this.ctx, key) || this.ctx.state;\n      obj[key] = value;\n    },\n  };\n});\n\n// test where the key is available, either in `ctx.state`, Node's request,\n// Koa's request or Koa's context\nfunction getObject(ctx, key) {\n  if (ctx.state && key in ctx.state) {\n    return ctx.state;\n  }\n\n  if (key in ctx.request) {\n    return ctx.request;\n  }\n\n  if (key in ctx.req) {\n    return ctx.req;\n  }\n\n  if (key in ctx) {\n    return ctx;\n  }\n\n  return undefined;\n}\n\nconst IncomingMessageExt = require('passport/lib/http/request');\n\nexports.create = function (ctx, userProperty) {\n  const req = Object.create(ctx.request, properties);\n\n  Object.defineProperty(req, userProperty, {\n    enumerable: true,\n    get: function () {\n      return ctx.state[userProperty];\n    },\n    set: function (val) {\n      ctx.state[userProperty] = val;\n    },\n  });\n\n  Object.defineProperty(req, 'ctx', {\n    enumerable: true,\n    get: function () {\n      return ctx;\n    },\n  });\n\n  // add passport http.IncomingMessage extensions\n  req.login = IncomingMessageExt.logIn;\n  req.logIn = IncomingMessageExt.logIn;\n  req.logout = IncomingMessageExt.logOut;\n  req.logOut = IncomingMessageExt.logOut;\n  req.isAuthenticated = IncomingMessageExt.isAuthenticated;\n  req.isUnauthenticated = IncomingMessageExt.isUnauthenticated;\n\n  return req;\n};\n"]}

package/dist/proxy/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/proxy/index.ts"],"names":[],"mappings":";;;AAAA,wCAAwC;AACxC,MAAM,OAAO,GAAG,OAAO,CAAC,gCAAgC,CAAC,CAAC;AAC1D,OAAO,CAAC,iBAAiB,GAAG,cAAa,CAAC,CAAC;AAE3C,0CAA0C;AAC1C,MAAM,cAAc,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC;AAC9C,MAAM,SAAS,GAAG,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC;AAE/C,cAAc,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;AAEpC,MAAa,WAAY,SAAQ,QAAQ;IACvC;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IAC5B,CAAC;CACF;AALD,kCAKC;AAED,4BAA4B;AACf,QAAA,QAAQ,GAAG,cAAc,CAAC","sourcesContent":["// prevent passport from monkey patching\nconst connect = require('passport/lib/framework/connect');\nconnect.__monkeypatchNode = function () {};\n\n// load passport and add the koa framework\nconst originPassport = require('passport');\nconst Passport = require('passport').Passport;\nconst framework = require('./framework/koa')();\n\noriginPassport.framework(framework);\n\nexport class KoaPassport extends Passport {\n  constructor() {\n    super();\n    this.framework(framework);\n  }\n}\n\n// Export default singleton.\nexport const passport = originPassport;\n"]}

package/dist/service/passport.js

@@ -13,6 +13,7 @@ exports.PassportMiddleware = exports.PassportStrategy = void 0;
 const decorator_1 = require("@midwayjs/decorator");
 const util_1 = require("../util");
 const interface_1 = require("../interface");
+const core_1 = require("@midwayjs/core");
 function PassportStrategy(Strategy, name) {
     class InnerStrategyAbstractClass extends interface_1.AbstractStrategy {
         async init() {
@@ -132,7 +133,7 @@ function PassportMiddleware(strategy) {
                                 return;
                             }
                             else {
-                                res.status(401);
+                                throw new core_1.httpError.UnauthorizedError();
                             }
                         }
                         next();
@@ -195,7 +196,7 @@ function PassportMiddleware(strategy) {
                                     return;
                                 }
                                 else {
-                                    ctx.status = 401;
+                                    throw new core_1.httpError.UnauthorizedError();
                                 }
                             }
                             await next();
@@ -207,6 +208,9 @@ function PassportMiddleware(strategy) {
                 }.bind(this);
             }
         }
+        static getName() {
+            return 'passport';
+        }
     }
     __decorate([
         (0, decorator_1.Config)('passport'),

package/dist/service/passport.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"passport.js","sourceRoot":"","sources":["../../src/service/passport.ts"],"names":[],"mappings":"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","sourcesContent":["import * as passport from 'passport';\nimport { App, Config, Init } from '@midwayjs/decorator';\nimport { getPassport, isExpressMode } from '../util';\nimport { AbstractPassportMiddleware, AbstractStrategy } from '../interface';\nimport { httpError } from '@midwayjs/core';\n\nexport function PassportStrategy(\n  Strategy: new (...args) => passport.Strategy,\n  name?: string\n): new (...args) => AbstractStrategy {\n  abstract class InnerStrategyAbstractClass extends AbstractStrategy {\n    private strategy;\n\n    @Init()\n    async init() {\n      const cb = async (...params: any[]) => {\n        const done = params[params.length - 1];\n        try {\n          const result = await this.validate(...params);\n          if (Array.isArray(result)) {\n            done(null, ...result);\n          } else {\n            done(null, result);\n          }\n        } catch (err) {\n          done(err, null);\n        }\n      };\n\n      this.strategy = new Strategy(this.getStrategyOptions(), cb);\n\n      const passport = getPassport() as passport.PassportStatic;\n      if (name) {\n        passport.use(name, this.strategy);\n      } else {\n        passport.use(this.strategy);\n      }\n      if (this['serializeUser']) {\n        passport.serializeUser(this['serializeUser']);\n      }\n\n      if (this['deserializeUser']) {\n        passport.deserializeUser(this['deserializeUser']);\n      }\n\n      if (this['transformAuthInfo']) {\n        passport.transformAuthInfo(this['transformAuthInfo']);\n      }\n    }\n\n    getStrategy() {\n      return this.strategy;\n    }\n  }\n  return InnerStrategyAbstractClass as any;\n}\n\nexport type StrategyClass = new (...args) => AbstractStrategy;\n\nexport function PassportMiddleware(\n  strategy: StrategyClass | StrategyClass[]\n): new (...args) => AbstractPassportMiddleware {\n  abstract class InnerPassportMiddleware extends AbstractPassportMiddleware {\n    @Config('passport')\n    passportConfig;\n\n    @App()\n    app;\n\n    resolve() {\n      if (isExpressMode()) {\n        return async function passportMiddleware(req, res, next) {\n          return this.authenticate(await this.getAuthenticateOptions())(\n            req,\n            res,\n            next\n          );\n        }.bind(this);\n      } else {\n        return async function passportMiddleware(ctx, next) {\n          return this.authenticate(await this.getAuthenticateOptions())(\n            ctx,\n            next\n          );\n        }.bind(this);\n      }\n    }\n\n    getAuthenticateOptions():\n      | Promise<passport.AuthenticateOptions>\n      | passport.AuthenticateOptions {\n      return undefined;\n    }\n\n    authenticate(options: passport.AuthenticateOptions): any {\n      if (!Array.isArray(strategy)) {\n        strategy = [strategy];\n      }\n\n      if (isExpressMode()) {\n        return async (req, res, next) => {\n          // merge options with default options\n          const authOptions = {\n            ...this.passportConfig,\n            ...options,\n          };\n\n          if (authOptions.session && req.session[authOptions.userProperty]) {\n            req[authOptions.userProperty] =\n              req.session[authOptions.userProperty];\n          }\n          // ignore user has exists\n          if (req[authOptions.userProperty]) {\n            next();\n          } else {\n            const passport = getPassport() as passport.PassportStatic;\n            const strategyList = [];\n            for (const strategySingle of strategy as StrategyClass[]) {\n              // got strategy\n              const strategyInstance = await this.app\n                .getApplicationContext()\n                .getAsync(strategySingle);\n              strategyList.push(strategyInstance.getStrategy());\n            }\n\n            const user = await new Promise<any>((resolve, reject) => {\n              // authenticate\n              passport.authenticate(\n                strategyList,\n                authOptions,\n                (err, user, info, status) => {\n                  if (err) {\n                    reject(err);\n                  } else {\n                    resolve(user);\n                  }\n                }\n              )(req, res, err => (err ? reject(err) : resolve(0)));\n            });\n            if (user) {\n              req[authOptions.userProperty] = user;\n              if (authOptions.session) {\n                req.logIn(user, options, next);\n                return;\n              }\n            } else {\n              if (options.failureRedirect) {\n                res.redirect(options.failureRedirect);\n                return;\n              } else {\n                throw new httpError.UnauthorizedError();\n              }\n            }\n            next();\n          }\n        };\n      } else {\n        return async function bbb(ctx, next) {\n          // merge options with default options\n          const authOptions = {\n            ...this.passportConfig,\n            ...options,\n          };\n\n          if (\n            authOptions.session &&\n            ctx.session.passport &&\n            ctx.session.passport[authOptions.userProperty]\n          ) {\n            ctx.state[authOptions.userProperty] =\n              ctx.session.passport[authOptions.userProperty];\n          }\n          // ignore user has exists\n          if (ctx.state[authOptions.userProperty]) {\n            await next();\n          } else {\n            const passport = getPassport() as passport.PassportStatic;\n            const strategyList = [];\n            for (const strategySingle of strategy as StrategyClass[]) {\n              // got strategy\n              const strategyInstance = await this.app\n                .getApplicationContext()\n                .getAsync(strategySingle);\n              strategyList.push(strategyInstance.getStrategy());\n            }\n            try {\n              const user = await new Promise<any>((resolve, reject) => {\n                // authenticate\n                passport.authenticate(\n                  strategyList,\n                  authOptions,\n                  (err, user, info, status) => {\n                    if (err) {\n                      reject(err);\n                    } else {\n                      resolve(user);\n                    }\n                  }\n                )(ctx, err => (err ? reject(err) : resolve(0)));\n              });\n              if (user) {\n                ctx.state[authOptions.userProperty] = user;\n                if (authOptions.session) {\n                  // save to ctx.session.passport\n                  await ctx.login(user, options);\n                }\n                if (options.successRedirect) {\n                  ctx.redirect(options.successRedirect);\n                  return;\n                }\n              } else {\n                if (options.failureRedirect) {\n                  ctx.redirect(options.failureRedirect);\n                  return;\n                } else {\n                  throw new httpError.UnauthorizedError();\n                }\n              }\n              await next();\n            } catch (err) {\n              ctx.throw(err);\n            }\n          }\n        }.bind(this);\n      }\n    }\n\n    static getName() {\n      return 'passport';\n    }\n  }\n  return InnerPassportMiddleware as any;\n}\n"]}

package/dist/util.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":";;;AAAA,yCAA6C;AAE7C,SAAgB,WAAW;IACzB,OAAO,aAAa,EAAE;QACpB,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC;QACrB,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC;AACxC,CAAC;AAJD,kCAIC;AAED,SAAgB,aAAa;;IAC3B,OAAO,CAAC,CAAC,CACP,MAAA,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,KAAK,SAAS,mCACjD,IAAA,kBAAW,EAAC,mBAAmB,CAAC,CACjC,CAAC;AACJ,CAAC;AALD,sCAKC","sourcesContent":["import { safeRequire } from '@midwayjs/core';\n\nexport function getPassport() {\n  return isExpressMode()\n    ? require('passport')\n    : require('./proxy/index').passport;\n}\n\nexport function isExpressMode(): boolean {\n  return !!(\n    process.env['MIDWAY_PASSPORT_MODE'] === 'express' ??\n    safeRequire('@midwayjs/express')\n  );\n}\n"]}

package/index.d.ts

@@ -7,3 +7,51 @@ declare module '@midwayjs/core/dist/interface' {
     passport?: passport.AuthenticateOptions;
   }
 }
+
+declare module '@midwayjs/koa/dist/interface' {
+  interface Context {
+    state: {
+      user?: any;
+    };
+    isAuthenticated(): boolean;
+    isUnauthenticated(): boolean;
+    login(): Promise<void>;
+    logout(): void;
+  }
+}
+
+declare module '@midwayjs/web/dist/interface' {
+  interface Context {
+    state: {
+      user?: any;
+    };
+    isAuthenticated(): boolean;
+    isUnauthenticated(): boolean;
+    login(): Promise<void>;
+    logout(): void;
+  }
+}
+
+declare module '@midwayjs/faas/dist/interface' {
+  interface Context {
+    state: {
+      user?: any;
+    };
+    isAuthenticated(): boolean;
+    isUnauthenticated(): boolean;
+    login(): Promise<void>;
+    logout(): void;
+  }
+}
+
+declare module '@midwayjs/express/dist/interface' {
+  interface Context {
+    user?: any;
+    // These declarations are merged into express's Request type
+    login(user: any, done: (err: any) => void): void;
+    login(user: any, options: any, done: (err: any) => void): void;
+    logout(): void;
+    isAuthenticated(): boolean;
+    isUnauthenticated(): boolean;
+  }
+}

package/package.json

@@ -1,18 +1,19 @@
 {
   "name": "@midwayjs/passport",
   "description": "midway passport component",
-  "version": "3.0.0-beta.8",
+  "version": "3.0.2",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "files": [
     "dist/**/*.js",
     "dist/**/*.d.ts",
-    "index.d.ts"
+    "index.d.ts",
+    "dist/**/*.js.map"
   ],
   "scripts": {
     "build": "tsc",
     "test": "node --require=ts-node/register ../../node_modules/jest/bin/jest.js",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit"
+    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit"
   },
   "keywords": [
     "midway",
@@ -22,22 +23,22 @@
   "author": "Nawbc",
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/core": "^3.0.0-beta.8",
-    "@midwayjs/decorator": "^3.0.0-beta.8",
-    "@midwayjs/express": "^3.0.0-beta.8",
-    "@midwayjs/jwt": "^3.0.0-beta.8",
-    "@midwayjs/koa": "^3.0.0-beta.8",
-    "@midwayjs/mock": "^3.0.0-beta.8",
-    "@midwayjs/web": "^3.0.0-beta.8",
-    "@types/passport": "^1.0.7",
-    "@types/passport-local": "^1.0.34",
-    "express-session": "^1.17.2",
-    "passport": "^0.5.0",
-    "passport-jwt": "^4.0.0",
-    "passport-local": "^1.0.0"
+    "@midwayjs/core": "^3.0.2",
+    "@midwayjs/decorator": "^3.0.2",
+    "@midwayjs/express": "^3.0.2",
+    "@midwayjs/jwt": "^3.0.2",
+    "@midwayjs/koa": "^3.0.2",
+    "@midwayjs/mock": "^3.0.2",
+    "@midwayjs/web": "^3.0.2",
+    "@types/passport": "1.0.7",
+    "@types/passport-local": "1.0.34",
+    "express-session": "1.17.2",
+    "passport": "0.5.2",
+    "passport-jwt": "4.0.0",
+    "passport-local": "1.0.0"
   },
   "peerDependencies": {
     "passport": "^0.5.0"
   },
-  "gitHead": "bfafbdf8798f48d4daac5dd88ad53c6b2f33c110"
+  "gitHead": "ca77247d229978a736e79bb208579c014ed226fc"
 }

package/CHANGELOG.md

@@ -1,18 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-# [3.0.0-beta.8](https://github.com/midwayjs/midway/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2021-12-08)
-
-
-### Bug Fixes
-
-* express routing middleware takes effect at the controller level ([#1364](https://github.com/midwayjs/midway/issues/1364)) ([b9272e0](https://github.com/midwayjs/midway/commit/b9272e0971003443304b0c53815be31a0061b4bd))
-* passport missing proxy file ([#1405](https://github.com/midwayjs/midway/issues/1405)) ([5c9bdae](https://github.com/midwayjs/midway/commit/5c9bdae8323b41ead72c3d3f867aa11150bb3e78))
-
-
-### Features
-
-* passport add presetProperty ([#1358](https://github.com/midwayjs/midway/issues/1358)) ([4db8eda](https://github.com/midwayjs/midway/commit/4db8eda592c0486898edabcacbc9a69eb2d87004))
-* support passport and jwt ([#1343](https://github.com/midwayjs/midway/issues/1343)) ([f26af4f](https://github.com/midwayjs/midway/commit/f26af4f3e16507d6f3ffe0467f8f5be69e6306d7))