@midwayjs/passport 3.4.0-beta.9 → 3.4.3

package/index.d.ts

@@ -1,10 +1,10 @@
-import * as passport from 'passport';
+import { AuthenticateOptions } from './dist/index';
 
 export * from './dist/index';
 
 declare module '@midwayjs/core/dist/interface' {
   interface MidwayConfig {
-    passport?: passport.AuthenticateOptions;
+    passport?: AuthenticateOptions;
   }
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@midwayjs/passport",
   "description": "midway passport component",
-  "version": "3.4.0-beta.9",
+  "version": "3.4.3",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "files": [
@@ -22,22 +22,18 @@
   "author": "Nawbc",
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/core": "^3.4.0-beta.9",
-    "@midwayjs/decorator": "^3.4.0-beta.9",
-    "@midwayjs/express": "^3.4.0-beta.9",
-    "@midwayjs/jwt": "^3.4.0-beta.9",
-    "@midwayjs/koa": "^3.4.0-beta.9",
-    "@midwayjs/mock": "^3.4.0-beta.9",
-    "@midwayjs/web": "^3.4.0-beta.9",
-    "@types/passport": "1.0.9",
+    "@midwayjs/core": "^3.4.3",
+    "@midwayjs/decorator": "^3.4.1",
+    "@midwayjs/express": "^3.4.3",
+    "@midwayjs/jwt": "^3.4.3",
+    "@midwayjs/koa": "^3.4.3",
+    "@midwayjs/mock": "^3.4.3",
+    "@midwayjs/web": "^3.4.3",
     "@types/passport-local": "1.0.34",
     "express-session": "1.17.3",
-    "passport": "0.5.2",
     "passport-jwt": "4.0.0",
-    "passport-local": "1.0.0"
+    "passport-local": "1.0.0",
+    "passport-openidconnect": "0.1.1"
   },
-  "peerDependencies": {
-    "passport": "^0.5.0"
-  },
-  "gitHead": "41e82a0fba386c6ec42c2eefd1dff4795a81b389"
+  "gitHead": "0d79293f56d01a3ef3589e6a6ef53c582ac0c46f"
 }

package/dist/proxy/framework/koa.d.ts

@@ -1,39 +0,0 @@
-/**
- * Module dependencies.
- */
-declare const passport: any;
-/**
- * Passport's default/connect middleware.
- */
-declare const _initialize: any;
-declare const _authenticate: any;
-declare const createReqMock: any;
-/**
- * Passport's initialization middleware for Koa.
- *
- * @return {GeneratorFunction}
- * @api private
- */
-declare function initialize(passport: any): (ctx: any, next: any) => Promise<any>;
-/**
- * Passport's authenticate middleware for Koa.
- *
- * @param {String|Array} name
- * @param {Object} options
- * @param {GeneratorFunction} callback
- * @return {GeneratorFunction}
- * @api private
- */
-declare function authenticate(passport: any, name: any, options: any, callback: any): (ctx: any, next: any) => Promise<any>;
-/**
- * Passport's authorize middleware for Koa.
- *
- * @param {String|Array} name
- * @param {Object} options
- * @param {GeneratorFunction} callback
- * @return {GeneratorFunction}
- * @api private
- */
-declare function authorize(passport: any, name: any, options: any, callback: any): (ctx: any, next: any) => Promise<any>;
-declare function promisify(expressMiddleware: any): (req: any, res: any) => Promise<unknown>;
-//# sourceMappingURL=koa.d.ts.map

package/dist/proxy/framework/koa.js

@@ -1,190 +0,0 @@
-'use strict';
-/**
- * Module dependencies.
- */
-const passport = require('passport');
-/**
- * Passport's default/connect middleware.
- */
-const _initialize = require('passport/lib/middleware/initialize');
-const _authenticate = require('passport/lib/middleware/authenticate');
-const createReqMock = require('./request').create;
-/**
- * Passport's initialization middleware for Koa.
- *
- * @return {GeneratorFunction}
- * @api private
- */
-function initialize(passport) {
-    const middleware = promisify(_initialize(passport));
-    return function passportInitialize(ctx, next) {
-        // koa <-> connect compatibility:
-        const userProperty = passport._userProperty || 'user';
-        // check ctx.req has the userProperty
-        // eslint-disable-next-line no-prototype-builtins
-        if (!ctx.req.hasOwnProperty(userProperty)) {
-            Object.defineProperty(ctx.req, userProperty, {
-                enumerable: true,
-                get: function () {
-                    return ctx.state[userProperty];
-                },
-                set: function (val) {
-                    ctx.state[userProperty] = val;
-                },
-            });
-        }
-        // create mock object for express' req object
-        const req = createReqMock(ctx, userProperty);
-        // add Promise-based login method
-        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);
-                    else
-                        resolve();
-                });
-            });
-        };
-        // add aliases for passport's request extensions to Koa's context
-        ctx.logout = ctx.logOut = req.logout.bind(req);
-        ctx.isAuthenticated = req.isAuthenticated.bind(req);
-        ctx.isUnauthenticated = req.isUnauthenticated.bind(req);
-        return middleware(req, ctx).then(() => {
-            return next();
-        });
-    };
-}
-/**
- * Passport's authenticate middleware for Koa.
- *
- * @param {String|Array} name
- * @param {Object} options
- * @param {GeneratorFunction} callback
- * @return {GeneratorFunction}
- * @api private
- */
-function authenticate(passport, name, options, callback) {
-    // normalize arguments
-    if (typeof options === 'function') {
-        callback = options;
-        options = {};
-    }
-    options = options || {};
-    if (callback) {
-        // When the callback is set, neither `next`, `res.redirect` or `res.end`
-        // are called. That is, a workaround to catch the `callback` is required.
-        // The `passportAuthenticate()` method below will therefore set
-        // `callback.resolve` and `callback.reject`. Then, once the authentication
-        // finishes, the modified callback calls the original one and afterwards
-        // triggers either `callback.resolve` or `callback.reject` to inform
-        // `passportAuthenticate()` that we are ready.
-        const _callback = callback;
-        callback = function (err, user, info, status) {
-            try {
-                Promise.resolve(_callback(err, user, info, status))
-                    .then(() => callback.resolve(false))
-                    .catch(err => callback.reject(err));
-            }
-            catch (err) {
-                callback.reject(err);
-            }
-        };
-    }
-    const middleware = promisify(_authenticate(passport, name, options, callback));
-    return function passportAuthenticate(ctx, next) {
-        // this functions wraps the connect middleware
-        // to catch `next`, `res.redirect` and `res.end` calls
-        const p = new Promise((resolve, reject) => {
-            // mock the `req` object
-            const req = createReqMock(ctx, options.assignProperty || passport._userProperty || 'user');
-            function setBodyAndResolve(content) {
-                if (content)
-                    ctx.body = content;
-                resolve(false);
-            }
-            // mock the `res` object
-            const res = {
-                redirect: function (url) {
-                    ctx.redirect(url);
-                    resolve(false);
-                },
-                set: ctx.set.bind(ctx),
-                setHeader: ctx.set.bind(ctx),
-                end: setBodyAndResolve,
-                send: setBodyAndResolve,
-                set statusCode(status) {
-                    ctx.status = status;
-                },
-                get statusCode() {
-                    return ctx.status;
-                },
-            };
-            req.res = res;
-            // update the custom callback above
-            if (callback) {
-                callback.resolve = resolve;
-                callback.reject = reject;
-            }
-            // call the connect middleware
-            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();
-            }
-        });
-    };
-}
-/**
- * Passport's authorize middleware for Koa.
- *
- * @param {String|Array} name
- * @param {Object} options
- * @param {GeneratorFunction} callback
- * @return {GeneratorFunction}
- * @api private
- */
-function authorize(passport, name, options, callback) {
-    options = options || {};
-    options.assignProperty = 'account';
-    return authenticate(passport, name, options, callback);
-}
-/**
- * Framework support for Koa.
- *
- * This module provides support for using Passport with Koa. It exposes
- * middleware that conform to the `fn*(next)` signature and extends
- * Node's built-in HTTP request object with useful authentication-related
- * functions.
- *
- * @return {Object}
- * @api protected
- */
-module.exports = function () {
-    return {
-        initialize: initialize,
-        authenticate: authenticate,
-        authorize: authorize,
-    };
-};
-function promisify(expressMiddleware) {
-    return function (req, res) {
-        return new Promise((resolve, reject) => {
-            expressMiddleware(req, res, (err, result) => {
-                if (err)
-                    reject(err);
-                else
-                    resolve(result);
-            });
-        });
-    };
-}
-//# sourceMappingURL=koa.js.map

package/dist/proxy/framework/request.d.ts

@@ -1,11 +0,0 @@
-declare let keys: string[];
-declare const properties: {
-    app: {
-        get: () => {
-            get: (key: any) => any;
-        };
-    };
-};
-declare function getObject(ctx: any, key: any): any;
-declare const IncomingMessageExt: any;
-//# sourceMappingURL=request.d.ts.map

package/dist/proxy/index.d.ts

@@ -1,7 +0,0 @@
-declare const Passport: any;
-export declare class KoaPassport extends Passport {
-    constructor();
-}
-export declare const passport: any;
-export {};
-//# sourceMappingURL=index.d.ts.map

package/dist/proxy/index.js

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.passport = exports.KoaPassport = void 0;
-// prevent passport from monkey patching
-const connect = require('passport/lib/framework/connect');
-connect.__monkeypatchNode = function () { };
-// load passport and add the koa framework
-const originPassport = require('passport');
-const Passport = require('passport').Passport;
-const framework = require('./framework/koa')();
-originPassport.framework(framework);
-class KoaPassport extends Passport {
-    constructor() {
-        super();
-        this.framework(framework);
-    }
-}
-exports.KoaPassport = KoaPassport;
-// Export default singleton.
-exports.passport = originPassport;
-//# sourceMappingURL=index.js.map

package/dist/service/passport.service.d.ts

@@ -1,6 +0,0 @@
-import * as passport from 'passport';
-import { AbstractPassportMiddleware, AbstractStrategy } from '../interface';
-export declare function PassportStrategy(Strategy: new (...args: any[]) => passport.Strategy, name?: string): new (...args: any[]) => AbstractStrategy;
-export declare type StrategyClass = new (...args: any[]) => AbstractStrategy;
-export declare function PassportMiddleware(strategy: StrategyClass | StrategyClass[]): new (...args: any[]) => AbstractPassportMiddleware;
-//# sourceMappingURL=passport.service.d.ts.map

package/dist/service/passport.service.js

@@ -1,226 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-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() {
-            const cb = async (...params) => {
-                const done = params[params.length - 1];
-                try {
-                    const result = await this.validate(...params);
-                    if (Array.isArray(result)) {
-                        done(null, ...result);
-                    }
-                    else {
-                        done(null, result);
-                    }
-                }
-                catch (err) {
-                    done(err, null);
-                }
-            };
-            this.strategy = new Strategy(this.getStrategyOptions(), cb);
-            const passport = (0, util_1.getPassport)();
-            if (name) {
-                passport.use(name, this.strategy);
-            }
-            else {
-                passport.use(this.strategy);
-            }
-            if (this['serializeUser']) {
-                passport.serializeUser(this['serializeUser']);
-            }
-            if (this['deserializeUser']) {
-                passport.deserializeUser(this['deserializeUser']);
-            }
-            if (this['transformAuthInfo']) {
-                passport.transformAuthInfo(this['transformAuthInfo']);
-            }
-        }
-        getStrategy() {
-            return this.strategy;
-        }
-    }
-    __decorate([
-        (0, decorator_1.Init)(),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", []),
-        __metadata("design:returntype", Promise)
-    ], InnerStrategyAbstractClass.prototype, "init", null);
-    return InnerStrategyAbstractClass;
-}
-exports.PassportStrategy = PassportStrategy;
-function PassportMiddleware(strategy) {
-    class InnerPassportMiddleware extends interface_1.AbstractPassportMiddleware {
-        resolve() {
-            if ((0, util_1.isExpressMode)()) {
-                return async function passportMiddleware(req, res, next) {
-                    return this.authenticate(await this.getAuthenticateOptions())(req, res, next);
-                }.bind(this);
-            }
-            else {
-                return async function passportMiddleware(ctx, next) {
-                    return this.authenticate(await this.getAuthenticateOptions())(ctx, next);
-                }.bind(this);
-            }
-        }
-        getAuthenticateOptions() {
-            return undefined;
-        }
-        authenticate(options) {
-            if (!Array.isArray(strategy)) {
-                strategy = [strategy];
-            }
-            if ((0, util_1.isExpressMode)()) {
-                return async (req, res, next) => {
-                    // merge options with default options
-                    const authOptions = {
-                        ...this.passportConfig,
-                        ...options,
-                    };
-                    if (authOptions.session && req.session[authOptions.userProperty]) {
-                        req[authOptions.userProperty] =
-                            req.session[authOptions.userProperty];
-                    }
-                    // ignore user has exists
-                    if (req[authOptions.userProperty]) {
-                        next();
-                    }
-                    else {
-                        const passport = (0, util_1.getPassport)();
-                        const strategyList = [];
-                        for (const strategySingle of strategy) {
-                            // got strategy
-                            const strategyInstance = await this.app
-                                .getApplicationContext()
-                                .getAsync(strategySingle);
-                            strategyList.push(strategyInstance.getStrategy());
-                        }
-                        const user = await new Promise((resolve, reject) => {
-                            // authenticate
-                            passport.authenticate(strategyList, authOptions, (err, user, info, status) => {
-                                if (err) {
-                                    reject(err);
-                                }
-                                else {
-                                    resolve(user);
-                                }
-                            })(req, res, err => (err ? reject(err) : resolve(0)));
-                        });
-                        if (user) {
-                            req[authOptions.userProperty] = user;
-                            if (authOptions.session) {
-                                req.logIn(user, options, next);
-                                return;
-                            }
-                        }
-                        else {
-                            if (options.failureRedirect) {
-                                res.redirect(options.failureRedirect);
-                                return;
-                            }
-                            else {
-                                throw new core_1.httpError.UnauthorizedError();
-                            }
-                        }
-                        next();
-                    }
-                };
-            }
-            else {
-                return async function bbb(ctx, next) {
-                    // merge options with default options
-                    const authOptions = {
-                        ...this.passportConfig,
-                        ...options,
-                    };
-                    if (authOptions.session &&
-                        ctx.session.passport &&
-                        ctx.session.passport[authOptions.userProperty]) {
-                        ctx.state[authOptions.userProperty] =
-                            ctx.session.passport[authOptions.userProperty];
-                    }
-                    // ignore user has exists
-                    if (ctx.state[authOptions.userProperty]) {
-                        await next();
-                    }
-                    else {
-                        const passport = (0, util_1.getPassport)();
-                        const strategyList = [];
-                        for (const strategySingle of strategy) {
-                            // got strategy
-                            const strategyInstance = await this.app
-                                .getApplicationContext()
-                                .getAsync(strategySingle);
-                            strategyList.push(strategyInstance.getStrategy());
-                        }
-                        try {
-                            const user = await new Promise((resolve, reject) => {
-                                // authenticate
-                                passport.authenticate(strategyList, authOptions, (err, user, info, status) => {
-                                    if (err) {
-                                        reject(err);
-                                    }
-                                    else {
-                                        resolve(user);
-                                    }
-                                })(ctx, err => (err ? reject(err) : resolve(0)));
-                            });
-                            if (user) {
-                                ctx.state[authOptions.userProperty] = user;
-                                if (authOptions.session) {
-                                    // save to ctx.session.passport
-                                    await ctx.login(user, options);
-                                }
-                                if (options.successRedirect) {
-                                    ctx.redirect(options.successRedirect);
-                                    return;
-                                }
-                            }
-                            else {
-                                if (options.failureRedirect) {
-                                    ctx.redirect(options.failureRedirect);
-                                    return;
-                                }
-                                else {
-                                    throw new core_1.httpError.UnauthorizedError();
-                                }
-                            }
-                            await next();
-                        }
-                        catch (err) {
-                            ctx.throw(err);
-                        }
-                    }
-                }.bind(this);
-            }
-        }
-        static getName() {
-            return 'passport';
-        }
-    }
-    __decorate([
-        (0, decorator_1.Config)('passport'),
-        __metadata("design:type", Object)
-    ], InnerPassportMiddleware.prototype, "passportConfig", void 0);
-    __decorate([
-        (0, decorator_1.App)(),
-        __metadata("design:type", Object)
-    ], InnerPassportMiddleware.prototype, "app", void 0);
-    return InnerPassportMiddleware;
-}
-exports.PassportMiddleware = PassportMiddleware;
-//# sourceMappingURL=passport.service.js.map

package/dist/util.d.ts

@@ -1,3 +0,0 @@
-export declare function getPassport(): any;
-export declare function isExpressMode(): boolean;
-//# sourceMappingURL=util.d.ts.map

package/dist/util.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isExpressMode = exports.getPassport = void 0;
-const core_1 = require("@midwayjs/core");
-function getPassport() {
-    return isExpressMode()
-        ? require('passport')
-        : require('./proxy/index').passport;
-}
-exports.getPassport = getPassport;
-function isExpressMode() {
-    return !!(process.env['MIDWAY_PASSPORT_MODE'] === 'express' ||
-        (0, core_1.safeRequire)('@midwayjs/express'));
-}
-exports.isExpressMode = isExpressMode;
-//# sourceMappingURL=util.js.map