From 46cf8f8e8cf4aa4c7f772f1d8936d771f434e870 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Wed, 13 Mar 2019 22:23:35 +0800
Subject: ...

---
 Timeline/ClientApp/src/app/user/auth.guard.ts                |  2 +-
 .../user/user-login-success/user-login-success.component.ts  |  2 +-
 .../src/app/user/user-login/user-login.component.ts          | 12 +++++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'Timeline/ClientApp/src/app/user')

diff --git a/Timeline/ClientApp/src/app/user/auth.guard.ts b/Timeline/ClientApp/src/app/user/auth.guard.ts
index 64ff93c7..561a0c53 100644
--- a/Timeline/ClientApp/src/app/user/auth.guard.ts
+++ b/Timeline/ClientApp/src/app/user/auth.guard.ts
@@ -58,7 +58,7 @@ export class RequireLoginGuard extends AuthGuard {
   }
 
   onAuthFailed() {
-    this.internalUserService.userRouteNavigate(['login', { reason: 'nologin' }]);
+    this.internalUserService.userRouteNavigate(['login']);
   }
 }
 
diff --git a/Timeline/ClientApp/src/app/user/user-login-success/user-login-success.component.ts b/Timeline/ClientApp/src/app/user/user-login-success/user-login-success.component.ts
index 22f6a41f..2ae584d6 100644
--- a/Timeline/ClientApp/src/app/user/user-login-success/user-login-success.component.ts
+++ b/Timeline/ClientApp/src/app/user/user-login-success/user-login-success.component.ts
@@ -20,6 +20,6 @@ export class UserLoginSuccessComponent implements OnInit {
 
   ngOnInit() {
     this.userInfo = throwIfNullOrUndefined(this.userService.currentUserInfo, () => 'Route error. No login now!');
-    this.displayLoginSuccessMessage = this.route.snapshot.paramMap.get('reason') === 'login';
+    this.displayLoginSuccessMessage = this.route.snapshot.paramMap.get('fromlogin') === 'true';
   }
 }
diff --git a/Timeline/ClientApp/src/app/user/user-login/user-login.component.ts b/Timeline/ClientApp/src/app/user/user-login/user-login.component.ts
index 3505d50b..836202de 100644
--- a/Timeline/ClientApp/src/app/user/user-login/user-login.component.ts
+++ b/Timeline/ClientApp/src/app/user/user-login/user-login.component.ts
@@ -1,11 +1,10 @@
 import { Component, OnInit } from '@angular/core';
 import { FormGroup, FormControl } from '@angular/forms';
-import { ActivatedRoute } from '@angular/router';
 
 import { InternalUserService } from '../internal-user-service/internal-user.service';
 
-export type LoginMessage = 'nologin' | 'invalidlogin' | string | null | undefined;
 
+export type LoginMessage = 'nologin' | 'invalidlogin' | string | null | undefined;
 
 @Component({
   selector: 'app-user-login',
@@ -14,7 +13,7 @@ export type LoginMessage = 'nologin' | 'invalidlogin' | string | null | undefine
 })
 export class UserLoginComponent implements OnInit {
 
-  constructor(private route: ActivatedRoute, private userService: InternalUserService) { }
+  constructor(private userService: InternalUserService) { }
 
   message: LoginMessage;
 
@@ -24,12 +23,15 @@ export class UserLoginComponent implements OnInit {
   });
 
   ngOnInit() {
-    this.message = this.route.snapshot.paramMap.get('reason');
+    if (this.userService.currentUserInfo) {
+      throw new Error('Route error! Already login!');
+    }
+    this.message = 'nologin';
   }
 
   onLoginButtonClick() {
     this.userService.tryLogin(this.form.value).subscribe(_ => {
-      this.userService.userRouteNavigate(['success', { reason: 'login' }]);
+      this.userService.userRouteNavigate(['success', { fromlogin: 'true' }]);
     }, (error: Error) => this.message = error.message);
   }
 }
-- 
cgit v1.2.3