@cicctencent/midwayjs-base 1.0.35 → 1.0.36

package/dist/types/types/base.service.js

@@ -0,0 +1,70 @@
+"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);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseService = void 0;
+const core_1 = require("@midwayjs/core");
+const api_1 = __importDefault(require("@fefeding/common/dist/utils/api"));
+const request_1 = require("../lib/request");
+class BaseService {
+    async checkManager(account = this.ctx.currentSession?.account?.account) {
+        return account && this.baseServiceOption.manager?.includes(account);
+    }
+    async requestBaseApi(req, option) {
+        const res = await this.requestBaseServer(req, option);
+        return res?.data || null;
+    }
+    async requestBaseServer(req, option) {
+        option = {
+            method: 'POST',
+            baseURL: this.baseServiceOption.url,
+            accessKey: this.apiOption?.key || '',
+            ...option,
+        };
+        const headers = option.headers || {};
+        if (option.accessKey) {
+            const thisToken = api_1.default.createApiToken(option.accessKey);
+            headers['x-api-token'] = thisToken.sign;
+            headers['x-api-timestamp'] = thisToken.timestamp;
+        }
+        headers['x-request-id'] = this.ctx.request_id;
+        headers['x-auth-token'] = this.ctx.currentSession?.id || '';
+        const ip = this.ctx?.detect?.CLIENTIP ||
+            (this.ctx.request?.header?.['x-client-ip'] ||
+                this.ctx.request?.header?.['x-forwarded-for'] ||
+                this.ctx.request?.ip ||
+                '').toString();
+        headers['x-client-ip'] = ip;
+        option.headers = headers;
+        const res = await (0, request_1.requestServer)(req, option);
+        return res;
+    }
+}
+exports.BaseService = BaseService;
+__decorate([
+    (0, core_1.App)(),
+    __metadata("design:type", Object)
+], BaseService.prototype, "app", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", Object)
+], BaseService.prototype, "ctx", void 0);
+__decorate([
+    (0, core_1.Config)('baseService'),
+    __metadata("design:type", Object)
+], BaseService.prototype, "baseServiceOption", void 0);
+__decorate([
+    (0, core_1.Config)('apiOption'),
+    __metadata("design:type", Object)
+], BaseService.prototype, "apiOption", void 0);
+//# sourceMappingURL=base.service.js.map

package/dist/types/{session.service.interface.d.ts → types/session.service.interface.d.ts}

@@ -10,21 +10,7 @@ export declare abstract class ISessionService extends BaseService {
         secretKey: string;
         serviceKey: ObjectIdentifier;
     };
-    /**
-     * 根据ID获取session
-     * 并判断session是否在有效期
-     * @param id token唯一
-     */
-    abstract getLoginSession(id: string): Promise<Session>;
-    /**
-     * 下线
-     * @param id 需要下线的id或者session
-     */
+    abstract getLoginSession(id: string): Promise<Session | null>;
     abstract logout(id: string): Promise<any>;
-    /**
-     * 用临时码登陆
-     * @param code 登陆临时码
-     * @returns
-     */
     abstract loginByCode(code: string): Promise<Session>;
 }

package/dist/types/{session.service.interface.js → types/session.service.interface.js}

@@ -10,15 +10,11 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ISessionService = exports.DEFAULT_SESSION_SERVICE_KEY = void 0;
-// @ts-ignore
 const core_1 = require("@midwayjs/core");
 const cache_manager_1 = require("@midwayjs/cache-manager");
 const base_service_1 = require("./base.service");
-// 定义服务标识符常量
 exports.DEFAULT_SESSION_SERVICE_KEY = 'default:session:service';
 class ISessionService extends base_service_1.BaseService {
-    sessionCache;
-    sessionOption;
 }
 exports.ISessionService = ISessionService;
 __decorate([
@@ -29,4 +25,4 @@ __decorate([
     (0, core_1.Config)('session'),
     __metadata("design:type", Object)
 ], ISessionService.prototype, "sessionOption", void 0);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2Vzc2lvbi5zZXJ2aWNlLmludGVyZmFjZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90eXBlcy9zZXNzaW9uLnNlcnZpY2UuaW50ZXJmYWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUFBLGFBQWE7QUFDYix5Q0FBbUc7QUFDbkcsMkRBQXNFO0FBQ3RFLGlEQUE2QztBQUc3QyxZQUFZO0FBQ0MsUUFBQSwyQkFBMkIsR0FBRyx5QkFBNkMsQ0FBQztBQUV6RixNQUFzQixlQUFnQixTQUFRLDBCQUFXO0lBR3JELFlBQVksQ0FBYztJQUcxQixhQUFhLENBSVo7Q0FxQko7QUEvQkQsMENBK0JDO0FBNUJHO0lBREMsSUFBQSxtQkFBWSxFQUFDLDhCQUFjLEVBQUUsU0FBUyxDQUFDOztxREFDZDtBQUcxQjtJQURDLElBQUEsYUFBTSxFQUFDLFNBQVMsQ0FBQzs7c0RBS2pCIn0=
+//# sourceMappingURL=session.service.interface.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cicctencent/midwayjs-base",
-  "version": "1.0.35",
+  "version": "1.0.36",
   "description": "基础框架，服务",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -26,8 +26,11 @@
   "devDependencies": {
     "@jest/globals": "^30.0.5",
     "@midwayjs/mock": "^3.20.11",
+    "@types/ip": "^1.1.3",
     "@types/jest": "^30.0.0",
+    "@types/jsonwebtoken": "^9.0.10",
     "@types/koa": "^3.0.0",
+    "@types/lodash": "^4.17.23",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^24.3.0",
     "cross-env": "^10.0.0",

package/dist/config/config.default.d.ts

@@ -1,3 +0,0 @@
-import type { MidwayConfig, MidwayAppInfo } from '@midwayjs/core';
-declare const _default: (appInfo: MidwayAppInfo) => MidwayConfig;
-export default _default;

package/dist/config/config.default.js

@@ -1,160 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = require("path");
-const fs = require("fs");
-exports.default = (appInfo) => {
-    appInfo.appId = Number(process.env.APP_ID) || 0;
-    const appRoot = appInfo.appDir || appInfo.root;
-    appInfo.dist = path.join(appRoot, 'dist');
-    appInfo.webDist = path.join(appInfo.dist, 'web');
-    appInfo.webPublic = path.join(appInfo.webDist, 'public');
-    if (!fs.existsSync(appInfo.webPublic)) {
-        fs.mkdirSync(appInfo.webPublic, {
-            recursive: true
-        });
-    }
-    const config = {
-        // use for cookie sign key, should change to your own and keep security
-        keys: appInfo.name + '_1641910879296_0612',
-        cookies: {
-            // 确保不设置secret，或者设置为空字符串
-            secret: '', // 如果为空字符串，则关闭加密，但仍然可以解密已加密的cookies
-            // ...
-        },
-        view: {
-            //默认view目录
-            defaultViewEngine: 'nunjucks',
-            //默认view目录,本地开发目录必须在web下的，正式环境则是根目录下的view，因为web目录会被删
-            rootDir: {
-                default: path.join(appInfo.webDist, 'view/'),
-            },
-            mapping: {
-                '.html': 'nunjucks',
-            },
-        },
-        // 上传配置
-        upload: {
-            // 文件模式
-            mode: 'file',
-            // 上传目录
-            fileSize: '10mb',
-            whitelist: ['.jpg', '.jpeg', '.png', '.gif', '.webp', '.pdf', '.doc', '.docx', '.xls', '.xlsx', '.ppt', '.pptx'],
-        },
-        // 静态文件服务  
-        staticFile: {
-            dirs: {
-                default: {
-                    // 默认public目录
-                    dir: appInfo.webPublic,
-                },
-            },
-        },
-        /**
-         * api相关配置
-         */
-        apiOption: {
-            // 接口请求校验key
-            key: process.env.API_KEY || '2024@fefeding#',
-            reg: /^\/([^/]+\/)?api\//i,
-            ignore: [
-                '/',
-                /^\/([^/]+\/)?api\/cos\/get/i
-            ]
-        },
-        // ip白名单
-        ipOption: {
-            whiteList: [
-                '127.0.0.1',
-                '::1',
-                '0.0.0.0',
-                '::',
-                'localhost',
-                ...(process.env.IP_WHITE_LIST?.split(',') || [])
-            ],
-        },
-        // 查看系统信息
-        info: {
-            infoPath: '/_sys_info',
-        },
-        axios: {
-            default: {
-            // 所有实例复用的配置
-            },
-            clients: {
-                // 默认实例的配置
-                default: {
-                    // `headers` are custom headers to be sent
-                    headers: {
-                        'X-Requested-With': 'XMLHttpRequest',
-                    },
-                    timeout: 1000, // default is `0` (no timeout)
-                    // `withCredentials` indicates whether or not cross-site Access-Control requests
-                    // should be made using credentials
-                    withCredentials: false, // default
-                },
-            },
-        },
-        // 基础服务
-        baseService: {
-            manager: ['admin'], // 管理员帐号
-            appId: appInfo.appId,
-            url: process.env.BASE_SERVER_URL || ''
-        },
-        session: {
-            // session 过期设置
-            timeout: Number(process.env.SESSION_TIMEOUT) || 20 * 60 * 1000,
-            secretKey: 'fjjiowhb@#$^111)*&',
-            //serviceKey: 'session:service',
-        },
-        // 登陆态校验配置
-        auth: {
-            // 忽略登陆态校验
-            ignores: [
-                /\/api\/test\//i,
-                "/api/test/action"
-            ]
-        },
-        // 登陆相关配置
-        sso: {
-            baseUrl: process.env.SSO_URL || '',
-            appId: appInfo.appId,
-        },
-        tencentCredential: {
-            secretId: process.env.TENCENT_CREDENTIAL_SECRETID || '',
-            secretKey: process.env.TENCENT_CREDENTIAL_SECRETKEY || '',
-        },
-        busboy: {
-            mode: 'file',
-        },
-        bodyParser: {
-            formLimit: '30mb',
-            jsonLimit: '30mb',
-        },
-        cacheManager: {
-            clients: {
-                default: {
-                    store: 'memory',
-                    options: {
-                        max: 10000, // 代表缓存 key 的最大个数
-                        ttl: 600000, // 缓存的过期时间，单位毫秒。
-                    },
-                },
-            },
-            session: {
-                store: 'memory',
-                options: {
-                    max: 10000, // 代表缓存 key 的最大个数
-                    ttl: 600000, // 缓存的过期时间，单位毫秒。
-                },
-            },
-        },
-        logger: {
-            // 日志配置
-            level: process.env.LOG_LEVEL || 'info',
-            consoleLevel: process.env.LOG_LEVEL || 'info',
-            remoteUrl: process.env.REMOTE_LOGGER_URL || '',
-        }
-    };
-    return config;
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmRlZmF1bHQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29uZmlnL2NvbmZpZy5kZWZhdWx0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBRUEsNkJBQTZCO0FBQzdCLHlCQUF5QjtBQUV6QixrQkFBZSxDQUFDLE9BQXNCLEVBQUUsRUFBRTtJQUN0QyxPQUFPLENBQUMsS0FBSyxHQUFHLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNoRCxNQUFNLE9BQU8sR0FBRyxPQUFPLENBQUMsTUFBTSxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUM7SUFDL0MsT0FBTyxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUMsQ0FBQztJQUMxQyxPQUFPLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztJQUNqRCxPQUFPLENBQUMsU0FBUyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxRQUFRLENBQUMsQ0FBQztJQUV6RCxJQUFHLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQztRQUNuQyxFQUFFLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUU7WUFDNUIsU0FBUyxFQUFFLElBQUk7U0FDbEIsQ0FBQyxDQUFDO0lBQ1AsQ0FBQztJQUVELE1BQU0sTUFBTSxHQUFHO1FBQ1gsdUVBQXVFO1FBQ3ZFLElBQUksRUFBRSxPQUFPLENBQUMsSUFBSSxHQUFHLHFCQUFxQjtRQUMxQyxPQUFPLEVBQUU7WUFDTCx3QkFBd0I7WUFDeEIsTUFBTSxFQUFFLEVBQUUsRUFBRSxtQ0FBbUM7WUFDL0MsTUFBTTtTQUNUO1FBQ0QsSUFBSSxFQUFFO1lBQ0YsVUFBVTtZ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

package/dist/config/env.js

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadEnv = loadEnv;
-const dotenv = require("dotenv");
-const path = require("path");
-const fs = require("fs");
-function loadEnv(envPath) {
-    envPath = envPath || path.join(process.cwd(), '.env');
-    console.log('env path', envPath);
-    if (fs.existsSync(envPath)) {
-        const env = dotenv.config({
-            path: envPath,
-            encoding: 'utf-8'
-        });
-        console.log(env);
-    }
-    return process.env;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW52LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbmZpZy9lbnYudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFNQSwwQkFZQztBQWpCRCxpQ0FBaUM7QUFDakMsNkJBQTZCO0FBQzdCLHlCQUF5QjtBQUd6QixTQUFnQixPQUFPLENBQUMsT0FBZ0I7SUFDcEMsT0FBTyxHQUFHLE9BQU8sSUFBSSxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBRSxNQUFNLENBQUMsQ0FBQztJQUN0RCxPQUFPLENBQUMsR0FBRyxDQUFDLFVBQVUsRUFBRSxPQUFPLENBQUMsQ0FBQztJQUVqQyxJQUFHLEVBQUUsQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztRQUN4QixNQUFNLEdBQUcsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDO1lBQ3RCLElBQUksRUFBRSxPQUFPO1lBQ2IsUUFBUSxFQUFFLE9BQU87U0FDcEIsQ0FBQyxDQUFDO1FBQ0gsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNyQixDQUFDO0lBQ0QsT0FBTyxPQUFPLENBQUMsR0FBRyxDQUFDO0FBQ3ZCLENBQUMifQ==

package/dist/guard/api.js

@@ -1,88 +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.ApiGuard = void 0;
-// @ts-ignore
-const core_1 = require("@midwayjs/core");
-const decorator_1 = require("../lib/decorator");
-const api_1 = require("@fefeding/common/dist/utils/api");
-/**
- * 对于需要token的接口，从query或body或cookie中取token，是否跟本服务的一致
- */
-let ApiGuard = class ApiGuard {
-    // 登陆态验证配置
-    apiOption;
-    ipOption;
-    async canActivate(context, supplierClz, methodName) {
-        // 检查是否有IP白名单限制
-        const needIP = (0, decorator_1.getCheckIP)(supplierClz, methodName);
-        if (needIP) {
-            //console.log('check ip ', needIP);
-            this.checkIPInWhiteList(context);
-        }
-        // 获取是否需要检查token
-        const needToken = (0, decorator_1.getApiToken)(supplierClz, methodName);
-        if (needToken) {
-            await this.checkApiToken(context);
-        }
-        return true;
-    }
-    // 校验是否有带api token
-    async checkApiToken(context) {
-        const body = (context.request.body || {});
-        const reqToken = context.URL.searchParams.get('api_token') ||
-            context.request.header['x-api-token'] ||
-            body.api_token ||
-            context.cookies.get('api_token');
-        const timestamp = Number(context.URL.searchParams.get('timestamp') ||
-            context.request.header['x-api-timestamp'] ||
-            body.timestamp ||
-            context.cookies.get('timestamp'));
-        if (!reqToken || !timestamp) {
-            context.logger.error(`token为空，非法请求, token: ${reqToken}, timestamp: ${timestamp}`);
-            throw Error('token为空，非法请求');
-        }
-        //const time = new Date(timestamp);
-        console.log('token time', reqToken, timestamp);
-        // 如果超过一定时间，则失效
-        if (timestamp < Date.now() - 5 * 60 * 1000) {
-            throw Error('timestamp已超过有效时间');
-        }
-        const thisToken = api_1.default.createApiToken(this.apiOption.key, timestamp);
-        if (reqToken !== thisToken.sign) {
-            context.logger.error(`输入token:${reqToken}  本地: ${thisToken.sign} 不一致`);
-            throw Error('token输入错误');
-        }
-    }
-    // 检查IP白名单
-    checkIPInWhiteList(context) {
-        const requestIp = context.detect?.REQUESTIP;
-        if (this.ipOption?.whiteList && !this.ipOption.whiteList.includes('*')) {
-            if (!this.ipOption.whiteList.includes(requestIp)) {
-                context.logger.error(`IP:${requestIp} 不在白名单内`);
-                throw Error(`IP:${requestIp} 不在白名单内`);
-            }
-        }
-    }
-};
-exports.ApiGuard = ApiGuard;
-__decorate([
-    (0, core_1.Config)('apiOption'),
-    __metadata("design:type", Object)
-], ApiGuard.prototype, "apiOption", void 0);
-__decorate([
-    (0, core_1.Config)('ipOption'),
-    __metadata("design:type", Object)
-], ApiGuard.prototype, "ipOption", void 0);
-exports.ApiGuard = ApiGuard = __decorate([
-    (0, core_1.Guard)()
-], ApiGuard);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBpLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2d1YXJkL2FwaS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSxhQUFhO0FBQ2IseUNBQXVEO0FBRXZELGdEQUEyRDtBQUMzRCx5REFBa0Q7QUFFbEQ7O0dBRUc7QUFFSSxJQUFNLFFBQVEsR0FBZCxNQUFNLFFBQVE7SUFDakIsVUFBVTtJQUVWLFNBQVMsQ0FFUDtJQUdGLFFBQVEsQ0FFTjtJQUVGLEtBQUssQ0FBQyxXQUFXLENBQ2IsT0FBZ0IsRUFDaEIsV0FBZ0IsRUFDaEIsVUFBa0I7UUFFbEIsZUFBZTtRQUNmLE1BQU0sTUFBTSxHQUFHLElBQUEsc0JBQVUsRUFBQyxXQUFXLEVBQUUsVUFBVSxDQUFDLENBQUM7UUFDbkQsSUFBRyxNQUFNLEVBQUUsQ0FBQztZQUNSLG1DQUFtQztZQUNuQyxJQUFJLENBQUMsa0JBQWtCLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDckMsQ0FBQztRQUNELGdCQUFnQjtRQUNoQixNQUFNLFNBQVMsR0FBRyxJQUFBLHVCQUFXLEVBQUMsV0FBVyxFQUFFLFVBQVUsQ0FBQyxDQUFDO1FBRXZELElBQUksU0FBUyxFQUFFLENBQUM7WUFDWixNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDdEMsQ0FBQztRQUNELE9BQU8sSUFBSSxDQUFDO0lBQ2hCLENBQUM7SUFFRCxrQkFBa0I7SUFDbEIsS0FBSyxDQUFDLGFBQWEsQ0FBQyxPQUFnQjtRQUNoQyxNQUFNLElBQUksR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxJQUFJLEVBQUUsQ0FBUSxDQUFDO1FBQ2pELE1BQU0sUUFBUSxHQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUM7WUFDekMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDO1lBQ3JDLElBQUksQ0FBQyxTQUFTO1lBQ2QsT0FBTyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDckMsTUFBTSxTQUFTLEdBQUcsTUFBTSxDQUNwQixPQUFPLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDO1lBQ3pDLE9BQU8sQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLGlCQUFpQixDQUFDO1lBQ3JDLElBQUksQ0FBQyxTQUFTO1lBQ2QsT0FBTyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLENBQ3ZDLENBQUM7UUFDRixJQUFJLENBQUMsUUFBUSxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7WUFDMUIsT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQ2hCLHdCQUF3QixRQUFRLGdCQUFnQixTQUFTLEVBQUUsQ0FDOUQsQ0FBQztZQUNGLE1BQU0sS0FBSyxDQUFDLGNBQWMsQ0FBQyxDQUFDO1FBQ2hDLENBQUM7UUFFRCxtQ0FBbUM7UUFDbkMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxZQUFZLEVBQUUsUUFBUSxFQUFFLFNBQVMsQ0FBQyxDQUFDO1FBQy9DLGVBQWU7UUFDZixJQUFJLFNBQVMsR0FBRyxJQUFJLENBQUMsR0FBRyxFQUFFLEdBQUcsQ0FBQyxHQUFHLEVBQUUsR0FBRyxJQUFJLEVBQUUsQ0FBQztZQUN6QyxNQUFNLEtBQUssQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO1FBQ3BDLENBQUM7UUFFRCxNQUFNLFNBQVMsR0FBRyxhQUFHLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFLFNBQVMsQ0FBQyxDQUFDO1FBRXBFLElBQUksUUFBUSxLQUFLLFNBQVMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztZQUM5QixPQUFPLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FDaEIsV0FBVyxRQUFRLFNBQVMsU0FBUyxDQUFDLElBQUksTUFBTSxDQUNuRCxDQUFDO1lBQ0YsTUFBTSxLQUFLLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDN0IsQ0FBQztJQUNMLENBQUM7SUFFRCxVQUFVO0lBQ1Ysa0JBQWtCLENBQUMsT0FBZ0I7UUFDL0IsTUFBTSxTQUFTLEdBQUcsT0FBTyxDQUFDLE1BQU0sRUFBRSxTQUFTLENBQUM7UUFDNUMsSUFBRyxJQUFJLENBQUMsUUFBUSxFQUFFLFNBQVMsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsU0FBUyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO1lBQ3BFLElBQUcsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQztnQkFDOUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsTUFBTSxTQUFTLFNBQVMsQ0FBQyxDQUFDO2dCQUMvQyxNQUFNLEtBQUssQ0FBQyxNQUFNLFNBQVMsU0FBUyxDQUFDLENBQUM7WUFDMUMsQ0FBQztRQUNMLENBQUM7SUFDTCxDQUFDO0NBQ0osQ0FBQTtBQWhGWSw0QkFBUTtBQUdqQjtJQURDLElBQUEsYUFBTSxFQUFDLFdBQVcsQ0FBQzs7MkNBR2xCO0FBR0Y7SUFEQyxJQUFBLGFBQU0sRUFBQyxVQUFVLENBQUM7OzBDQUdqQjttQkFWTyxRQUFRO0lBRHBCLElBQUEsWUFBSyxHQUFFO0dBQ0ssUUFBUSxDQWdGcEIifQ==

package/dist/guard/auth.js

@@ -1,202 +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.AuthGuard = void 0;
-// @ts-ignore
-const core_1 = require("@midwayjs/core");
-const decorator_1 = require("../lib/decorator");
-const utils_1 = require("../lib/utils");
-const session_service_interface_1 = require("../types/session.service.interface");
-/**
- * 校验请求的登陆态
- */
-let AuthGuard = class AuthGuard {
-    app;
-    sessionService;
-    ssoOption;
-    authOption;
-    apiOption;
-    koa;
-    async init() {
-        const appContext = this.app.getApplicationContext();
-        console.log('init auth guard');
-        // 如果用户自定义了session service的实现，则使用用户自定义的
-        this.sessionService = await appContext.getAsync(session_service_interface_1.DEFAULT_SESSION_SERVICE_KEY);
-        if (this.sessionService?.sessionOption?.serviceKey && this.sessionService?.sessionOption.serviceKey !== session_service_interface_1.DEFAULT_SESSION_SERVICE_KEY) {
-            //尝试获取用户自定义的实现
-            const sessionServiceObj = await appContext.getAsync(this.sessionService.sessionOption.serviceKey);
-            if (sessionServiceObj) {
-                console.log('use custom session service for auth guard', this.sessionService.sessionOption.serviceKey);
-                this.sessionService = sessionServiceObj;
-            }
-        }
-    }
-    // 检查是否需要验证登陆态
-    checkNeedAuth(context, supplierClz, methodName) {
-        // 如果有配置忽略验证，则直接返回false
-        if (this.authOption?.ignores) {
-            if (this.authOption.ignores === '*' || this.authOption.ignores === context.path) {
-                return false;
-            }
-            if (Array.isArray(this.authOption.ignores)) {
-                if (this.authOption.ignores.includes('*'))
-                    return false;
-                for (const t of this.authOption.ignores) {
-                    if (t instanceof RegExp) {
-                        if (t.test(context.path))
-                            return false;
-                    }
-                    else if (typeof t === 'string') {
-                        if (t === context.path)
-                            return false;
-                    }
-                }
-            }
-        }
-        // 获取是否需要检查登陆态
-        const needAuth = (0, decorator_1.getCheckLogin)(supplierClz, methodName);
-        return needAuth;
-    }
-    async canActivate(context, supplierClz, methodName) {
-        // 获取是否需要检查登陆态
-        const needAuth = this.checkNeedAuth(context, supplierClz, methodName);
-        const token = (0, utils_1.getAuthToken)(context);
-        if (token)
-            context.auth_token = token;
-        const ret = await this.checkAuth(context, token, needAuth);
-        return ret;
-    }
-    // 校验是否有带api token
-    async checkAuth(context, token, needAuth) {
-        this.sessionService.ctx = context;
-        const authRet = 50001;
-        //console.log('check auth', token, needAuth);
-        let errRes = null;
-        try {
-            let session = null;
-            // 如果是从登陆回来，则验证监时码
-            const authCode = context.URL.searchParams.get('auth_code');
-            if (authCode) {
-                session = await this.sessionService.loginByCode(authCode);
-                if (session) {
-                    // 登陆写入cookie
-                    (0, utils_1.setAuthToken)(context, session.id);
-                }
-                context.URL.searchParams.delete('auth_code'); // 移除auth_code参数
-                context.URL.hostname = context.detect?.HOSTNAME || context.hostname;
-                const url = context.URL.toString();
-                context.redirect(url);
-                return true;
-            }
-            if (token && !errRes && !session) {
-                // jwt签名
-                if (token.startsWith('Bearer ')) {
-                    session = (0, utils_1.decodeJWT)(token.replace('Bearer ', ''), this.sessionService?.sessionOption?.secretKey || 'fefeding');
-                }
-                else {
-                    session = await this.sessionService.getLoginSession(token);
-                }
-                if (!session || !session.id) {
-                    (0, utils_1.setAuthToken)(context, '');
-                    //context.status = 403;
-                    errRes = {
-                        ret: authRet,
-                        msg: 'token不存在或已过期',
-                    };
-                }
-            }
-            if (!session) {
-                errRes = {
-                    ret: authRet,
-                    msg: '需要登陆态',
-                };
-            }
-            // 登陆态挂载到当前上下文
-            context.currentSession = session;
-            // @ts-ignore 登陆态挂载到logger
-            if (session && context.logger?.setOptions) {
-                // @ts-ignore
-                context.logger.setOptions({
-                    loginId: session?.loginId || '',
-                    userId: (session?.userId || '').toString(),
-                });
-            }
-        }
-        catch (e) {
-            errRes = {
-                ret: e.ret || authRet,
-                msg: e.msg || e.message || 'auth error',
-            };
-            console.error(e);
-        }
-        if (errRes && needAuth) {
-            this.authError(context, errRes);
-        }
-        return true;
-    }
-    // 异常处理
-    authError(context, error) {
-        const isApi = this.apiOption?.reg?.test(context.path);
-        if (isApi) {
-            context.status = 200;
-            context.res.write('', 'utf8');
-            throw error;
-        }
-        else {
-            const loginUrl = `${this.ssoOption?.baseUrl || this.koa?.globalPrefix || ''}/login`;
-            // 如果本来就以/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;
-                URL.searchParams.delete('jv_auth_code');
-                URL.searchParams.delete('token');
-                URL.searchParams.delete('auth_code'); // 移除auth_code参数
-                const redirectUrl = context.URL.toString();
-                context.redirect(`${loginUrl}?url=${encodeURIComponent(redirectUrl)}&appid=${this.ssoOption?.appId || 0}`);
-            }
-            else {
-                context.redirect(loginUrl);
-            }
-        }
-    }
-};
-exports.AuthGuard = AuthGuard;
-__decorate([
-    (0, core_1.App)(),
-    __metadata("design:type", Object)
-], AuthGuard.prototype, "app", void 0);
-__decorate([
-    (0, core_1.Config)('sso'),
-    __metadata("design:type", Object)
-], AuthGuard.prototype, "ssoOption", void 0);
-__decorate([
-    (0, core_1.Config)('auth'),
-    __metadata("design:type", Object)
-], AuthGuard.prototype, "authOption", void 0);
-__decorate([
-    (0, core_1.Config)('apiOption'),
-    __metadata("design:type", Object)
-], AuthGuard.prototype, "apiOption", void 0);
-__decorate([
-    (0, core_1.Config)('koa'),
-    __metadata("design:type", Object)
-], AuthGuard.prototype, "koa", void 0);
-__decorate([
-    (0, core_1.Init)(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", Promise)
-], AuthGuard.prototype, "init", null);
-exports.AuthGuard = AuthGuard = __decorate([
-    (0, core_1.Guard)()
-], AuthGuard);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ndWFyZC9hdXRoLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUFBLGFBQWE7QUFDYix5Q0FBMEU7QUFFMUUsZ0RBQWlEO0FBQ2pELHdDQUFxRTtBQUNyRSxrRkFBa0c7QUFFbEc7O0dBRUc7QUFFSSxJQUFNLFNBQVMsR0FBZixNQUFNLFNBQVM7SUFFUixHQUFHLENBQWM7SUFFM0IsY0FBYyxDQUFrQjtJQUdoQyxTQUFTLENBQU07SUFHZixVQUFVLENBRVI7SUFHRixTQUFTLENBQU07SUFHZixHQUFHLENBQU07SUFHSCxBQUFOLEtBQUssQ0FBQyxJQUFJO1FBQ04sTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxxQkFBcUIsRUFBRSxDQUFDO1FBQ3BELE9BQU8sQ0FBQyxHQUFHLENBQUMsaUJBQWlCLENBQUMsQ0FBQztRQUMvQix1Q0FBdUM7UUFDdkMsSUFBSSxDQUFDLGNBQWMsR0FBRyxNQUFNLFVBQVUsQ0FBQyxRQUFRLENBQWtCLHVEQUEyQixDQUFDLENBQUM7UUFDOUYsSUFBRyxJQUFJLENBQUMsY0FBYyxFQUFFLGFBQWEsRUFBRSxVQUFVLElBQUksSUFBSSxDQUFDLGNBQWMsRUFBRSxhQUFhLENBQUMsVUFBVSxLQUFLLHVEQUEyQixFQUFFLENBQUM7WUFDakksY0FBYztZQUNkLE1BQU0saUJBQWlCLEdBQUcsTUFBTSxVQUFVLENBQUMsUUFBUSxDQUFrQixJQUFJLENBQUMsY0FBYyxDQUFDLGFBQWEsQ0FBQyxVQUFVLENBQUMsQ0FBQztZQUNuSCxJQUFJLGlCQUFpQixFQUFFLENBQUM7Z0JBQ3BCLE9BQU8sQ0FBQyxHQUFHLENBQUMsMkNBQTJDLEVBQUUsSUFBSSxDQUFDLGNBQWMsQ0FBQyxhQUFhLENBQUMsVUFBVSxDQUFDLENBQUM7Z0JBQ3ZHLElBQUksQ0FBQyxjQUFjLEdBQUcsaUJBQWlCLENBQUM7WUFDNUMsQ0FBQztRQUNM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