From d4564664dd38dd82abce04e0af8c8e69c1cfbd3c Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Sat, 13 Mar 2021 17:17:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=EF=BC=9A=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=80=BB=E8=BE=91=EF=BC=8C=E6=B8=B8=E5=AE=A2?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=BA=A4=E7=BB=99=E5=AE=A2=E6=88=B7=E7=AB=AF?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web-server/app/service/Auth.ts | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/web-server/app/service/Auth.ts b/web-server/app/service/Auth.ts
index 61637c47f..7c1e7d428 100644
--- a/web-server/app/service/Auth.ts
+++ b/web-server/app/service/Auth.ts
@@ -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
             });
         }