aboutsummaryrefslogtreecommitdiff
path: root/Timeline/ClientApp/src/app/user/user-dialog/user-dialog.component.ts
diff options
context:
space:
mode:
authorcrupest <crupest@outlook.com>2019-03-09 21:36:55 +0800
committercrupest <crupest@outlook.com>2019-03-09 21:36:55 +0800
commit76300141a6411c05d585994d5f19938bfe45838e (patch)
tree90c90c6dafebab55435f032af7aff065d68c8f39 /Timeline/ClientApp/src/app/user/user-dialog/user-dialog.component.ts
parentb01ba534a0017ad8bf85ddecff7610a6de6a74e9 (diff)
downloadtimeline-76300141a6411c05d585994d5f19938bfe45838e.tar.gz
timeline-76300141a6411c05d585994d5f19938bfe45838e.tar.bz2
timeline-76300141a6411c05d585994d5f19938bfe45838e.zip
Seperate internal and public user service.
Diffstat (limited to 'Timeline/ClientApp/src/app/user/user-dialog/user-dialog.component.ts')
-rw-r--r--Timeline/ClientApp/src/app/user/user-dialog/user-dialog.component.ts10
1 files changed, 5 insertions, 5 deletions
diff --git a/Timeline/ClientApp/src/app/user/user-dialog/user-dialog.component.ts b/Timeline/ClientApp/src/app/user/user-dialog/user-dialog.component.ts
index 0edde924..498ffaa1 100644
--- a/Timeline/ClientApp/src/app/user/user-dialog/user-dialog.component.ts
+++ b/Timeline/ClientApp/src/app/user/user-dialog/user-dialog.component.ts
@@ -1,5 +1,5 @@
import { Component, OnInit, OnDestroy, ViewChild } from '@angular/core';
-import { UserService } from '../user-service/user.service';
+import { InternalUserService } from '../internal-user-service/internal-user.service';
import { RouterOutlet, Router, ActivationStart } from '@angular/router';
@Component({
@@ -9,7 +9,7 @@ import { RouterOutlet, Router, ActivationStart } from '@angular/router';
})
export class UserDialogComponent implements OnInit, OnDestroy {
- constructor(private userService: UserService, private router: Router) { }
+ constructor(private userService: InternalUserService, private router: Router) { }
@ViewChild(RouterOutlet) outlet: RouterOutlet;
@@ -24,12 +24,12 @@ export class UserDialogComponent implements OnInit, OnDestroy {
});
- this.userService.validateUserLoginState().subscribe(result => {
+ this.userService.refreshAndGetUserState().subscribe(result => {
this.isLoading = false;
- if (result.state === 'success') {
+ if (result === 'success') {
this.userService.userRouteNavigate(['success', { reason: 'already' }]);
} else {
- this.userService.userRouteNavigate(['login', { reason: result.state }]);
+ this.userService.userRouteNavigate(['login', { reason: result }]);
}
});
}