From ef871317a6cd8de38cf9689d4139b13b58147ccb Mon Sep 17 00:00:00 2001 From: "QCQCQC@Debian" Date: Fri, 5 Dec 2025 19:08:01 +0800 Subject: [PATCH] build --- es/aspects/token.js | 46 ++++++++++++------- es/checkers/index.d.ts | 2 +- .../Notification/_baseSchema.d.ts | 5 +- es/registry.backend.d.ts | 1 + es/registry.backend.js | 3 ++ es/triggers/index.d.ts | 2 +- es/triggers/toDo.d.ts | 2 +- es/utils/oauth/index.d.ts | 2 +- es/utils/oauth/index.js | 4 +- lib/aspects/token.js | 46 ++++++++++++------- lib/checkers/index.d.ts | 2 +- .../Notification/_baseSchema.d.ts | 5 +- lib/registry.backend.d.ts | 1 + lib/registry.backend.js | 5 +- lib/triggers/index.d.ts | 2 +- lib/triggers/toDo.d.ts | 2 +- lib/utils/oauth/index.d.ts | 2 +- lib/utils/oauth/index.js | 8 ++-- package.json | 2 +- 19 files changed, 88 insertions(+), 54 deletions(-) diff --git a/es/aspects/token.js b/es/aspects/token.js index d1c589e56..4479f9287 100644 --- a/es/aspects/token.js +++ b/es/aspects/token.js @@ -2158,9 +2158,11 @@ export async function sendCaptchaByMobile({ mobile, env, type: captchaType, }, c }, { dontCollect: true, }); - return code; + return { + code, + captchaId: id + }; }; - let code = captcha?.code; if (captcha) { const captchaDuration = process.env.NODE_ENV === 'development' ? 10 * 1000 : 60 * 1000; if (now - captcha.$$createAt$$ < captchaDuration) { @@ -2177,11 +2179,8 @@ export async function sendCaptchaByMobile({ mobile, env, type: captchaType, }, c id: captcha.id } }, {}); - code = await getCode(); - } - else { - code = await getCode(); } + const { code, captchaId } = await getCode(); if (mockSend) { closeRootMode(); return `验证码[${code}]已创建`; @@ -2199,6 +2198,16 @@ export async function sendCaptchaByMobile({ mobile, env, type: captchaType, }, c if (result.success) { return '验证码已发送'; } + await context.operate('captcha', { + id: await generateNewIdAsync(), + action: 'update', + data: { + expired: true + }, + filter: { + id: captchaId + } + }, {}); console.error('短信发送失败，原因:\n', result?.res); return '验证码发送失败'; } @@ -2279,10 +2288,6 @@ export async function sendCaptchaByEmail({ email, env, type: captchaType, }, con }); const getCode = async () => { let code; - // code = Math.floor(Math.random() * Math.random() * Math.pow(10, digit)).toString(); - // while (code.length < digit) { - // code += '0'; - // } code = Array.from({ length: digit }, () => Math.floor(Math.random() * 10)).join(''); const id = await generateNewIdAsync(); const applicationId = context.getApplication()?.id; @@ -2304,9 +2309,11 @@ export async function sendCaptchaByEmail({ email, env, type: captchaType, }, con }, { dontCollect: true, }); - return code; + return { + code, + captchaId: id + }; }; - let code = captcha?.code; if (captcha) { const captchaDuration = process.env.NODE_ENV === 'development' ? 10 * 1000 : 60 * 1000; if (now - captcha.$$createAt$$ < captchaDuration) { @@ -2323,11 +2330,8 @@ export async function sendCaptchaByEmail({ email, env, type: captchaType, }, con id: captcha.id } }, {}); - code = await getCode(); - } - else { - code = await getCode(); } + const { code, captchaId } = await getCode(); if (mockSend) { closeRootMode(); return `验证码[${code}]已创建`; @@ -2346,6 +2350,16 @@ export async function sendCaptchaByEmail({ email, env, type: captchaType, }, con if (result.success) { return '验证码已发送'; } + await context.operate('captcha', { + id: await generateNewIdAsync(), + action: 'update', + data: { + expired: true + }, + filter: { + id: captchaId + } + }, {}); console.error('邮件发送失败，原因:\n', result?.error); return '验证码发送失败'; } diff --git a/es/checkers/index.d.ts b/es/checkers/index.d.ts index f8b7683ff..d5207458d 100644 --- a/es/checkers/index.d.ts +++ b/es/checkers/index.d.ts @@ -1,2 +1,2 @@ -declare const checkers: (import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker>)[]; +declare const checkers: (import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker>)[]; export default checkers; diff --git a/es/oak-app-domain/Notification/_baseSchema.d.ts b/es/oak-app-domain/Notification/_baseSchema.d.ts index c20eeee3c..b67187071 100644 --- a/es/oak-app-domain/Notification/_baseSchema.d.ts +++ b/es/oak-app-domain/Notification/_baseSchema.d.ts @@ -2,10 +2,9 @@ import { ForeignKey } from "oak-domain/lib/types/DataType"; import { Q_DateValue, Q_NumberValue, Q_StringValue, Q_EnumValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { Action, ParticularAction, IState } from "./Action"; -import { Channel } from "../../types/Message"; import { String } from "oak-domain/lib/types/DataType"; export type OpSchema = EntityShape & { - channel: Channel; + channel: String<32>; applicationId?: ForeignKey<"application"> | null; data?: Object | null; messageSystemId: ForeignKey<"messageSystem">; @@ -22,7 +21,7 @@ export type OpFilter = { $$createAt$$: Q_DateValue; $$seq$$: Q_NumberValue; $$updateAt$$: Q_DateValue; - channel: Q_EnumValue; + channel: Q_StringValue; applicationId: Q_StringValue; data: Object; messageSystemId: Q_StringValue; diff --git a/es/registry.backend.d.ts b/es/registry.backend.d.ts index 77cb0612d..e49a5bcce 100644 --- a/es/registry.backend.d.ts +++ b/es/registry.backend.d.ts @@ -37,3 +37,4 @@ registerNotificationHandler, registerNotificationFailureHandler, } from './utils/notification'; export { registSms, } from './utils/sms'; export { registerCosBackend, } from './utils/cos/index.backend'; +export { registerOauthUserinfoHandler, } from './utils/oauth/index'; diff --git a/es/registry.backend.js b/es/registry.backend.js index 79e4e68f7..d3119e8ac 100644 --- a/es/registry.backend.js +++ b/es/registry.backend.js @@ -43,3 +43,6 @@ registSms, } from './utils/sms'; export { // 注册对象存储服务商实现(后端) registerCosBackend, } from './utils/cos/index.backend'; +export { +// 注册OAuth用户信息获取处理器 +registerOauthUserinfoHandler, } from './utils/oauth/index'; diff --git a/es/triggers/index.d.ts b/es/triggers/index.d.ts index eea4fbb57..5e0cf60ac 100644 --- a/es/triggers/index.d.ts +++ b/es/triggers/index.d.ts @@ -1,2 +1,2 @@ -declare const _default: (import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger>)[]; +declare const _default: (import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger>)[]; export default _default; diff --git a/es/triggers/toDo.d.ts b/es/triggers/toDo.d.ts index e5be399e1..1d9bc2ce2 100644 --- a/es/triggers/toDo.d.ts +++ b/es/triggers/toDo.d.ts @@ -14,7 +14,7 @@ export declare function createToDo; +}, userIds?: string[]): Promise<0 | 1>; /** * 完成todo例程，当在entity对象上进行action操作时（操作条件是filter），将对应的todo完成 * 必须在entity的action的后trigger中调用 diff --git a/es/utils/oauth/index.d.ts b/es/utils/oauth/index.d.ts index 06495e00f..51da6fd52 100644 --- a/es/utils/oauth/index.d.ts +++ b/es/utils/oauth/index.d.ts @@ -10,7 +10,7 @@ type UserID = { avatarUrl: string | null; }; export type UserInfoHandler = (data: UserInfo) => UserID | Promise; -export declare const registerUserinfoHandler: (type: EntityDict["oauthProvider"]["Schema"]["type"], handler: UserInfoHandler) => void; +export declare const registerOauthUserinfoHandler: (type: EntityDict["oauthProvider"]["Schema"]["type"], handler: UserInfoHandler) => void; export declare const processUserInfo: (type: EntityDict["oauthProvider"]["Schema"]["type"], data: UserInfo) => UserID | Promise; export declare function checkOauthTokenAvaliable(context: BackendRuntimeContext, token: string | undefined): Promise<{ error: string | null; diff --git a/es/utils/oauth/index.js b/es/utils/oauth/index.js index d4506c9a5..ecec77076 100644 --- a/es/utils/oauth/index.js +++ b/es/utils/oauth/index.js @@ -2,7 +2,7 @@ import { generateNewIdAsync } from "oak-domain/lib/utils/uuid"; import { applicationProjection, extraFileProjection } from "../../types/Projection"; import { getDefaultHandlers } from "./handler"; const handlerMap = new Map(); -export const registerUserinfoHandler = (type, handler) => { +export const registerOauthUserinfoHandler = (type, handler) => { if (handlerMap.has(type)) { throw new Error(`oauth provider type ${type} 的 userinfo 处理器已注册`); } @@ -17,7 +17,7 @@ export const processUserInfo = (type, data) => { }; const defaulthandlers = getDefaultHandlers(); Object.entries(defaulthandlers).forEach(([type, handler]) => { - registerUserinfoHandler(type, handler); + registerOauthUserinfoHandler(type, handler); }); function validateToken(token) { if (!token) { diff --git a/lib/aspects/token.js b/lib/aspects/token.js index 1ae2166eb..c0f3bf374 100644 --- a/lib/aspects/token.js +++ b/lib/aspects/token.js @@ -2184,9 +2184,11 @@ async function sendCaptchaByMobile({ mobile, env, type: captchaType, }, context) }, { dontCollect: true, }); - return code; + return { + code, + captchaId: id + }; }; - let code = captcha?.code; if (captcha) { const captchaDuration = process.env.NODE_ENV === 'development' ? 10 * 1000 : 60 * 1000; if (now - captcha.$$createAt$$ < captchaDuration) { @@ -2203,11 +2205,8 @@ async function sendCaptchaByMobile({ mobile, env, type: captchaType, }, context) id: captcha.id } }, {}); - code = await getCode(); - } - else { - code = await getCode(); } + const { code, captchaId } = await getCode(); if (mockSend) { closeRootMode(); return `验证码[${code}]已创建`; @@ -2225,6 +2224,16 @@ async function sendCaptchaByMobile({ mobile, env, type: captchaType, }, context) if (result.success) { return '验证码已发送'; } + await context.operate('captcha', { + id: await (0, uuid_1.generateNewIdAsync)(), + action: 'update', + data: { + expired: true + }, + filter: { + id: captchaId + } + }, {}); console.error('短信发送失败，原因:\n', result?.res); return '验证码发送失败'; } @@ -2305,10 +2314,6 @@ async function sendCaptchaByEmail({ email, env, type: captchaType, }, context) { }); const getCode = async () => { let code; - // code = Math.floor(Math.random() * Math.random() * Math.pow(10, digit)).toString(); - // while (code.length < digit) { - // code += '0'; - // } code = Array.from({ length: digit }, () => Math.floor(Math.random() * 10)).join(''); const id = await (0, uuid_1.generateNewIdAsync)(); const applicationId = context.getApplication()?.id; @@ -2330,9 +2335,11 @@ async function sendCaptchaByEmail({ email, env, type: captchaType, }, context) { }, { dontCollect: true, }); - return code; + return { + code, + captchaId: id + }; }; - let code = captcha?.code; if (captcha) { const captchaDuration = process.env.NODE_ENV === 'development' ? 10 * 1000 : 60 * 1000; if (now - captcha.$$createAt$$ < captchaDuration) { @@ -2349,11 +2356,8 @@ async function sendCaptchaByEmail({ email, env, type: captchaType, }, context) { id: captcha.id } }, {}); - code = await getCode(); - } - else { - code = await getCode(); } + const { code, captchaId } = await getCode(); if (mockSend) { closeRootMode(); return `验证码[${code}]已创建`; @@ -2372,6 +2376,16 @@ async function sendCaptchaByEmail({ email, env, type: captchaType, }, context) { if (result.success) { return '验证码已发送'; } + await context.operate('captcha', { + id: await (0, uuid_1.generateNewIdAsync)(), + action: 'update', + data: { + expired: true + }, + filter: { + id: captchaId + } + }, {}); console.error('邮件发送失败，原因:\n', result?.error); return '验证码发送失败'; } diff --git a/lib/checkers/index.d.ts b/lib/checkers/index.d.ts index f8b7683ff..d5207458d 100644 --- a/lib/checkers/index.d.ts +++ b/lib/checkers/index.d.ts @@ -1,2 +1,2 @@ -declare const checkers: (import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker>)[]; +declare const checkers: (import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker>)[]; export default checkers; diff --git a/lib/oak-app-domain/Notification/_baseSchema.d.ts b/lib/oak-app-domain/Notification/_baseSchema.d.ts index c20eeee3c..b67187071 100644 --- a/lib/oak-app-domain/Notification/_baseSchema.d.ts +++ b/lib/oak-app-domain/Notification/_baseSchema.d.ts @@ -2,10 +2,9 @@ import { ForeignKey } from "oak-domain/lib/types/DataType"; import { Q_DateValue, Q_NumberValue, Q_StringValue, Q_EnumValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { Action, ParticularAction, IState } from "./Action"; -import { Channel } from "../../types/Message"; import { String } from "oak-domain/lib/types/DataType"; export type OpSchema = EntityShape & { - channel: Channel; + channel: String<32>; applicationId?: ForeignKey<"application"> | null; data?: Object | null; messageSystemId: ForeignKey<"messageSystem">; @@ -22,7 +21,7 @@ export type OpFilter = { $$createAt$$: Q_DateValue; $$seq$$: Q_NumberValue; $$updateAt$$: Q_DateValue; - channel: Q_EnumValue; + channel: Q_StringValue; applicationId: Q_StringValue; data: Object; messageSystemId: Q_StringValue; diff --git a/lib/registry.backend.d.ts b/lib/registry.backend.d.ts index 77cb0612d..e49a5bcce 100644 --- a/lib/registry.backend.d.ts +++ b/lib/registry.backend.d.ts @@ -37,3 +37,4 @@ registerNotificationHandler, registerNotificationFailureHandler, } from './utils/notification'; export { registSms, } from './utils/sms'; export { registerCosBackend, } from './utils/cos/index.backend'; +export { registerOauthUserinfoHandler, } from './utils/oauth/index'; diff --git a/lib/registry.backend.js b/lib/registry.backend.js index 08f2e162c..c57070ce4 100644 --- a/lib/registry.backend.js +++ b/lib/registry.backend.js @@ -4,7 +4,7 @@ * 如需要注入，请在routine中编写注册逻辑，使用此处提供的注册方法进行注册 */ Object.defineProperty(exports, "__esModule", { value: true }); -exports.registerCosBackend = exports.registSms = exports.registerNotificationFailureHandler = exports.registerNotificationHandler = exports.registerMessageHandler = exports.registerMessageNotificationConverters = exports.registerWeChatPublicEventCallback = exports.registerMessageType = void 0; +exports.registerOauthUserinfoHandler = exports.registerCosBackend = exports.registSms = exports.registerNotificationFailureHandler = exports.registerNotificationHandler = exports.registerMessageHandler = exports.registerMessageNotificationConverters = exports.registerWeChatPublicEventCallback = exports.registerMessageType = void 0; var template_1 = require("./aspects/template"); /** * 注册消息类型 @@ -46,3 +46,6 @@ Object.defineProperty(exports, "registSms", { enumerable: true, get: function () var index_backend_1 = require("./utils/cos/index.backend"); // 注册对象存储服务商实现(后端) Object.defineProperty(exports, "registerCosBackend", { enumerable: true, get: function () { return index_backend_1.registerCosBackend; } }); +var index_1 = require("./utils/oauth/index"); +// 注册OAuth用户信息获取处理器 +Object.defineProperty(exports, "registerOauthUserinfoHandler", { enumerable: true, get: function () { return index_1.registerOauthUserinfoHandler; } }); diff --git a/lib/triggers/index.d.ts b/lib/triggers/index.d.ts index eea4fbb57..5e0cf60ac 100644 --- a/lib/triggers/index.d.ts +++ b/lib/triggers/index.d.ts @@ -1,2 +1,2 @@ -declare const _default: (import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger>)[]; +declare const _default: (import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger>)[]; export default _default; diff --git a/lib/triggers/toDo.d.ts b/lib/triggers/toDo.d.ts index e5be399e1..1d9bc2ce2 100644 --- a/lib/triggers/toDo.d.ts +++ b/lib/triggers/toDo.d.ts @@ -14,7 +14,7 @@ export declare function createToDo; +}, userIds?: string[]): Promise<0 | 1>; /** * 完成todo例程，当在entity对象上进行action操作时（操作条件是filter），将对应的todo完成 * 必须在entity的action的后trigger中调用 diff --git a/lib/utils/oauth/index.d.ts b/lib/utils/oauth/index.d.ts index 06495e00f..51da6fd52 100644 --- a/lib/utils/oauth/index.d.ts +++ b/lib/utils/oauth/index.d.ts @@ -10,7 +10,7 @@ type UserID = { avatarUrl: string | null; }; export type UserInfoHandler = (data: UserInfo) => UserID | Promise; -export declare const registerUserinfoHandler: (type: EntityDict["oauthProvider"]["Schema"]["type"], handler: UserInfoHandler) => void; +export declare const registerOauthUserinfoHandler: (type: EntityDict["oauthProvider"]["Schema"]["type"], handler: UserInfoHandler) => void; export declare const processUserInfo: (type: EntityDict["oauthProvider"]["Schema"]["type"], data: UserInfo) => UserID | Promise; export declare function checkOauthTokenAvaliable(context: BackendRuntimeContext, token: string | undefined): Promise<{ error: string | null; diff --git a/lib/utils/oauth/index.js b/lib/utils/oauth/index.js index dba5b369b..eda51e06a 100644 --- a/lib/utils/oauth/index.js +++ b/lib/utils/oauth/index.js @@ -1,18 +1,18 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.processUserInfo = exports.registerUserinfoHandler = void 0; +exports.processUserInfo = exports.registerOauthUserinfoHandler = void 0; exports.checkOauthTokenAvaliable = checkOauthTokenAvaliable; const uuid_1 = require("oak-domain/lib/utils/uuid"); const Projection_1 = require("../../types/Projection"); const handler_1 = require("./handler"); const handlerMap = new Map(); -const registerUserinfoHandler = (type, handler) => { +const registerOauthUserinfoHandler = (type, handler) => { if (handlerMap.has(type)) { throw new Error(`oauth provider type ${type} 的 userinfo 处理器已注册`); } handlerMap.set(type, handler); }; -exports.registerUserinfoHandler = registerUserinfoHandler; +exports.registerOauthUserinfoHandler = registerOauthUserinfoHandler; const processUserInfo = (type, data) => { const handler = handlerMap.get(type); if (!handler) { @@ -23,7 +23,7 @@ const processUserInfo = (type, data) => { exports.processUserInfo = processUserInfo; const defaulthandlers = (0, handler_1.getDefaultHandlers)(); Object.entries(defaulthandlers).forEach(([type, handler]) => { - (0, exports.registerUserinfoHandler)(type, handler); + (0, exports.registerOauthUserinfoHandler)(type, handler); }); function validateToken(token) { if (!token) { diff --git a/package.json b/package.json index 13c2a2f37..b28afa4eb 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "mocha": "^8.2.1", "rimraf": "^3.0.2", "svg-captcha": "^1.4.0", - "ts-node": "^10.9.1", + "ts-node": "^10.9.2", "typescript": "^5.2.2" }, "scripts": {