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

package/dist/interface.d.ts

@@ -2,13 +2,10 @@ import { IMiddleware } from '@midwayjs/core';
 export interface AuthenticateOptions {
     authInfo?: boolean | undefined;
     assignProperty?: string | undefined;
-    failureFlash?: string | boolean | undefined;
     failureMessage?: boolean | string | undefined;
     failureRedirect?: string | undefined;
-    failWithError?: boolean | undefined;
     session?: boolean | undefined;
     scope?: string | string[] | undefined;
-    successFlash?: string | boolean | undefined;
     successMessage?: boolean | string | undefined;
     successRedirect?: string | undefined;
     successReturnToOrRedirect?: string | undefined;
@@ -25,10 +22,6 @@ export interface IPassportStrategy {
     deserializeUser?(id: any, done: (err: any, user?: any) => void): void;
     transformAuthInfo?(info: any, done: (err: any, info: any) => void): void;
 }
-export declare abstract class AbstractStrategy implements IPassportStrategy {
-    abstract validate(...args: any[]): any;
-    abstract getStrategyOptions(): any;
-}
 export interface IPassportMiddleware extends IMiddleware<any, any> {
     authenticate?(options: AuthenticateOptions, callback: Function): any;
 }

package/dist/interface.js

@@ -1,9 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AbstractPassportMiddleware = exports.AbstractStrategy = void 0;
-class AbstractStrategy {
-}
-exports.AbstractStrategy = AbstractStrategy;
+exports.AbstractPassportMiddleware = void 0;
 class AbstractPassportMiddleware {
     resolve() { }
 }

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

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

package/dist/passport/passport.service.js

@@ -14,10 +14,10 @@ const decorator_1 = require("@midwayjs/decorator");
 const interface_1 = require("../interface");
 const core_1 = require("@midwayjs/core");
 const authenticator_1 = require("./authenticator");
-const http = require("http");
+const strategy_1 = require("./strategy");
 const request_1 = require("./request");
 function PassportStrategy(Strategy, name) {
-    class InnerStrategyAbstractClass extends interface_1.AbstractStrategy {
+    class InnerStrategyAbstractClass extends strategy_1.AbstractStrategyWrapper {
         async init() {
             const cb = async (...params) => {
                 const done = params[params.length - 1];
@@ -116,7 +116,13 @@ function PassportMiddleware(strategy) {
                         return;
                     }
                     else {
-                        this.allFailed(options, authenticateResult.failResult, req, res);
+                        try {
+                            this.allFailed(options, authenticateResult.failResult, req, res);
+                        }
+                        catch (err) {
+                            next(err);
+                            return;
+                        }
                     }
                     next();
                 }.bind(this);
@@ -176,7 +182,14 @@ function PassportMiddleware(strategy) {
                         return;
                     }
                     else {
-                        this.allFailed(options, authenticateResult.failResult, req, ctx);
+                        this.allFailed(options, authenticateResult.failResult, req, {
+                            end(data) {
+                                ctx.body = data;
+                            },
+                            redirect(url) {
+                                ctx.redirect(url);
+                            },
+                        });
                         return;
                     }
                     await next();
@@ -188,18 +201,19 @@ function PassportMiddleware(strategy) {
         }
         async onceSucceed(options, user, info, req, res) {
             let msg;
-            if (options.successFlash) {
-                let flash = options.successFlash;
-                if (typeof flash === 'string') {
-                    flash = { type: 'success', message: flash };
-                }
-                flash.type = flash.type || 'success';
-                const type = flash.type || info.type || 'success';
-                msg = flash.message || info.message || info;
-                if (typeof msg === 'string') {
-                    req.flash(type, msg);
-                }
-            }
+            // if (options.successFlash) {
+            //   let flash: any = options.successFlash;
+            //   if (typeof flash === 'string') {
+            //     flash = { type: 'success', message: flash };
+            //   }
+            //   flash.type = flash.type || 'success';
+            //
+            //   const type = flash.type || info.type || 'success';
+            //   msg = flash.message || info.message || info;
+            //   if (typeof msg === 'string') {
+            //     req.flash && req.flash(type, msg);
+            //   }
+            // }
             if (options.successMessage) {
                 msg = options.successMessage;
                 if (typeof msg === 'boolean') {
@@ -246,32 +260,30 @@ function PassportMiddleware(strategy) {
             // Strategies are ordered by priority.  For the purpose of flashing a
             // message, the first failure will be displayed.
             let failure = failResult.failures[0] || {}, challenge = (failure === null || failure === void 0 ? void 0 : failure.challenge) || {}, msg;
-            if (options.failureFlash) {
-                let flash = options.failureFlash;
-                if (typeof flash === 'string') {
-                    flash = { type: 'error', message: flash };
-                }
-                flash.type = flash.type || 'error';
-                const type = flash.type || challenge.type || 'error';
-                msg = flash.message || challenge.message || challenge;
-                if (typeof msg === 'string') {
-                    // TODO
-                    req.flash(type, msg);
-                }
-            }
+            // if (options.failureFlash) {
+            //   let flash: any = options.failureFlash;
+            //   if (typeof flash === 'string') {
+            //     flash = { type: 'error', message: flash };
+            //   }
+            //   flash.type = flash.type || 'error';
+            //
+            //   const type = flash.type || challenge.type || 'error';
+            //   msg = flash.message || challenge.message || challenge;
+            //   if (typeof msg === 'string') {
+            //     req.flash && req.flash(type, msg);
+            //   }
+            // }
             if (options.failureMessage) {
                 msg = options.failureMessage;
                 if (typeof msg === 'boolean') {
                     msg = challenge.message || challenge;
                 }
                 if (typeof msg === 'string') {
-                    // TODO
                     req.session.messages = req.session.messages || [];
                     req.session.messages.push(msg);
                 }
             }
             if (options.failureRedirect) {
-                // TODO
                 return res.redirect(options.failureRedirect);
             }
             // When failure handling is not delegated to the application, the default
@@ -293,14 +305,12 @@ function PassportMiddleware(strategy) {
             res.statusCode = rstatus || 401;
             // eslint-disable-next-line eqeqeq
             if (res.statusCode === 401 && rchallenge.length) {
-                // TODO
                 res.setHeader('WWW-Authenticate', rchallenge);
             }
-            if (options.failWithError) {
-                throw new core_1.httpError.UnauthorizedError();
-            }
-            // TODO
-            res.end(http.STATUS_CODES[res.statusCode]);
+            // if (options.failWithError) {
+            //   throw new httpError.UnauthorizedError();
+            // }
+            throw new core_1.httpError.UnauthorizedError();
         }
         attachRequestMethod(req) {
             // init req method

package/dist/passport/pause.d.ts

@@ -0,0 +1,19 @@
+/*!
+ * pause
+ * Copyright(c) 2012 TJ Holowaychuk
+ * Copyright(c) 2015 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+/// <reference types="node" />
+import { Stream } from 'stream';
+/**
+ * Pause the data events on a stream.
+ *
+ * @param {object} stream
+ * @public
+ */
+export declare function pause(stream: Stream): {
+    end: () => void;
+    resume: () => void;
+};
+//# sourceMappingURL=pause.d.ts.map

package/dist/passport/pause.js

@@ -0,0 +1,50 @@
+"use strict";
+/*!
+ * pause
+ * Copyright(c) 2012 TJ Holowaychuk
+ * Copyright(c) 2015 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pause = void 0;
+/**
+ * Pause the data events on a stream.
+ *
+ * @param {object} stream
+ * @public
+ */
+function pause(stream) {
+    const events = [];
+    const onData = createEventListener('data', events);
+    const onEnd = createEventListener('end', events);
+    // buffer data
+    stream.on('data', onData);
+    // buffer end
+    stream.on('end', onEnd);
+    return {
+        end: function end() {
+            stream.removeListener('data', onData);
+            stream.removeListener('end', onEnd);
+        },
+        resume: function resume() {
+            this.end();
+            for (let i = 0; i < events.length; i++) {
+                // eslint-disable-next-line prefer-spread
+                stream.emit.apply(stream, events[i]);
+            }
+        },
+    };
+}
+exports.pause = pause;
+function createEventListener(name, events) {
+    return function onEvent() {
+        const args = new Array(arguments.length + 1);
+        args[0] = name;
+        for (let i = 0; i < arguments.length; i++) {
+            // eslint-disable-next-line prefer-rest-params
+            args[i + 1] = arguments[i];
+        }
+        events.push(args);
+    };
+}
+//# sourceMappingURL=pause.js.map

package/dist/passport/session.stratey.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SessionStrategy = void 0;
 const strategy_1 = require("./strategy");
 const core_1 = require("@midwayjs/core");
-const pause = require("pause");
+const pause_1 = require("./pause");
 /**
  * `SessionStrategy` constructor.
  *
@@ -42,7 +42,7 @@ class SessionStrategy extends strategy_1.Strategy {
             // NOTE: Stream pausing is desirable in the case where later middleware is
             //       listening for events emitted from request.  For discussion on the
             //       matter, refer to: https://github.com/jaredhanson/passport/pull/106
-            const paused = options.pauseStream ? pause(req) : null;
+            const paused = options.pauseStream ? (0, pause_1.pause)(req) : null;
             this._deserializeUser(su, req, (err, user) => {
                 if (err) {
                     return new core_1.httpError.UnauthorizedError(err.message);

package/dist/passport/strategy.d.ts

@@ -1,10 +1,14 @@
 /// <reference types="node" />
 import { IncomingMessage } from 'http';
-import { StrategyCreatedStatic } from '../interface';
+import { IPassportStrategy, StrategyCreatedStatic } from '../interface';
 export declare abstract class Strategy {
     name?: string | undefined;
     abstract authenticate(req: IncomingMessage, options?: any): any;
 }
 export interface Strategy extends StrategyCreatedStatic {
 }
+export declare abstract class AbstractStrategyWrapper implements IPassportStrategy {
+    abstract validate(...args: any[]): any;
+    abstract getStrategyOptions(): any;
+}
 //# sourceMappingURL=strategy.d.ts.map

package/dist/passport/strategy.js

@@ -1,7 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Strategy = void 0;
+exports.AbstractStrategyWrapper = exports.Strategy = void 0;
 class Strategy {
 }
 exports.Strategy = Strategy;
+class AbstractStrategyWrapper {
+}
+exports.AbstractStrategyWrapper = AbstractStrategyWrapper;
 //# sourceMappingURL=strategy.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@midwayjs/passport",
   "description": "midway passport component",
-  "version": "3.4.0-beta.11",
+  "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.11",
-    "@midwayjs/decorator": "^3.4.0-beta.11",
-    "@midwayjs/express": "^3.4.0-beta.11",
-    "@midwayjs/jwt": "^3.4.0-beta.11",
-    "@midwayjs/koa": "^3.4.0-beta.11",
-    "@midwayjs/mock": "^3.4.0-beta.11",
-    "@midwayjs/web": "^3.4.0-beta.11",
+    "@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-jwt": "4.0.0",
     "passport-local": "1.0.0",
     "passport-openidconnect": "0.1.1"
   },
-  "dependencies": {
-    "pause": "0.0.1"
-  },
-  "gitHead": "b1c7a439b0df37d3e381cd182ea3b9e74323107b"
+  "gitHead": "cb639763ececfc7928221eaafbd515bfd93c6ca1"
 }