xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

登录：修改登录逻辑，游客时间交给客户端判断

Browse Source
This commit is contained in:
luying
2021-03-13 17:17:36 +08:00
parent 482d4fa628
commit d4564664dd
1 changed files with 5 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
web-server/app/service/Auth.ts
View File

@@ -30,7 +30,6 @@ export default class Auth extends Service {
const ctx = this.ctx;
let user = await UserModel.findUserByToken(token);
let loginType = 1;
if (!user) {
if(isGuest) {
@@ -38,22 +37,11 @@ export default class Auth extends Service {
const token = ctx.service.utils.generateStr(256);
let lastGuest = await UserModel.getLastDeviceGuest(deviceId, token);
if(lastGuest) {
let guestTime = lastGuest.guestTime;
if(guestTime > GUEST_MAX_TIME) {
loginType = 3;
return this.ctx.service.utils.resResult(STATUS.SUCCESS, {
canLogin: true,
loginType
});
} else {
let param = this.getReturnParam(lastGuest);
return this.ctx.service.utils.resResult(STATUS.SUCCESS, {
canLogin: true, // 未设置密码等于未创建账号
loginType,
...param
});
}
let param = this.getReturnParam(lastGuest);
return this.ctx.service.utils.resResult(STATUS.SUCCESS, {
canLogin: true, // 未设置密码等于未创建账号
...param
});
} else {
user = await UserModel.createUser(isGuest, tel, token, platform, pkgName, serverType, deviceId);
@@ -61,7 +49,6 @@ export default class Auth extends Service {
return this.ctx.service.utils.resResult(STATUS.SUCCESS, {
canLogin: true,
loginType,
...param
});
}
@@ -77,14 +64,10 @@ export default class Auth extends Service {
user = await UserModel.updateToken(user.tel, token, deviceId);
let param = this.getReturnParam(user);
if(param.isGuest && param.guestTime > GUEST_MAX_TIME) {
loginType = 2;
}
let canLogin = true;
if(!user.isGuest && !user.hasSetPw) canLogin = false;
return this.ctx.service.utils.resResult(STATUS.SUCCESS, {
canLogin, // 未设置密码等于未创建账号
loginType,
...param
});
}