@midwayjs/passport 3.0.0-beta.9 → 3.0.0

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/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/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/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/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,7 +1,7 @@
 {
   "name": "@midwayjs/passport",
   "description": "midway passport component",
-  "version": "3.0.0-beta.9",
+  "version": "3.0.0",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "files": [
@@ -12,7 +12,7 @@
   "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 +22,22 @@
   "author": "Nawbc",
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/core": "^3.0.0-beta.9",
-    "@midwayjs/decorator": "^3.0.0-beta.9",
-    "@midwayjs/express": "^3.0.0-beta.9",
-    "@midwayjs/jwt": "^3.0.0-beta.9",
-    "@midwayjs/koa": "^3.0.0-beta.9",
-    "@midwayjs/mock": "^3.0.0-beta.9",
-    "@midwayjs/web": "^3.0.0-beta.9",
-    "@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.0",
+    "@midwayjs/decorator": "^3.0.0",
+    "@midwayjs/express": "^3.0.0",
+    "@midwayjs/jwt": "^3.0.0",
+    "@midwayjs/koa": "^3.0.0",
+    "@midwayjs/mock": "^3.0.0",
+    "@midwayjs/web": "^3.0.0",
+    "@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": "d23e4a4fee58097b98461625c428a37d55535cec"
+  "gitHead": "55c26029bccf7bbb739fa1597e8f418dafa2caa0"
 }

package/CHANGELOG.md

@@ -1,26 +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.9](https://github.com/midwayjs/midway/compare/v3.0.0-beta.8...v3.0.0-beta.9) (2021-12-09)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-# [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))