sumor 3.0.5 → 3.0.7

package/dist/server/controllers/tokenRefreshController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tokenRefreshController.d.ts","sourceRoot":"","sources":["../../../server/controllers/tokenRefreshController.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAO3C,wBAA8B,sBAAsB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,+CA6E/E"}
+{"version":3,"file":"tokenRefreshController.d.ts","sourceRoot":"","sources":["../../../server/controllers/tokenRefreshController.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAQ3C,wBAA8B,sBAAsB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,+CAiG/E"}

package/dist/server/controllers/tokenRefreshController.js

@@ -15,6 +15,7 @@ const oauthTokenUtils_1 = require("../utils/oauthTokenUtils");
 const tokenModel_1 = require("../models/tokenModel");
 const config_1 = require("../utils/config");
 const authorizationUrlGenerator_1 = require("../utils/authorizationUrlGenerator");
+const authUtils_1 = require("../utils/authUtils");
 async function tokenRefreshController(req, res) {
     const config = (0, config_1.getOAuthConfig)();
     const oauthAuthorizeUrl = (0, authorizationUrlGenerator_1.generateAuthorizationUrl)();
@@ -24,45 +25,65 @@ async function tokenRefreshController(req, res) {
     let message = '未登录';
     let user = null;
     try {
-        // 仅支持驼峰格式（refreshToken）
-        // 从请求体中获取 refreshToken（优先级高）
-        let refreshToken = req.body.refreshToken;
-        // 如果请求体中没有，从 Cookie 中获取
-        if (!refreshToken) {
-            refreshToken = req.cookies?.refresh_token;
-        }
-        // 如果有有效的 refreshToken，进行刷新
-        if (refreshToken) {
-            // 使用 OAuthService 调用 ITS API
-            const oauthService = new oauthService_1.default();
-            const tokenData = await oauthService.refreshAccessToken(refreshToken);
-            // 使用公用的 token 设置函数
-            // 设置新的 accessToken
-            (0, oauthTokenUtils_1.setOAuthTokenCookie)(res, tokenData.accessToken, tokenData.expiresIn, 'access');
-            // 如果返回了新的 refreshToken，也设置上
-            // PUT /token 通常不返回新的 refreshToken，但为了保险起见检查
-            if (tokenData.refreshToken && tokenData.refreshToken !== refreshToken) {
-                (0, oauthTokenUtils_1.setOAuthTokenCookie)(res, tokenData.refreshToken, 2592000, 'refresh'); // 30 days
-            }
-            // 验证新的 accessToken 获取用户信息
+        // 第一步：先从 Cookie 中获取并验证 access_token
+        const accessToken = (0, authUtils_1.getAccessToken)(req);
+        const tokenModel = (0, tokenModel_1.getTokenModel)();
+        if (accessToken) {
             try {
-                const tokenModel = (0, tokenModel_1.getTokenModel)();
-                const claims = await tokenModel.verify(tokenData.accessToken);
+                // 尝试验证现有的 access_token
+                const claims = await tokenModel.verify(accessToken);
                 if (claims.sub) {
+                    // access_token 有效且未过期，无需刷新
                     user = {
                         id: claims.sub,
                         isVerified: claims.isVerified || 0,
                         roles: claims.roles || '',
                         permissions: claims.permissions || ''
                     };
+                    message = 'Token 仍然有效';
                 }
             }
             catch (error) {
-                // Token 验证失败，返回 null user
-                console.error('Failed to verify new token:', error);
+                // access_token 已过期或无效，继续执行刷新流程
+                console.log('Access token 已过期或无效，准备刷新');
+            }
+        }
+        // 如果 access_token 无效，进行第二步刷新
+        if (!user) {
+            // 第二步：从 Cookie 中获取 refreshToken 进行刷新
+            const refreshToken = (0, authUtils_1.getRefreshToken)(req);
+            // 如果有有效的 refreshToken，进行刷新
+            if (refreshToken) {
+                // 使用 OAuthService 调用 ITS API
+                const oauthService = new oauthService_1.default();
+                const tokenData = await oauthService.refreshAccessToken(refreshToken);
+                // 使用公用的 token 设置函数
+                // 设置新的 accessToken
+                (0, oauthTokenUtils_1.setOAuthTokenCookie)(res, tokenData.accessToken, tokenData.expiresIn, 'access');
+                // 如果返回了新的 refreshToken，也设置上
+                // PUT /token 通常不返回新的 refreshToken，但为了保险起见检查
+                if (tokenData.refreshToken && tokenData.refreshToken !== refreshToken) {
+                    (0, oauthTokenUtils_1.setOAuthTokenCookie)(res, tokenData.refreshToken, 2592000, 'refresh'); // 30 days
+                }
+                // 验证新的 accessToken 获取用户信息
+                try {
+                    const claims = await tokenModel.verify(tokenData.accessToken);
+                    if (claims.sub) {
+                        user = {
+                            id: claims.sub,
+                            isVerified: claims.isVerified || 0,
+                            roles: claims.roles || '',
+                            permissions: claims.permissions || ''
+                        };
+                    }
+                }
+                catch (error) {
+                    // Token 验证失败，返回 null user
+                    console.error('Failed to verify new token:', error);
+                }
+                // 更新消息为成功登录状态
+                message = 'Token 刷新成功';
             }
-            // 更新消息为成功登录状态
-            message = 'Token 刷新成功';
         }
     }
     catch (error) {

package/dist/server/controllers/tokenRefreshController.js.map

@@ -1 +1 @@
-{"version":3,"file":"tokenRefreshController.js","sourceRoot":"","sources":["../../../server/controllers/tokenRefreshController.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;AASH,yCA6EC;AAnFD,4EAAmD;AACnD,8DAA8D;AAC9D,qDAAoD;AACpD,4CAAgD;AAChD,kFAA6E;AAE9D,KAAK,UAAU,sBAAsB,CAAC,GAAY,EAAE,GAAa;IAC9E,MAAM,MAAM,GAAG,IAAA,uBAAc,GAAE,CAAA;IAC/B,MAAM,iBAAiB,GAAG,IAAA,oDAAwB,GAAE,CAAA;IAEpD,UAAU;IACV,IAAI,UAAU,GAAG,GAAG,CAAA;IACpB,IAAI,IAAI,GAAG,IAAI,CAAA;IACf,IAAI,OAAO,GAAG,KAAK,CAAA;IACnB,IAAI,IAAI,GAAG,IAAI,CAAA;IAEf,IAAI,CAAC;QACH,wBAAwB;QACxB,6BAA6B;QAC7B,IAAI,YAAY,GAAG,GAAG,CAAC,IAAI,CAAC,YAAY,CAAA;QAExC,wBAAwB;QACxB,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,YAAY,GAAG,GAAG,CAAC,OAAO,EAAE,aAAa,CAAA;QAC3C,CAAC;QAED,2BAA2B;QAC3B,IAAI,YAAY,EAAE,CAAC;YACjB,6BAA6B;YAC7B,MAAM,YAAY,GAAG,IAAI,sBAAY,EAAE,CAAA;YACvC,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAA;YAErE,mBAAmB;YACnB,mBAAmB;YACnB,IAAA,qCAAmB,EAAC,GAAG,EAAE,SAAS,CAAC,WAAW,EAAE,SAAS,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;YAE9E,4BAA4B;YAC5B,4CAA4C;YAC5C,IAAI,SAAS,CAAC,YAAY,IAAI,SAAS,CAAC,YAAY,KAAK,YAAY,EAAE,CAAC;gBACtE,IAAA,qCAAmB,EAAC,GAAG,EAAE,SAAS,CAAC,YAAY,EAAE,OAAO,EAAE,SAAS,CAAC,CAAA,CAAC,UAAU;YACjF,CAAC;YAED,0BAA0B;YAC1B,IAAI,CAAC;gBACH,MAAM,UAAU,GAAG,IAAA,0BAAa,GAAE,CAAA;gBAClC,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;gBAC7D,IAAI,MAAM,CAAC,GAAG,EAAE,CAAC;oBACf,IAAI,GAAG;wBACL,EAAE,EAAE,MAAM,CAAC,GAAG;wBACd,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,CAAC;wBAClC,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,EAAE;wBACzB,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,EAAE;qBACtC,CAAA;gBACH,CAAC;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,0BAA0B;gBAC1B,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,KAAK,CAAC,CAAA;YACrD,CAAC;YAED,cAAc;YACd,OAAO,GAAG,YAAY,CAAA;QACxB,CAAC;IACH,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,0CAA0C;QAC1C,IAAI,KAAK,CAAC,IAAI,KAAK,sBAAsB,IAAI,KAAK,CAAC,QAAQ,EAAE,MAAM,KAAK,GAAG,EAAE,CAAC;YAC5E,OAAO,GAAG,cAAc,CAAA;QAC1B,CAAC;aAAM,CAAC;YACN,SAAS;YACT,UAAU,GAAG,KAAK,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,CAAA;YAC1C,IAAI,GAAG,OAAO,CAAA;YACd,OAAO,GAAG,KAAK,CAAC,OAAO,IAAI,YAAY,CAAA;QACzC,CAAC;IACH,CAAC;IAED,OAAO,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC;QACjC,IAAI;QACJ,OAAO;QACP,IAAI,EAAE;YACJ,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,YAAY,EAAE,iBAAiB;YAC/B,IAAI;SACL;KACF,CAAC,CAAA;AACJ,CAAC"}
+{"version":3,"file":"tokenRefreshController.js","sourceRoot":"","sources":["../../../server/controllers/tokenRefreshController.ts"],"names":[],"mappings":"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"}

package/dist/server/index.d.ts

@@ -3,6 +3,9 @@
  * 统一管理 OAuth 权限同步、JWT 用户加载和 OAuth 路由注册
  */
 import { Express } from 'express';
+import { loadJwtUserMiddleware } from './middlewares/loadJwtUserMiddleware';
+import { isLoggedMiddleware } from './middlewares/isLoggedMiddleware';
+import { isVerifiedMiddleware } from './middlewares/isVerifiedMiddleware';
 import type { PermissionConfig } from './types/oauth';
 /**
  * 初始化 Sumor OAuth 集成
@@ -12,4 +15,8 @@ import type { PermissionConfig } from './types/oauth';
  * @param permissionConfig 权限配置 { permissions, permissionLabels }
  */
 export default function setupSumor(app: Express, permissionConfig: PermissionConfig): Promise<void>;
+/**
+ * 导出中间件供 client 使用
+ */
+export { loadJwtUserMiddleware, isLoggedMiddleware, isVerifiedMiddleware };
 //# sourceMappingURL=index.d.ts.map

package/dist/server/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../server/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAKjC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAiBrD;;;;;;GAMG;AACH,wBAA8B,UAAU,CACtC,GAAG,EAAE,OAAO,EACZ,gBAAgB,EAAE,gBAAgB,GACjC,OAAO,CAAC,IAAI,CAAC,CAyBf"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../server/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAGjC,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAA;AAEzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAiBrD;;;;;;GAMG;AACH,wBAA8B,UAAU,CACtC,GAAG,EAAE,OAAO,EACZ,gBAAgB,EAAE,gBAAgB,GACjC,OAAO,CAAC,IAAI,CAAC,CAyBf;AAED;;GAEG;AACH,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,CAAA"}

package/dist/server/index.js

@@ -7,10 +7,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isVerifiedMiddleware = exports.isLoggedMiddleware = exports.loadJwtUserMiddleware = void 0;
 exports.default = setupSumor;
 const oauthService_1 = __importDefault(require("./services/oauthService"));
 const routes_1 = __importDefault(require("./routes"));
 const loadJwtUserMiddleware_1 = require("./middlewares/loadJwtUserMiddleware");
+Object.defineProperty(exports, "loadJwtUserMiddleware", { enumerable: true, get: function () { return loadJwtUserMiddleware_1.loadJwtUserMiddleware; } });
+const isLoggedMiddleware_1 = require("./middlewares/isLoggedMiddleware");
+Object.defineProperty(exports, "isLoggedMiddleware", { enumerable: true, get: function () { return isLoggedMiddleware_1.isLoggedMiddleware; } });
+const isVerifiedMiddleware_1 = require("./middlewares/isVerifiedMiddleware");
+Object.defineProperty(exports, "isVerifiedMiddleware", { enumerable: true, get: function () { return isVerifiedMiddleware_1.isVerifiedMiddleware; } });
 const config_1 = require("./utils/config");
 /**
  * 初始化 Sumor OAuth 权限同步

package/dist/server/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/index.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;AA+BH,6BA4BC;AAxDD,2EAAkD;AAClD,sDAAkC;AAClC,+EAA2E;AAC3E,2CAAsD;AAGtD;;;GAGG;AACH,KAAK,UAAU,0BAA0B,CAAC,gBAAkC;IAC1E,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,IAAI,sBAAY,EAAE,CAAA;QAEvC,iBAAiB;QACjB,MAAO,YAAoB,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAA;IACjE,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,iBAAiB;IACnB,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACY,KAAK,UAAU,UAAU,CACtC,GAAY,EACZ,gBAAkC;IAElC,IAAI,CAAC;QACH,0BAA0B;QAC1B,IAAA,8BAAqB,GAAE,CAGtB;QAAC,GAAW,CAAC,KAAK,GAAG,IAAI,sBAAY,EAAE,CAAA;QAExC,oBAAoB;QACpB,MAAM,0BAA0B,CAAC,gBAAgB,CAAC,CAAA;QAElD,oBAAoB;QACpB,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,6CAAqB,CAAC,CAAA;QAEtC,oCAAoC;QACpC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,GAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACtC,GAAG,CAAC,KAAK,GAAI,GAAW,CAAC,KAAK,CAAA;YAC9B,IAAI,EAAE,CAAA;QACR,CAAC,CAAC,CAAA;QAEF,iBAAiB;QACjB,GAAG,CAAC,GAAG,CAAC,YAAY,EAAE,gBAAW,CAAC,CAAA;IACpC,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,MAAM,KAAK,CAAA;IACb,CAAC;AACH,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/index.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;AAiCH,6BA4BC;AA1DD,2EAAkD;AAClD,sDAAkC;AAClC,+EAA2E;AA6DlE,sGA7DA,6CAAqB,OA6DA;AA5D9B,yEAAqE;AA4DrC,mGA5DvB,uCAAkB,OA4DuB;AA3DlD,6EAAyE;AA2DrB,qGA3D3C,2CAAoB,OA2D2C;AA1DxE,2CAAsD;AAGtD;;;GAGG;AACH,KAAK,UAAU,0BAA0B,CAAC,gBAAkC;IAC1E,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,IAAI,sBAAY,EAAE,CAAA;QAEvC,iBAAiB;QACjB,MAAO,YAAoB,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAA;IACjE,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,iBAAiB;IACnB,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACY,KAAK,UAAU,UAAU,CACtC,GAAY,EACZ,gBAAkC;IAElC,IAAI,CAAC;QACH,0BAA0B;QAC1B,IAAA,8BAAqB,GAAE,CAGtB;QAAC,GAAW,CAAC,KAAK,GAAG,IAAI,sBAAY,EAAE,CAAA;QAExC,oBAAoB;QACpB,MAAM,0BAA0B,CAAC,gBAAgB,CAAC,CAAA;QAElD,oBAAoB;QACpB,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,6CAAqB,CAAC,CAAA;QAEtC,oCAAoC;QACpC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,GAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACtC,GAAG,CAAC,KAAK,GAAI,GAAW,CAAC,KAAK,CAAA;YAC9B,IAAI,EAAE,CAAA;QACR,CAAC,CAAC,CAAA;QAEF,iBAAiB;QACjB,GAAG,CAAC,GAAG,CAAC,YAAY,EAAE,gBAAW,CAAC,CAAA;IACpC,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,MAAM,KAAK,CAAA;IACb,CAAC;AACH,CAAC"}

package/dist/server/middlewares/isLoggedMiddleware.d.ts

@@ -0,0 +1,15 @@
+/**
+ * 检查用户登录中间件
+ * 检查用户是否已登录 (jwtUser 存在)
+ * 如果未登录则返回 401 Unauthorized
+ */
+import { Response, NextFunction } from 'express';
+/**
+ * 检查用户是否已登录
+ * @param req Express Request 对象，应包含 jwtUser（由 loadJwtUserMiddleware 注入）
+ * @param res Express Response 对象
+ * @param next 下一个中间件或路由处理器
+ */
+export declare function isLoggedMiddleware(req: any, res: Response, next: NextFunction): void;
+export default isLoggedMiddleware;
+//# sourceMappingURL=isLoggedMiddleware.d.ts.map

package/dist/server/middlewares/isLoggedMiddleware.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"isLoggedMiddleware.d.ts","sourceRoot":"","sources":["../../../server/middlewares/isLoggedMiddleware.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAEhD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,GAAG,IAAI,CAkBpF;AAED,eAAe,kBAAkB,CAAA"}

package/dist/server/middlewares/isLoggedMiddleware.js

@@ -0,0 +1,35 @@
+"use strict";
+/**
+ * 检查用户登录中间件
+ * 检查用户是否已登录 (jwtUser 存在)
+ * 如果未登录则返回 401 Unauthorized
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isLoggedMiddleware = isLoggedMiddleware;
+/**
+ * 检查用户是否已登录
+ * @param req Express Request 对象，应包含 jwtUser（由 loadJwtUserMiddleware 注入）
+ * @param res Express Response 对象
+ * @param next 下一个中间件或路由处理器
+ */
+function isLoggedMiddleware(req, res, next) {
+    try {
+        // 检查用户是否存在
+        if (!req.jwtUser || !req.jwtUser.userId) {
+            res.status(401).json({
+                code: 'UNAUTHORIZED',
+                message: '需要登录'
+            });
+            return;
+        }
+        next();
+    }
+    catch (error) {
+        res.status(500).json({
+            code: 'SERVER_ERROR',
+            message: '服务器内部错误'
+        });
+    }
+}
+exports.default = isLoggedMiddleware;
+//# sourceMappingURL=isLoggedMiddleware.js.map

package/dist/server/middlewares/isLoggedMiddleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"isLoggedMiddleware.js","sourceRoot":"","sources":["../../../server/middlewares/isLoggedMiddleware.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;AAUH,gDAkBC;AAxBD;;;;;GAKG;AACH,SAAgB,kBAAkB,CAAC,GAAQ,EAAE,GAAa,EAAE,IAAkB;IAC5E,IAAI,CAAC;QACH,WAAW;QACX,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YACxC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACnB,IAAI,EAAE,cAAc;gBACpB,OAAO,EAAE,MAAM;aAChB,CAAC,CAAA;YACF,OAAM;QACR,CAAC;QAED,IAAI,EAAE,CAAA;IACR,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YACnB,IAAI,EAAE,cAAc;YACpB,OAAO,EAAE,SAAS;SACnB,CAAC,CAAA;IACJ,CAAC;AACH,CAAC;AAED,kBAAe,kBAAkB,CAAA"}

package/dist/server/middlewares/isVerifiedMiddleware.d.ts

@@ -0,0 +1,16 @@
+/**
+ * 验证用户身份中间件
+ * 检查用户是否已认证 (isVerified === 1)
+ * 如果未认证则返回 403 Forbidden
+ */
+import { Response, NextFunction } from 'express';
+/**
+ * 检查用户是否已通过身份认证
+ * 通常需要与 isLoggedMiddleware 一起使用
+ * @param req Express Request 对象，应包含 jwtUser（由 loadJwtUserMiddleware 注入）
+ * @param res Express Response 对象
+ * @param next 下一个中间件或路由处理器
+ */
+export declare function isVerifiedMiddleware(req: any, res: Response, next: NextFunction): void;
+export default isVerifiedMiddleware;
+//# sourceMappingURL=isVerifiedMiddleware.d.ts.map

package/dist/server/middlewares/isVerifiedMiddleware.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"isVerifiedMiddleware.d.ts","sourceRoot":"","sources":["../../../server/middlewares/isVerifiedMiddleware.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAEhD;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,GAAG,IAAI,CA2BtF;AAED,eAAe,oBAAoB,CAAA"}

package/dist/server/middlewares/isVerifiedMiddleware.js

@@ -0,0 +1,44 @@
+"use strict";
+/**
+ * 验证用户身份中间件
+ * 检查用户是否已认证 (isVerified === 1)
+ * 如果未认证则返回 403 Forbidden
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isVerifiedMiddleware = isVerifiedMiddleware;
+/**
+ * 检查用户是否已通过身份认证
+ * 通常需要与 isLoggedMiddleware 一起使用
+ * @param req Express Request 对象，应包含 jwtUser（由 loadJwtUserMiddleware 注入）
+ * @param res Express Response 对象
+ * @param next 下一个中间件或路由处理器
+ */
+function isVerifiedMiddleware(req, res, next) {
+    try {
+        // 检查用户是否存在
+        if (!req.jwtUser) {
+            res.status(401).json({
+                code: 'UNAUTHORIZED',
+                message: '未认证，请先登录'
+            });
+            return;
+        }
+        // 检查用户是否已认证
+        if (req.jwtUser.isVerified !== 1) {
+            res.status(403).json({
+                code: 'FORBIDDEN',
+                message: '没有权限访问，用户未通过认证'
+            });
+            return;
+        }
+        next();
+    }
+    catch (error) {
+        res.status(500).json({
+            code: 'SERVER_ERROR',
+            message: '服务器内部错误'
+        });
+    }
+}
+exports.default = isVerifiedMiddleware;
+//# sourceMappingURL=isVerifiedMiddleware.js.map

package/dist/server/middlewares/isVerifiedMiddleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"isVerifiedMiddleware.js","sourceRoot":"","sources":["../../../server/middlewares/isVerifiedMiddleware.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;AAWH,oDA2BC;AAlCD;;;;;;GAMG;AACH,SAAgB,oBAAoB,CAAC,GAAQ,EAAE,GAAa,EAAE,IAAkB;IAC9E,IAAI,CAAC;QACH,WAAW;QACX,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;YACjB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACnB,IAAI,EAAE,cAAc;gBACpB,OAAO,EAAE,UAAU;aACpB,CAAC,CAAA;YACF,OAAM;QACR,CAAC;QAED,YAAY;QACZ,IAAI,GAAG,CAAC,OAAO,CAAC,UAAU,KAAK,CAAC,EAAE,CAAC;YACjC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACnB,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,gBAAgB;aAC1B,CAAC,CAAA;YACF,OAAM;QACR,CAAC;QAED,IAAI,EAAE,CAAA;IACR,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YACnB,IAAI,EAAE,cAAc;YACpB,OAAO,EAAE,SAAS;SACnB,CAAC,CAAA;IACJ,CAAC;AACH,CAAC;AAED,kBAAe,oBAAoB,CAAA"}

package/dist/server/utils/authUtils.d.ts

@@ -7,9 +7,15 @@
  */
 export declare function parseCookies(cookieHeader?: string): Record<string, string>;
 /**
- * 从 Cookie 或 Authorization Header 获取 Access Token
+ * 从 Cookie 中获取 Access Token
  * @param req Express 请求对象
  * @returns Token 字符串，如果未找到返回 null
  */
 export declare function getAccessToken(req: any): string | null;
+/**
+ * 从 Cookie 中获取 Refresh Token
+ * @param req Express 请求对象
+ * @returns Refresh Token 或 null
+ */
+export declare function getRefreshToken(req: any): string | null;
 //# sourceMappingURL=authUtils.d.ts.map

package/dist/server/utils/authUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"authUtils.d.ts","sourceRoot":"","sources":["../../../server/utils/authUtils.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;GAEG;AACH,wBAAgB,YAAY,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAgB1E;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,GAAG,IAAI,CAgBtD"}
+{"version":3,"file":"authUtils.d.ts","sourceRoot":"","sources":["../../../server/utils/authUtils.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;GAEG;AACH,wBAAgB,YAAY,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAgB1E;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,GAAG,IAAI,CAItD;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,GAAG,IAAI,CAIvD"}

package/dist/server/utils/authUtils.js

@@ -6,6 +6,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseCookies = parseCookies;
 exports.getAccessToken = getAccessToken;
+exports.getRefreshToken = getRefreshToken;
 /**
  * 解析 Cookie 字符串
  */
@@ -24,23 +25,23 @@ function parseCookies(cookieHeader) {
     return cookies;
 }
 /**
- * 从 Cookie 或 Authorization Header 获取 Access Token
+ * 从 Cookie 中获取 Access Token
  * @param req Express 请求对象
  * @returns Token 字符串，如果未找到返回 null
  */
 function getAccessToken(req) {
-    // 优先从 Cookie 获取（用于浏览器）
+    // 仅从 Cookie 获取 access_token
     const cookies = parseCookies(req.headers?.cookie);
-    if (cookies.access_token) {
-        return cookies.access_token;
-    }
-    // 其次从 Authorization Header 获取（用于 API 调用）
-    if (req.headers?.authorization) {
-        const authHeader = req.headers.authorization;
-        if (authHeader.startsWith('Bearer ')) {
-            return authHeader.substring(7);
-        }
-    }
-    return null;
+    return cookies.access_token || null;
+}
+/**
+ * 从 Cookie 中获取 Refresh Token
+ * @param req Express 请求对象
+ * @returns Refresh Token 或 null
+ */
+function getRefreshToken(req) {
+    // 从 Cookie 获取 refresh_token
+    const cookies = parseCookies(req.headers?.cookie);
+    return cookies.refresh_token || null;
 }
 //# sourceMappingURL=authUtils.js.map

package/dist/server/utils/authUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"authUtils.js","sourceRoot":"","sources":["../../../server/utils/authUtils.ts"],"names":[],"mappings":";AAAA;;;GAGG;;AAKH,oCAgBC;AAOD,wCAgBC;AA1CD;;GAEG;AACH,SAAgB,YAAY,CAAC,YAAqB;IAChD,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,EAAE,CAAA;IACX,CAAC;IAED,MAAM,OAAO,GAA2B,EAAE,CAAA;IAE1C,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QACvC,MAAM,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACzC,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAA;QACnC,IAAI,IAAI,IAAI,KAAK,EAAE,CAAC;YAClB,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAA;QAClD,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,OAAO,CAAA;AAChB,CAAC;AAED;;;;GAIG;AACH,SAAgB,cAAc,CAAC,GAAQ;IACrC,uBAAuB;IACvB,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IACjD,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;QACzB,OAAO,OAAO,CAAC,YAAY,CAAA;IAC7B,CAAC;IAED,yCAAyC;IACzC,IAAI,GAAG,CAAC,OAAO,EAAE,aAAa,EAAE,CAAC;QAC/B,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,CAAA;QAC5C,IAAI,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YACrC,OAAO,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;QAChC,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC"}
+{"version":3,"file":"authUtils.js","sourceRoot":"","sources":["../../../server/utils/authUtils.ts"],"names":[],"mappings":";AAAA;;;GAGG;;AAKH,oCAgBC;AAOD,wCAIC;AAOD,0CAIC;AAzCD;;GAEG;AACH,SAAgB,YAAY,CAAC,YAAqB;IAChD,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,EAAE,CAAA;IACX,CAAC;IAED,MAAM,OAAO,GAA2B,EAAE,CAAA;IAE1C,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QACvC,MAAM,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACzC,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAA;QACnC,IAAI,IAAI,IAAI,KAAK,EAAE,CAAC;YAClB,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAA;QAClD,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,OAAO,CAAA;AAChB,CAAC;AAED;;;;GAIG;AACH,SAAgB,cAAc,CAAC,GAAQ;IACrC,4BAA4B;IAC5B,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IACjD,OAAO,OAAO,CAAC,YAAY,IAAI,IAAI,CAAA;AACrC,CAAC;AAED;;;;GAIG;AACH,SAAgB,eAAe,CAAC,GAAQ;IACtC,4BAA4B;IAC5B,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IACjD,OAAO,OAAO,CAAC,aAAa,IAAI,IAAI,CAAA;AACtC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sumor",
-  "version": "3.0.5",
+  "version": "3.0.7",
   "description": "Sumor OAuth framework",
   "main": "dist/server/index.js",
   "types": "dist/server/index.d.ts",

package/dist/server/controllers/getAuthorizeUrlController.d.ts

@@ -1,9 +0,0 @@
-/**
- * 获取授权 URL 控制器
- * GET /api/oauth/authorize
- *
- * 返回跳转到 ITS 的授权 URL，前端将用此 URL 进行重定向
- */
-import { Request, Response } from 'express';
-export default function getAuthorizeUrlController(req: Request, res: Response): void;
-//# sourceMappingURL=getAuthorizeUrlController.d.ts.map

package/dist/server/controllers/getAuthorizeUrlController.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getAuthorizeUrlController.d.ts","sourceRoot":"","sources":["../../../server/controllers/getAuthorizeUrlController.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAgE3C,MAAM,CAAC,OAAO,UAAU,yBAAyB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,QAgB5E"}

package/dist/server/controllers/getAuthorizeUrlController.js

@@ -1,80 +0,0 @@
-"use strict";
-/**
- * 获取授权 URL 控制器
- * GET /api/oauth/authorize
- *
- * 返回跳转到 ITS 的授权 URL，前端将用此 URL 进行重定向
- */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = getAuthorizeUrlController;
-const crypto_1 = __importDefault(require("crypto"));
-const config_1 = require("../utils/config");
-/**
- * 生成 PKCE code_challenge 和 code_verifier
- */
-function generateCodeChallenge() {
-    const codeVerifier = crypto_1.default.randomBytes(32).toString('hex');
-    const challenge = crypto_1.default
-        .createHash('sha256')
-        .update(codeVerifier)
-        .digest('base64')
-        .replace(/\+/g, '-')
-        .replace(/\//g, '_')
-        .replace(/=/g, '');
-    return {
-        codeChallenge: challenge,
-        codeVerifier: codeVerifier
-    };
-}
-/**
- * 生成随机 state 参数
- */
-function generateState() {
-    return crypto_1.default.randomBytes(32).toString('hex');
-}
-/**
- * 生成授权 URL
- * RFC 6749 §4.1.1，支持 PKCE（RFC 7636）用于增强安全性
- */
-function generateAuthorizationUrl() {
-    const oauthConfig = (0, config_1.getOAuthConfig)();
-    const { codeChallenge, codeVerifier } = generateCodeChallenge();
-    const uri = oauthConfig.redirectUri;
-    if (!uri || uri.trim() === '') {
-        throw new Error('redirectUri 为空或未配置，无法生成授权 URL');
-    }
-    const randomState = generateState();
-    const encryptedState = Buffer.from(codeVerifier).toString('base64') + ':' + randomState;
-    const params = new URLSearchParams({
-        clientKey: oauthConfig.clientKey,
-        redirectUri: uri,
-        responseType: 'code',
-        scope: 'profile',
-        state: encryptedState,
-        codeChallenge: codeChallenge,
-        codeChallengeMethod: 'S256'
-    });
-    const authUrl = `${oauthConfig.baseUrl}/authorize?${params.toString()}`;
-    return authUrl;
-}
-function getAuthorizeUrlController(req, res) {
-    try {
-        const authUrl = generateAuthorizationUrl();
-        res.json({
-            code: 'OK',
-            data: {
-                authUrl
-            }
-        });
-    }
-    catch (error) {
-        res.status(500).json({
-            code: 'ERROR',
-            message: error.message
-        });
-    }
-}
-//# sourceMappingURL=getAuthorizeUrlController.js.map

package/dist/server/controllers/getAuthorizeUrlController.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getAuthorizeUrlController.js","sourceRoot":"","sources":["../../../server/controllers/getAuthorizeUrlController.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;AAmEH,4CAgBC;AAjFD,oDAA2B;AAE3B,4CAAgD;AAEhD;;GAEG;AACH,SAAS,qBAAqB;IAI5B,MAAM,YAAY,GAAG,gBAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IAC3D,MAAM,SAAS,GAAG,gBAAM;SACrB,UAAU,CAAC,QAAQ,CAAC;SACpB,MAAM,CAAC,YAAY,CAAC;SACpB,MAAM,CAAC,QAAQ,CAAC;SAChB,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;SACnB,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;SACnB,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;IAEpB,OAAO;QACL,aAAa,EAAE,SAAS;QACxB,YAAY,EAAE,YAAY;KAC3B,CAAA;AACH,CAAC;AAED;;GAEG;AACH,SAAS,aAAa;IACpB,OAAO,gBAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;AAC/C,CAAC;AAED;;;GAGG;AACH,SAAS,wBAAwB;IAC/B,MAAM,WAAW,GAAG,IAAA,uBAAc,GAAE,CAAA;IACpC,MAAM,EAAE,aAAa,EAAE,YAAY,EAAE,GAAG,qBAAqB,EAAE,CAAA;IAE/D,MAAM,GAAG,GAAG,WAAW,CAAC,WAAW,CAAA;IAEnC,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;IAClD,CAAC;IAED,MAAM,WAAW,GAAG,aAAa,EAAE,CAAA;IACnC,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,GAAG,GAAG,WAAW,CAAA;IAEvF,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC;QACjC,SAAS,EAAE,WAAW,CAAC,SAAS;QAChC,WAAW,EAAE,GAAG;QAChB,YAAY,EAAE,MAAM;QACpB,KAAK,EAAE,SAAS;QAChB,KAAK,EAAE,cAAc;QACrB,aAAa,EAAE,aAAa;QAC5B,mBAAmB,EAAE,MAAM;KAC5B,CAAC,CAAA;IAEF,MAAM,OAAO,GAAG,GAAG,WAAW,CAAC,OAAO,cAAc,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAA;IAEvE,OAAO,OAAO,CAAA;AAChB,CAAC;AAED,SAAwB,yBAAyB,CAAC,GAAY,EAAE,GAAa;IAC3E,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,wBAAwB,EAAE,CAAA;QAE1C,GAAG,CAAC,IAAI,CAAC;YACP,IAAI,EAAE,IAAI;YACV,IAAI,EAAE;gBACJ,OAAO;aACR;SACF,CAAC,CAAA;IACJ,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YACnB,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,KAAK,CAAC,OAAO;SACvB,CAAC,CAAA;IACJ,CAAC;AACH,CAAC"}