From 21348fff43f58ac18f960c5416fbc11728dcb41e Mon Sep 17 00:00:00 2001 From: wkj <278599135@.com> Date: Fri, 12 Dec 2025 15:47:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=201=E3=80=81=E6=9B=B4=E6=96=B0wechatUser?= =?UTF-8?q?=E7=9A=84refreshToken=E6=9C=AA=E5=8A=A0=E4=B8=8Afilter=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=EF=BC=9B2=E3=80=81=E8=8E=B7=E5=8F=96=E5=85=AC?= =?UTF-8?q?=E4=BC=97=E5=8F=B7=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=EF=BC=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=8BwechatUser=E7=9A=84nickname=E5=92=8C?= =?UTF-8?q?avatar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- es/aspects/token.js | 14 ++++++++++++++ es/checkers/index.d.ts | 2 +- es/components/config/style/platform/index.d.ts | 2 +- es/components/config/upsert/index.d.ts | 2 +- es/components/extraFile/commit/index.d.ts | 6 +++--- .../userEntityGrant/claim/ubPicker/index.d.ts | 4 ++-- .../userEntityGrant/upsert/index.d.ts | 4 ++-- es/components/wechatLogin/qrCode/index.d.ts | 2 +- es/triggers/index.d.ts | 2 +- lib/aspects/token.js | 14 ++++++++++++++ lib/checkers/index.d.ts | 2 +- lib/triggers/index.d.ts | 2 +- lib/triggers/toDo.d.ts | 2 +- src/aspects/token.ts | 18 ++++++++++++++++++ 14 files changed, 61 insertions(+), 15 deletions(-) diff --git a/es/aspects/token.js b/es/aspects/token.js index abd3cd727..c9fbfcead 100644 --- a/es/aspects/token.js +++ b/es/aspects/token.js @@ -1549,10 +1549,24 @@ async function tryRefreshWechatPublicUserInfo(wechatUserId, context) { atExpiredAt: ate2, scope: s2, }, + filter: { + id: wechatUserId, + } }, { dontCollect: true }); accessToken = at2; } const { nickname, gender, avatar } = await wechatInstance.getUserInfo(accessToken, openId); + await context.operate('wechatUser', { + id: await generateNewIdAsync(), + action: 'update', + data: { + nickname, + avatar, + }, + filter: { + id: wechatUserId, + } + }, { dontCollect: true }); await setUserInfoFromWechat(user, { nickname, gender: gender, avatar }, context); } export async function refreshWechatPublicUserInfo({}, context) { diff --git a/es/checkers/index.d.ts b/es/checkers/index.d.ts index d5207458d..8a9ee5aa3 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/components/config/style/platform/index.d.ts b/es/components/config/style/platform/index.d.ts index d8601ae9e..8835a6c5f 100644 --- a/es/components/config/style/platform/index.d.ts +++ b/es/components/config/style/platform/index.d.ts @@ -1,7 +1,7 @@ import { Style } from '../../../../types/Style'; declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; diff --git a/es/components/config/upsert/index.d.ts b/es/components/config/upsert/index.d.ts index 9bf014f88..a4b61c5c2 100644 --- a/es/components/config/upsert/index.d.ts +++ b/es/components/config/upsert/index.d.ts @@ -1,7 +1,7 @@ import { Config } from '../../../types/Config'; declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; diff --git a/es/components/extraFile/commit/index.d.ts b/es/components/extraFile/commit/index.d.ts index 046fea6c9..9be27cc59 100644 --- a/es/components/extraFile/commit/index.d.ts +++ b/es/components/extraFile/commit/index.d.ts @@ -17,17 +17,17 @@ declare const _default: ) => unknown) | undefined; - type?: "reset" | "submit" | "button" | undefined; + type?: "submit" | "button" | "reset" | undefined; shape?: "default" | "rounded" | "rectangular" | undefined; children?: import("react").ReactNode; - } & Pick & import("react").ButtonHTMLAttributes, "id" | "onMouseUp" | "onMouseDown" | "onTouchStart" | "onTouchEnd"> & { + } & Pick & import("react").ButtonHTMLAttributes, "id" | "onMouseDown" | "onMouseUp" | "onTouchEnd" | "onTouchStart"> & { className?: string | undefined; style?: (import("react").CSSProperties & Partial>) | undefined; tabIndex?: number | undefined; diff --git a/es/components/userEntityGrant/claim/ubPicker/index.d.ts b/es/components/userEntityGrant/claim/ubPicker/index.d.ts index baeab2b34..3ff190b84 100644 --- a/es/components/userEntityGrant/claim/ubPicker/index.d.ts +++ b/es/components/userEntityGrant/claim/ubPicker/index.d.ts @@ -4,8 +4,8 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< entity: keyof EntityDict; entityFilter: any; relationIds: string[]; - rule: "all" | "single" | "free"; - ruleOnRow: "all" | "single" | "free"; + rule: "single" | "all" | "free"; + ruleOnRow: "single" | "all" | "free"; onPickRelations: (ids: string[]) => void; onPickRows: (ids: string[]) => void; pickedRowIds: string[] | undefined; diff --git a/es/components/userEntityGrant/upsert/index.d.ts b/es/components/userEntityGrant/upsert/index.d.ts index e2f62ec19..0268e541f 100644 --- a/es/components/userEntityGrant/upsert/index.d.ts +++ b/es/components/userEntityGrant/upsert/index.d.ts @@ -11,7 +11,7 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< claimUrl: string; qrCodeType: QrCodeType; multiple: boolean; - rule: "all" | "single" | "free"; - ruleOnRow: "all" | "single" | "free"; + rule: "single" | "all" | "free"; + ruleOnRow: "single" | "all" | "free"; }>) => React.ReactElement; export default _default; diff --git a/es/components/wechatLogin/qrCode/index.d.ts b/es/components/wechatLogin/qrCode/index.d.ts index 21f928111..db7fcdc9b 100644 --- a/es/components/wechatLogin/qrCode/index.d.ts +++ b/es/components/wechatLogin/qrCode/index.d.ts @@ -1,6 +1,6 @@ import { EntityDict } from '../../../oak-app-domain'; declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; diff --git a/es/triggers/index.d.ts b/es/triggers/index.d.ts index 5e0cf60ac..59a0230fc 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/lib/aspects/token.js b/lib/aspects/token.js index 601a0e834..de47cd58d 100644 --- a/lib/aspects/token.js +++ b/lib/aspects/token.js @@ -1562,10 +1562,24 @@ async function tryRefreshWechatPublicUserInfo(wechatUserId, context) { atExpiredAt: ate2, scope: s2, }, + filter: { + id: wechatUserId, + } }, { dontCollect: true }); accessToken = at2; } const { nickname, gender, avatar } = await wechatInstance.getUserInfo(accessToken, openId); + await context.operate('wechatUser', { + id: await (0, uuid_1.generateNewIdAsync)(), + action: 'update', + data: { + nickname, + avatar, + }, + filter: { + id: wechatUserId, + } + }, { dontCollect: true }); await setUserInfoFromWechat(user, { nickname, gender: gender, avatar }, context); } async function refreshWechatPublicUserInfo({}, context) { diff --git a/lib/checkers/index.d.ts b/lib/checkers/index.d.ts index d5207458d..8a9ee5aa3 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/triggers/index.d.ts b/lib/triggers/index.d.ts index 5e0cf60ac..59a0230fc 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 1d9bc2ce2..e5be399e1 100644 --- a/lib/triggers/toDo.d.ts +++ b/lib/triggers/toDo.d.ts @@ -14,7 +14,7 @@ export declare function createToDo; +}, userIds?: string[]): Promise<1 | 0>; /** * 完成todo例程，当在entity对象上进行action操作时（操作条件是filter），将对应的todo完成 * 必须在entity的action的后trigger中调用 diff --git a/src/aspects/token.ts b/src/aspects/token.ts index e9dc66d90..4b66e8ca5 100644 --- a/src/aspects/token.ts +++ b/src/aspects/token.ts @@ -1994,6 +1994,9 @@ async function tryRefreshWechatPublicUserInfo(wechatUserI atExpiredAt: ate2, scope: s2, }, + filter: { + id: wechatUserId!, + } }, { dontCollect: true } ); @@ -2004,6 +2007,21 @@ async function tryRefreshWechatPublicUserInfo(wechatUserI accessToken!, openId! ); + await context.operate( + 'wechatUser', + { + id: await generateNewIdAsync(), + action: 'update', + data: { + nickname, + avatar, + }, + filter: { + id: wechatUserId!, + } + }, + { dontCollect: true } + ); await setUserInfoFromWechat( user!, { nickname, gender: gender as 'male', avatar },