@cicctencent/midwayjs-base 1.0.45 → 1.0.46

package/dist/guard/auth.d.ts

@@ -7,6 +7,11 @@ export declare class AuthGuard implements IGuard<Context> {
     ssoOption: any;
     authOption: {
         ignores?: string | Array<RegExp | string>;
+        loginUrl?: string;
+        redirectParam?: string;
+        appIdParam?: string;
+        authCodeParam?: string | false;
+        cleanParams?: string[];
     };
     apiOption: any;
     koa: any;

package/dist/guard/auth.js

@@ -61,13 +61,17 @@ let AuthGuard = class AuthGuard {
         let errRes = null;
         let session = null;
         try {
-            const authCode = context.URL.searchParams.get('auth_code');
-            if (authCode) {
+            const authCodeParam = this.authOption?.authCodeParam === false
+                ? false
+                : this.authOption?.authCodeParam || 'auth_code';
+            const authCode = authCodeParam ? context.URL.searchParams.get(authCodeParam) : null;
+            if (authCode && authCodeParam) {
                 session = await this.sessionService.loginByCode(authCode);
                 if (session) {
                     (0, utils_1.setAuthToken)(context, session.id);
                 }
-                context.URL.searchParams.delete('auth_code');
+                if (authCodeParam)
+                    context.URL.searchParams.delete(authCodeParam);
                 context.URL.hostname = context.detect?.HOSTNAME || context.hostname;
                 context.redirect(context.URL.toString());
                 return;
@@ -124,17 +128,24 @@ let AuthGuard = class AuthGuard {
             throw new error_code_1.BizError(error.ret, error.msg);
         }
         else {
-            const loginUrl = `${this.ssoOption?.baseUrl || this.koa?.globalPrefix || ''}/login`;
-            if (!/\/login\/?(\?|$|#)/.test(context.URL.pathname)) {
-                const URL = context.URL;
-                if (context.detect?.HOSTNAME && URL.hostname !== context.detect.HOSTNAME) {
-                    URL.hostname = context.detect.HOSTNAME;
+            const loginUrl = this.authOption?.loginUrl || `${this.ssoOption?.baseUrl || this.koa?.globalPrefix || ''}/login`;
+            const loginPath = new URL(loginUrl, `${context.protocol}://${context.host}`).pathname;
+            if (context.URL.pathname !== loginPath) {
+                const currentUrl = context.URL;
+                if (context.detect?.HOSTNAME && currentUrl.hostname !== context.detect.HOSTNAME) {
+                    currentUrl.hostname = context.detect.HOSTNAME;
                 }
-                URL.searchParams.delete('jv_auth_code');
-                URL.searchParams.delete('token');
-                URL.searchParams.delete('auth_code');
-                const redirectUrl = URL.toString();
-                context.redirect(`${loginUrl}?url=${encodeURIComponent(redirectUrl)}&appid=${this.ssoOption?.appId || 0}`);
+                for (const param of this.authOption?.cleanParams || ['jv_auth_code', 'token', 'auth_code']) {
+                    currentUrl.searchParams.delete(param);
+                }
+                const redirectParam = this.authOption?.redirectParam || 'url';
+                const appIdParam = this.authOption?.appIdParam === undefined ? 'appid' : this.authOption.appIdParam;
+                const targetUrl = new URL(loginUrl, `${context.protocol}://${context.host}`);
+                targetUrl.searchParams.set(redirectParam, currentUrl.toString());
+                if (appIdParam) {
+                    targetUrl.searchParams.set(appIdParam, String(this.ssoOption?.appId || 0));
+                }
+                context.redirect(targetUrl.toString());
             }
             else {
                 context.redirect(loginUrl);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cicctencent/midwayjs-base",
-  "version": "1.0.45",
+  "version": "1.0.46",
   "description": "基础框架，服务",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -57,6 +57,7 @@
     "@midwayjs/typeorm": "^3.20.24",
     "@midwayjs/view-nunjucks": "^3.20.24",
     "axios": "^1.18.1",
+    "browserslist": "^0.2.3",
     "dayjs": "^1.11.21",
     "dotenv": "^17.4.2",
     "ip": "^2.0.1",