Oak-Team
/
oak-general-business
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 38 Wiki Activity

登录修改

This commit is contained in:
lxy 2024-08-05 16:02:03 +08:00
parent b006071133
commit 892dd2080b
25 changed files with 190 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
es/aspects/AspectDict.d.ts vendored
View File

@ -247,5 +247,8 @@ export type AspectDict<ED extends EntityDict> = {
systemId: string;
origin: EntityDict['smsTemplate']['Schema']['origin'];
}, context: BackendRuntimeContext<ED>) => Promise<void>;
getApplicationPassports: (params: {
applicationId: string;
}, context: BackendRuntimeContext<ED>) => Promise<EntityDict['applicationPassport']['Schema'][]>;
};
export default AspectDict;

5
es/aspects/applicationPassport.d.ts vendored Normal file
View File

@ -0,0 +1,5 @@
import { EntityDict } from "../oak-app-domain";
import { BRC } from '../types/RuntimeCxt';
export declare function getApplicationPassports<ED extends EntityDict>(params: {
applicationId: string;
}, context: BRC<ED>): Promise<Partial<ED["applicationPassport"]["Schema"]>[]>;

21
es/aspects/applicationPassport.js Normal file
View File

@ -0,0 +1,21 @@
export async function getApplicationPassports(params, context) {
const { applicationId } = params;
const closeRoot = context.openRootMode();
const applicationPassports = await context.select('applicationPassport', {
data: {
id: 1,
passportId: 1,
passport: {
id: 1,
type: 1,
config: 1,
},
isDefault: 1,
},
filter: {
applicationId,
}
}, {});
closeRoot();
return applicationPassports;
}

2
es/aspects/index.d.ts vendored
View File

@ -13,6 +13,7 @@ import { getCurrentMenu, getMenu, createMenu, createConditionalMenu, deleteCondi
import { createTag, getTags, editTag, deleteTag, syncTag, oneKeySync } from './wechatPublicTag';
import { getTagUsers, batchtagging, batchuntagging, getUserTags, getUsers, tagging, syncToLocale, syncToWechat } from './userWechatPublicTag';
import { wechatMpJump } from './wechatMpJump';
import { getApplicationPassports } from './applicationPassport';
declare const aspectDict: {
mergeUser: typeof mergeUser;
switchTo: typeof switchTo;
@ -69,6 +70,7 @@ declare const aspectDict: {
syncToWechat: typeof syncToWechat;
wechatMpJump: typeof wechatMpJump;
syncSmsTemplate: typeof syncSmsTemplate;
getApplicationPassports: typeof getApplicationPassports;
};
export default aspectDict;
export { AspectDict } from './AspectDict';

4
es/aspects/index.js
View File

@ -13,6 +13,7 @@ import { getCurrentMenu, getMenu, createMenu, createConditionalMenu, deleteCondi
import { createTag, getTags, editTag, deleteTag, syncTag, oneKeySync, } from './wechatPublicTag';
import { getTagUsers, batchtagging, batchuntagging, getUserTags, getUsers, tagging, syncToLocale, syncToWechat, } from './userWechatPublicTag';
import { wechatMpJump, } from './wechatMpJump';
import { getApplicationPassports } from './applicationPassport';
const aspectDict = {
mergeUser,
switchTo,
@ -68,6 +69,7 @@ const aspectDict = {
syncToLocale,
syncToWechat,
wechatMpJump,
syncSmsTemplate
syncSmsTemplate,
getApplicationPassports,
};
export default aspectDict;

6
es/aspects/token.js
View File

@ -875,7 +875,7 @@ async function loginFromWechatEnv(code, env, context, wechatLoginId) {
// wechatUser存在直接登录
if (wechatUser) {
const tokenValue = await setUpTokenAndUser(env, context, 'wechatUser', wechatUser.id, undefined, wechatUser.user);
await updateWechatLogin({ successed: true });
await updateWechatLogin({ userId: wechatUser.userId, successed: true });
return tokenValue;
}
else {
@ -1376,8 +1376,8 @@ export async function refreshToken(params, context) {
// 只有server模式去刷新token
// 'development' | 'production' | 'staging'
const intervals = {
development: 7200 * 1000, // 2小时
staging: 600 * 1000, // 十分钟
development: 7200 * 1000,
staging: 600 * 1000,
production: 600 * 1000, // 十分钟
};
const application = context.getApplication();

27
es/aspects/wechatLogin.js
View File

@ -19,12 +19,25 @@ export async function createWechatLogin(params, context) {
userId,
});
}
await context.operate('wechatLogin', {
id: await generateNewIdAsync(),
action: 'create',
data: createData,
}, {
dontCollect: true,
});
if (type === 'login') {
const closeRoot = context.openRootMode();
await context.operate('wechatLogin', {
id: await generateNewIdAsync(),
action: 'create',
data: createData,
}, {
dontCollect: true,
});
closeRoot();
}
else {
await context.operate('wechatLogin', {
id: await generateNewIdAsync(),
action: 'create',
data: createData,
}, {
dontCollect: true,
});
}
return id;
}

2
es/components/wechatLogin/qrCode/index.d.ts vendored
View File

@ -2,5 +2,5 @@ import { EntityDict } from '../../../oak-app-domain';
declare const _default: (props: import("oak-frontend-base").ReactComponentProps<EntityDict, keyof EntityDict, false, {
type: "login" | "bind";
url: string;
}>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
}>) => React.ReactElement;
export default _default;

4
es/components/wechatLogin/qrCode/index.js
View File

@ -63,7 +63,7 @@ export default OakComponent({
id: 1,
entity: 1,
entityId: 1,
type: 1, //类型
type: 1,
ticket: 1,
url: 1,
buffer: 1,
@ -130,7 +130,7 @@ export default OakComponent({
id: wechatLoginId,
},
});
const { successed, type } = wechatLogin;
const { successed, type } = wechatLogin || {};
this.setState({
successful: successed,
type,

2
es/triggers/wechatQrCode.js
View File

@ -176,7 +176,7 @@ const triggers = [
case 'wechatPublic': {
assert(applicationType === 'wechatPublic' &&
config.type === 'wechatPublic');
if (process.env.OAK_PLATFORM === 'web') {
if (process.env.NODE_ENV === 'development') {
Object.assign(updateData, {
ticket: 'develop环境下无法真实获取二维码数据',
url: `http://localhost:3000/wechatQrCode/scan?scene=${shrinkUuidTo32Bytes(id)}`,

3
lib/aspects/AspectDict.d.ts vendored
View File

@ -247,5 +247,8 @@ export type AspectDict<ED extends EntityDict> = {
systemId: string;
origin: EntityDict['smsTemplate']['Schema']['origin'];
}, context: BackendRuntimeContext<ED>) => Promise<void>;
getApplicationPassports: (params: {
applicationId: string;
}, context: BackendRuntimeContext<ED>) => Promise<EntityDict['applicationPassport']['Schema'][]>;
};
export default AspectDict;

5
lib/aspects/applicationPassport.d.ts vendored Normal file
View File

@ -0,0 +1,5 @@
import { EntityDict } from "../oak-app-domain";
import { BRC } from '../types/RuntimeCxt';
export declare function getApplicationPassports<ED extends EntityDict>(params: {
applicationId: string;
}, context: BRC<ED>): Promise<Partial<ED["applicationPassport"]["Schema"]>[]>;

25
lib/aspects/applicationPassport.js Normal file
View File

@ -0,0 +1,25 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.getApplicationPassports = void 0;
async function getApplicationPassports(params, context) {
const { applicationId } = params;
const closeRoot = context.openRootMode();
const applicationPassports = await context.select('applicationPassport', {
data: {
id: 1,
passportId: 1,
passport: {
id: 1,
type: 1,
config: 1,
},
isDefault: 1,
},
filter: {
applicationId,
}
}, {});
closeRoot();
return applicationPassports;
}
exports.getApplicationPassports = getApplicationPassports;

2
lib/aspects/index.d.ts vendored
View File

@ -13,6 +13,7 @@ import { getCurrentMenu, getMenu, createMenu, createConditionalMenu, deleteCondi
import { createTag, getTags, editTag, deleteTag, syncTag, oneKeySync } from './wechatPublicTag';
import { getTagUsers, batchtagging, batchuntagging, getUserTags, getUsers, tagging, syncToLocale, syncToWechat } from './userWechatPublicTag';
import { wechatMpJump } from './wechatMpJump';
import { getApplicationPassports } from './applicationPassport';
declare const aspectDict: {
mergeUser: typeof mergeUser;
switchTo: typeof switchTo;
@ -69,6 +70,7 @@ declare const aspectDict: {
syncToWechat: typeof syncToWechat;
wechatMpJump: typeof wechatMpJump;
syncSmsTemplate: typeof syncSmsTemplate;
getApplicationPassports: typeof getApplicationPassports;
};
export default aspectDict;
export { AspectDict } from './AspectDict';

4
lib/aspects/index.js
View File

@ -15,6 +15,7 @@ const wechatMenu_1 = require("./wechatMenu");
const wechatPublicTag_1 = require("./wechatPublicTag");
const userWechatPublicTag_1 = require("./userWechatPublicTag");
const wechatMpJump_1 = require("./wechatMpJump");
const applicationPassport_1 = require("./applicationPassport");
const aspectDict = {
mergeUser: user_1.mergeUser,
switchTo: token_1.switchTo,
@ -70,6 +71,7 @@ const aspectDict = {
syncToLocale: userWechatPublicTag_1.syncToLocale,
syncToWechat: userWechatPublicTag_1.syncToWechat,
wechatMpJump: wechatMpJump_1.wechatMpJump,
syncSmsTemplate: sms_1.syncSmsTemplate
syncSmsTemplate: sms_1.syncSmsTemplate,
getApplicationPassports: applicationPassport_1.getApplicationPassports,
};
exports.default = aspectDict;

6
lib/aspects/token.js
View File

@ -882,7 +882,7 @@ async function loginFromWechatEnv(code, env, context, wechatLoginId) {
// wechatUser存在直接登录
if (wechatUser) {
const tokenValue = await setUpTokenAndUser(env, context, 'wechatUser', wechatUser.id, undefined, wechatUser.user);
await updateWechatLogin({ successed: true });
await updateWechatLogin({ userId: wechatUser.userId, successed: true });
return tokenValue;
}
else {
@ -1391,8 +1391,8 @@ async function refreshToken(params, context) {
// 只有server模式去刷新token
// 'development' | 'production' | 'staging'
const intervals = {
development: 7200 * 1000, // 2小时
staging: 600 * 1000, // 十分钟
development: 7200 * 1000,
staging: 600 * 1000,
production: 600 * 1000, // 十分钟
};
const application = context.getApplication();

27
lib/aspects/wechatLogin.js
View File

@ -22,13 +22,26 @@ async function createWechatLogin(params, context) {
userId,
});
}
await context.operate('wechatLogin', {
id: await (0, uuid_1.generateNewIdAsync)(),
action: 'create',
data: createData,
}, {
dontCollect: true,
});
if (type === 'login') {
const closeRoot = context.openRootMode();
await context.operate('wechatLogin', {
id: await (0, uuid_1.generateNewIdAsync)(),
action: 'create',
data: createData,
}, {
dontCollect: true,
});
closeRoot();
}
else {
await context.operate('wechatLogin', {
id: await (0, uuid_1.generateNewIdAsync)(),
action: 'create',
data: createData,
}, {
dontCollect: true,
});
}
return id;
}
exports.createWechatLogin = createWechatLogin;

2
lib/triggers/wechatQrCode.js
View File

@ -179,7 +179,7 @@ const triggers = [
case 'wechatPublic': {
(0, assert_1.assert)(applicationType === 'wechatPublic' &&
config.type === 'wechatPublic');
if (process.env.OAK_PLATFORM === 'web') {
if (process.env.NODE_ENV === 'development') {
Object.assign(updateData, {
ticket: 'develop环境下无法真实获取二维码数据',
url: `http://localhost:3000/wechatQrCode/scan?scene=${(0, uuid_1.shrinkUuidTo32Bytes)(id)}`,

6
src/aspects/AspectDict.ts
View File

@ -403,6 +403,12 @@ export type AspectDict<ED extends EntityDict> = {
},
context: BackendRuntimeContext<ED>
) => Promise<void>;
getApplicationPassports: (
params: {
applicationId: string;
},
context: BackendRuntimeContext<ED>
) => Promise<EntityDict['applicationPassport']['Schema'][]>
};
export default AspectDict;

33
src/aspects/applicationPassport.ts Normal file
View File

@ -0,0 +1,33 @@
import { EntityDict } from "../oak-app-domain";
import { BRC } from '../types/RuntimeCxt';
export async function getApplicationPassports<ED extends EntityDict>(
params: {
applicationId: string;
},
context: BRC<ED>
) {
const { applicationId } = params;
const closeRoot = context.openRootMode();
const applicationPassports = await context.select(
'applicationPassport',
{
data: {
id: 1,
passportId: 1,
passport: {
id: 1,
type: 1,
config: 1,
},
isDefault: 1,
},
filter: {
applicationId,
}
},
{});
closeRoot();
return applicationPassports;
}

4
src/aspects/index.ts
View File

@ -60,6 +60,7 @@ import {
import {
wechatMpJump,
} from './wechatMpJump';
import { getApplicationPassports } from './applicationPassport';
const aspectDict = {
mergeUser,
@ -116,7 +117,8 @@ const aspectDict = {
syncToLocale,
syncToWechat,
wechatMpJump,
syncSmsTemplate
syncSmsTemplate,
getApplicationPassports,
};
export default aspectDict;

2
src/aspects/token.ts
View File

@ -1204,7 +1204,7 @@ async function loginFromWechatEnv<ED extends EntityDict>(
undefined,
wechatUser.user!
);
await updateWechatLogin({ successed: true });
await updateWechatLogin({ userId: wechatUser.userId, successed: true });
return tokenValue;
} else {
// 创建user和wechatUser(绑定并登录)

26
src/aspects/wechatLogin.ts
View File

@ -30,12 +30,24 @@ export async function createWechatLogin<ED extends EntityDict>(
userId,
})
}
await context.operate('wechatLogin', {
id: await generateNewIdAsync(),
action: 'create',
data: createData as createWechatLoginData,
}, {
dontCollect: true,
});
if (type === 'login') {
const closeRoot = context.openRootMode();
await context.operate('wechatLogin', {
id: await generateNewIdAsync(),
action: 'create',
data: createData as createWechatLoginData,
}, {
dontCollect: true,
});
closeRoot();
} else {
await context.operate('wechatLogin', {
id: await generateNewIdAsync(),
action: 'create',
data: createData as createWechatLoginData,
}, {
dontCollect: true,
});
}
return id;
}

2
src/components/wechatLogin/qrCode/index.ts
View File

@ -145,7 +145,7 @@ export default OakComponent({
id: wechatLoginId,
},
});
const { successed, type } = wechatLogin;
const { successed, type } = wechatLogin || {};
this.setState(
{
successful: successed,

9
src/triggers/wechatQrCode.ts
View File

@ -148,10 +148,9 @@ const triggers: Trigger<EntityDict, 'wechatQrCode', BRC<EntityDict>>[] = [
appId = self.id;
if ((self!.config as WechatMpConfig).qrCodePrefix) {
appType = 'wechatMpDomainUrl';
url = `${
(self!.config as WechatMpConfig)
.qrCodePrefix
}/${shrinkUuidTo32Bytes(id)}`;
url = `${(self!.config as WechatMpConfig)
.qrCodePrefix
}/${shrinkUuidTo32Bytes(id)}`;
} else {
appType = 'wechatMpWxaCode';
}
@ -227,7 +226,7 @@ const triggers: Trigger<EntityDict, 'wechatQrCode', BRC<EntityDict>>[] = [
applicationType === 'wechatPublic' &&
config!.type === 'wechatPublic'
);
if (process.env.OAK_PLATFORM === 'web') {
if (process.env.NODE_ENV === 'development') {
Object.assign(updateData, {
ticket: 'develop环境下无法真实获取二维码数据',
url: `http://localhost:3000/wechatQrCode/scan?scene=${shrinkUuidTo32Bytes(id)}`,