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

修改登录逻辑

This commit is contained in:
wenjiarui 2023-08-07 14:59:55 +08:00
parent f27a18bf3c
commit eb833e0ab2
2 changed files with 15 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
lib/aspects/token.js
View File

@ -923,14 +923,7 @@ function loginByWechat(params, context) {
nickname: 1,
userState: 1,
refId: 1,
userRole$user: {
$entity: 'userRole',
data: {
id: 1,
userId: 1,
roleId: 1,
},
},
isRoot: 1,
},
},
filter: {
@ -1020,14 +1013,7 @@ function loginFromWechatEnv(code, env, context, wechatLoginId) {
nickname: 1,
userState: 1,
refId: 1,
userRole$user: {
$entity: 'userRole',
data: {
id: 1,
userId: 1,
roleId: 1,
},
},
isRoot: 1,
},
},
filter: {
@ -1075,14 +1061,7 @@ function loginFromWechatEnv(code, env, context, wechatLoginId) {
nickname: 1,
userState: 1,
refId: 1,
userRole$user: {
$entity: 'userRole',
data: {
id: 1,
userId: 1,
roleId: 1,
},
},
isRoot: 1,
},
},
filter: {
@ -1104,14 +1083,7 @@ function loginFromWechatEnv(code, env, context, wechatLoginId) {
nickname: 1,
userState: 1,
refId: 1,
userRole$user: {
$entity: 'userRole',
data: {
id: 1,
userId: 1,
roleId: 1,
},
},
isRoot: 1,
},
},
filter: {
@ -1316,15 +1288,18 @@ exports.loginWechat = loginWechat;
function loginWechatMp(_a, context) {
var code = _a.code, env = _a.env;
return tslib_1.__awaiter(this, void 0, void 0, function () {
var tokenId;
var closeRootMode, tokenId;
return tslib_1.__generator(this, function (_b) {
switch (_b.label) {
case 0: return [4 /*yield*/, loginFromWechatEnv(code, env, context)];
case 0:
closeRootMode = context.openRootMode();
return [4 /*yield*/, loginFromWechatEnv(code, env, context)];
case 1:
tokenId = _b.sent();
return [4 /*yield*/, loadTokenInfo(tokenId, context)];
case 2:
_b.sent();
closeRootMode();
return [2 /*return*/, tokenId];
}
});

39
src/aspects/token.ts
View File

@ -963,14 +963,7 @@ export async function loginByWechat<
nickname: 1,
userState: 1,
refId: 1,
userRole$user: {
$entity: 'userRole',
data: {
id: 1,
userId: 1,
roleId: 1,
},
},
isRoot: 1,
},
},
filter: {
@ -1076,14 +1069,7 @@ async function loginFromWechatEnv<
nickname: 1,
userState: 1,
refId: 1,
userRole$user: {
$entity: 'userRole',
data: {
id: 1,
userId: 1,
roleId: 1,
},
},
isRoot: 1,
},
},
filter: {
@ -1125,14 +1111,7 @@ async function loginFromWechatEnv<
nickname: 1,
userState: 1,
refId: 1,
userRole$user: {
$entity: 'userRole',
data: {
id: 1,
userId: 1,
roleId: 1,
},
},
isRoot: 1,
},
},
filter: {
@ -1159,14 +1138,7 @@ async function loginFromWechatEnv<
nickname: 1,
userState: 1,
refId: 1,
userRole$user: {
$entity: 'userRole',
data: {
id: 1,
userId: 1,
roleId: 1,
},
},
isRoot: 1,
},
},
filter: {
@ -1406,9 +1378,10 @@ export async function loginWechatMp<
},
context: Cxt
): Promise<string> {
const closeRootMode = context.openRootMode();
const tokenId = await loginFromWechatEnv<ED, Cxt>(code, env, context);
await loadTokenInfo<ED, Cxt>(tokenId, context);
closeRootMode();
return tokenId;
}