@midwayjs/passport 3.4.0-beta.1 → 3.4.0-beta.12

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@midwayjs/passport",
   "description": "midway passport component",
-  "version": "3.4.0-beta.1",
+  "version": "3.4.0-beta.12",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "files": [
@@ -22,21 +22,18 @@
   "author": "Nawbc",
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/core": "^3.4.0-beta.1",
-    "@midwayjs/decorator": "^3.4.0-beta.1",
-    "@midwayjs/express": "^3.4.0-beta.1",
-    "@midwayjs/jwt": "^3.4.0-beta.1",
-    "@midwayjs/koa": "^3.4.0-beta.1",
-    "@midwayjs/mock": "^3.4.0-beta.1",
-    "@midwayjs/web": "^3.4.0-beta.1",
-    "@types/passport": "1.0.8",
+    "@midwayjs/core": "^3.4.0-beta.12",
+    "@midwayjs/decorator": "^3.4.0-beta.12",
+    "@midwayjs/express": "^3.4.0-beta.12",
+    "@midwayjs/jwt": "^3.4.0-beta.12",
+    "@midwayjs/koa": "^3.4.0-beta.12",
+    "@midwayjs/mock": "^3.4.0-beta.12",
+    "@midwayjs/web": "^3.4.0-beta.12",
     "@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": "cb639763ececfc7928221eaafbd515bfd93c6ca1"
 }

package/CHANGELOG.md

@@ -1,384 +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.3.13](https://github.com/midwayjs/midway/compare/v3.3.12...v3.3.13) (2022-06-06)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-## [3.3.11](https://github.com/midwayjs/midway/compare/v3.3.10...v3.3.11) (2022-05-27)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-## [3.3.9](https://github.com/midwayjs/midway/compare/v3.3.8...v3.3.9) (2022-05-25)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-## [3.3.6](https://github.com/midwayjs/midway/compare/v3.3.5...v3.3.6) (2022-05-11)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-## [3.3.5](https://github.com/midwayjs/midway/compare/v3.3.4...v3.3.5) (2022-04-27)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-## [3.3.4](https://github.com/midwayjs/midway/compare/v3.3.3...v3.3.4) (2022-04-21)
-
-
-### Bug Fixes
-
-* is express method got error result ([#1919](https://github.com/midwayjs/midway/issues/1919)) ([7ca9359](https://github.com/midwayjs/midway/commit/7ca9359c8421f77f1f410c56730cb8babaf65a8c))
-
-
-
-
-
-## [3.3.3](https://github.com/midwayjs/midway/compare/v3.3.2...v3.3.3) (2022-04-14)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-## [3.3.2](https://github.com/midwayjs/midway/compare/v3.3.1...v3.3.2) (2022-04-13)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-## [3.3.1](https://github.com/midwayjs/midway/compare/v3.3.0...v3.3.1) (2022-04-11)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-# [3.3.0](https://github.com/midwayjs/midway/compare/v3.2.2...v3.3.0) (2022-04-07)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-## [3.2.2](https://github.com/midwayjs/midway/compare/v3.2.1...v3.2.2) (2022-03-30)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-## [3.2.1](https://github.com/midwayjs/midway/compare/v3.2.0...v3.2.1) (2022-03-27)
-
-
-### Bug Fixes
-
-* swagger ui replace json path ([#1860](https://github.com/midwayjs/midway/issues/1860)) ([0f3728d](https://github.com/midwayjs/midway/commit/0f3728daccba12923f23f5b498c7dda13ced36d7))
-
-
-
-
-
-# [3.2.0](https://github.com/midwayjs/midway/compare/v3.1.6...v3.2.0) (2022-03-25)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-## [3.1.6](https://github.com/midwayjs/midway/compare/v3.1.5...v3.1.6) (2022-03-21)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-## [3.1.5](https://github.com/midwayjs/midway/compare/v3.1.4...v3.1.5) (2022-03-18)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-## [3.1.4](https://github.com/midwayjs/midway/compare/v3.1.3...v3.1.4) (2022-03-16)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-## [3.1.3](https://github.com/midwayjs/midway/compare/v3.1.2...v3.1.3) (2022-03-15)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-## [3.1.2](https://github.com/midwayjs/midway/compare/v3.1.1...v3.1.2) (2022-03-15)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-## [3.1.1](https://github.com/midwayjs/midway/compare/v3.1.0...v3.1.1) (2022-03-09)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-# [3.1.0](https://github.com/midwayjs/midway/compare/v3.0.13...v3.1.0) (2022-03-07)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-## [3.0.13](https://github.com/midwayjs/midway/compare/v3.0.12...v3.0.13) (2022-03-01)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-## [3.0.11](https://github.com/midwayjs/midway/compare/v3.0.10...v3.0.11) (2022-02-25)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-## [3.0.10](https://github.com/midwayjs/midway/compare/v3.0.9...v3.0.10) (2022-02-24)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-## [3.0.9](https://github.com/midwayjs/midway/compare/v3.0.8...v3.0.9) (2022-02-21)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-## [3.0.8](https://github.com/midwayjs/midway/compare/v3.0.7...v3.0.8) (2022-02-19)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-## [3.0.7](https://github.com/midwayjs/midway/compare/v3.0.6...v3.0.7) (2022-02-17)
-
-
-### Bug Fixes
-
-* passport middleware definition ([#1701](https://github.com/midwayjs/midway/issues/1701)) ([bca3860](https://github.com/midwayjs/midway/commit/bca38603437f7645603feba3cd47ad9b696f8db7))
-
-
-
-
-
-## [3.0.6](https://github.com/midwayjs/midway/compare/v3.0.5...v3.0.6) (2022-02-13)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-## [3.0.5](https://github.com/midwayjs/midway/compare/v3.0.4...v3.0.5) (2022-02-10)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-## [3.0.4](https://github.com/midwayjs/midway/compare/v3.0.3...v3.0.4) (2022-02-09)
-
-
-### Bug Fixes
-
-* supertest typings and createFunctionApp ([#1642](https://github.com/midwayjs/midway/issues/1642)) ([484f4f4](https://github.com/midwayjs/midway/commit/484f4f41b3b9e889d4d285f4871a0b37fa51e73f))
-
-
-
-
-
-## [3.0.3](https://github.com/midwayjs/midway/compare/v3.0.2...v3.0.3) (2022-01-28)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-## [3.0.2](https://github.com/midwayjs/midway/compare/v3.0.1...v3.0.2) (2022-01-24)
-
-
-### Bug Fixes
-
-* singleton invoke request scope not valid ([#1622](https://github.com/midwayjs/midway/issues/1622)) ([f97c063](https://github.com/midwayjs/midway/commit/f97c0632107b47cf357d17774a4e4bb5233bba57))
-
-
-
-
-
-## [3.0.1](https://github.com/midwayjs/midway/compare/v3.0.0...v3.0.1) (2022-01-24)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-# [3.0.0](https://github.com/midwayjs/midway/compare/v3.0.0-beta.17...v3.0.0) (2022-01-20)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-# [3.0.0-beta.17](https://github.com/midwayjs/midway/compare/v3.0.0-beta.16...v3.0.0-beta.17) (2022-01-18)
-
-
-### Bug Fixes
-
-* move register to on server ready ([#1576](https://github.com/midwayjs/midway/issues/1576)) ([b5f8256](https://github.com/midwayjs/midway/commit/b5f8256d8cab103e3b9c7f22d5fc66bd5fa6c525))
-
-
-### Features
-
-* Allows the user to provide the response after authentication fa… ([#1567](https://github.com/midwayjs/midway/issues/1567)) ([57efdee](https://github.com/midwayjs/midway/commit/57efdee91ba81d02be6d0e0e0c2566ba30577386))
-
-
-
-
-
-# [3.0.0-beta.16](https://github.com/midwayjs/midway/compare/v3.0.0-beta.15...v3.0.0-beta.16) (2022-01-11)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-# [3.0.0-beta.15](https://github.com/midwayjs/midway/compare/v3.0.0-beta.14...v3.0.0-beta.15) (2022-01-07)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-# [3.0.0-beta.14](https://github.com/midwayjs/midway/compare/v3.0.0-beta.13...v3.0.0-beta.14) (2022-01-04)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-# [3.0.0-beta.13](https://github.com/midwayjs/midway/compare/v3.0.0-beta.12...v3.0.0-beta.13) (2021-12-30)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-# [3.0.0-beta.12](https://github.com/midwayjs/midway/compare/v3.0.0-beta.11...v3.0.0-beta.12) (2021-12-28)
-
-
-### Features
-
-* support throw err status ([#1440](https://github.com/midwayjs/midway/issues/1440)) ([7b98110](https://github.com/midwayjs/midway/commit/7b98110d65c5287a8fcb3eb5356dea2d7a32cee9))
-
-
-
-
-
-# [3.0.0-beta.11](https://github.com/midwayjs/midway/compare/v3.0.0-beta.10...v3.0.0-beta.11) (2021-12-21)
-
-**Note:** Version bump only for package @midwayjs/passport
-
-
-
-
-
-# [3.0.0-beta.10](https://github.com/midwayjs/midway/compare/v3.0.0-beta.9...v3.0.0-beta.10) (2021-12-20)
-
-
-### Features
-
-* default add session  & bodyparser support for koa/express/faas ([#1420](https://github.com/midwayjs/midway/issues/1420)) ([cdaff31](https://github.com/midwayjs/midway/commit/cdaff317c3e862a95494a167995a28280af639bf))
-* implement i18n for validate ([#1426](https://github.com/midwayjs/midway/issues/1426)) ([4c7ed2f](https://github.com/midwayjs/midway/commit/4c7ed2ff2e7ccf10f88f62abad230f92f5e76b97))
-
-
-
-
-
-# [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))

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