#197 should not update session while syncing data

brookshi · Jun 8, 2018 · 2825a0c · 2825a0c
1 parent 905a8a1
commit 2825a0c
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/api/controllers/user_controller.ts b/api/controllers/user_controller.ts
@@ -42,13 +42,23 @@ export default class UserController extends BaseController {
 
     @POST()
     async login(ctx: Koa.Context, @BodyParam body: DtoUser): Promise<ResObject> {
-        let checkLogin = await UserService.checkUser(body.email, body.password);
+        const checkLogin = await this.tryLogin(body);
+
         if (!checkLogin.success) {
             return checkLogin;
         }
 
         SessionService.login(ctx, (<User>checkLogin.result.user).id);
 
+        return checkLogin;
+    }
+
+    private async tryLogin(user: DtoUser) {
+        let checkLogin = await UserService.checkUser(user.email, user.password);
+        if (!checkLogin.success) {
+            return checkLogin;
+        }
+
         checkLogin.message = Message.get('userLoginSuccess');
         (<User>checkLogin.result.user).password = undefined;
 
@@ -58,7 +68,7 @@ export default class UserController extends BaseController {
     @GET('/user/me')
     async getUserInfo(ctx: Koa.Context): Promise<ResObject> {
         const user = <User>(<any>ctx).session.user;
-        return await this.login(ctx, user);
+        return await this.tryLogin(user);
     }
 
     @GET('/user/logout')