aboutsummaryrefslogtreecommitdiff
path: root/Timeline/ClientApp/src/app/user/user-login-success
diff options
context:
space:
mode:
author杨宇千 <crupest@outlook.com>2019-03-14 16:51:46 +0800
committerGitHub <noreply@github.com>2019-03-14 16:51:46 +0800
commitc65db42c9ce3532509bbd0b4abfc500692cfe4d3 (patch)
tree9e6a91af019e14fa3fb40e03bf84507a98a33d4c /Timeline/ClientApp/src/app/user/user-login-success
parent4535d1fd30eb02b3fe60718235a0725e3b30049e (diff)
parent7b929db4fcfa34acc82885b75a573e6e4bd40465 (diff)
downloadtimeline-c65db42c9ce3532509bbd0b4abfc500692cfe4d3.tar.gz
timeline-c65db42c9ce3532509bbd0b4abfc500692cfe4d3.tar.bz2
timeline-c65db42c9ce3532509bbd0b4abfc500692cfe4d3.zip
Merge pull request #13 from crupest/auth-guard
Add auth guard.
Diffstat (limited to 'Timeline/ClientApp/src/app/user/user-login-success')
-rw-r--r--Timeline/ClientApp/src/app/user/user-login-success/user-login-success.component.spec.ts4
-rw-r--r--Timeline/ClientApp/src/app/user/user-login-success/user-login-success.component.ts2
2 files changed, 2 insertions, 4 deletions
diff --git a/Timeline/ClientApp/src/app/user/user-login-success/user-login-success.component.spec.ts b/Timeline/ClientApp/src/app/user/user-login-success/user-login-success.component.spec.ts
index 1efbb5c7..ff253add 100644
--- a/Timeline/ClientApp/src/app/user/user-login-success/user-login-success.component.spec.ts
+++ b/Timeline/ClientApp/src/app/user/user-login-success/user-login-success.component.spec.ts
@@ -60,10 +60,8 @@ describe('UserLoginSuccessComponent', () => {
});
it('login success message should display well', () => {
- mockActivatedRoute.pushSnapshotWithParamMap({ reason: 'login' });
-
+ mockActivatedRoute.pushSnapshotWithParamMap({ fromlogin: 'true' });
fixture.detectChanges();
-
expect((fixture.debugElement.query(By.css('p.login-success-message')))).toBeTruthy();
});
});
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';
}
}