diff options
Diffstat (limited to 'Timeline/ClientApp/src/app/user')
5 files changed, 15 insertions, 11 deletions
diff --git a/Timeline/ClientApp/src/app/user/internal-user-service/internal-user.service.spec.ts b/Timeline/ClientApp/src/app/user/internal-user-service/internal-user.service.spec.ts index 4db28768..613a8fa6 100644 --- a/Timeline/ClientApp/src/app/user/internal-user-service/internal-user.service.spec.ts +++ b/Timeline/ClientApp/src/app/user/internal-user-service/internal-user.service.spec.ts @@ -49,7 +49,7 @@ describe('InternalUserService', () => { const httpController = TestBed.get(HttpTestingController) as HttpTestingController; httpController.expectOne((request: HttpRequest<CreateTokenRequest>) => - request.url === createTokenUrl && + request.url === createTokenUrl && request.body !== null && request.body.username === 'user' && request.body.password === 'user').flush(<CreateTokenResponse>{ token: 'test-token', @@ -73,7 +73,7 @@ describe('InternalUserService', () => { const mockToken = 'mock-token'; const tokenValidateRequestMatcher = (req: HttpRequest<ValidateTokenRequest>) => { - return req.url === validateTokenUrl && req.body.token === mockToken; + return req.url === validateTokenUrl && req.body !== null && req.body.token === mockToken; }; beforeEach(() => { diff --git a/Timeline/ClientApp/src/app/user/internal-user-service/internal-user.service.ts b/Timeline/ClientApp/src/app/user/internal-user-service/internal-user.service.ts index 91a67e5b..4767bd16 100644 --- a/Timeline/ClientApp/src/app/user/internal-user-service/internal-user.service.ts +++ b/Timeline/ClientApp/src/app/user/internal-user-service/internal-user.service.ts @@ -5,6 +5,8 @@ import { Router } from '@angular/router'; import { Observable, of, throwError, BehaviorSubject } from 'rxjs'; import { map, catchError, retry } from 'rxjs/operators'; +import { nullIfUndefined } from '../../utilities/language-untilities'; + import { AlreadyLoginError, BadCredentialsError, BadNetworkError, UnknownError } from './errors'; import { createTokenUrl, validateTokenUrl, CreateTokenRequest, @@ -23,7 +25,7 @@ export type UserLoginState = 'nologin' | 'invalidlogin' | 'success'; }) export class InternalUserService { - private token: string; + private token: string | null = null; private userInfoSubject = new BehaviorSubject<UserInfo | null>(null); get currentUserInfo(): UserInfo | null { @@ -36,7 +38,7 @@ export class InternalUserService { constructor(private httpClient: HttpClient, private router: Router) { } - userRouteNavigate(commands: any[]) { + userRouteNavigate(commands: any[] | null) { this.router.navigate([{ outlets: { user: commands @@ -57,7 +59,7 @@ export class InternalUserService { }), map(result => { if (result.isValid) { - this.userInfoSubject.next(result.userInfo); + this.userInfoSubject.next(nullIfUndefined(result.userInfo)); return <UserLoginState>'success'; } else { this.token = null; 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 498ffaa1..cf5f3643 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 @@ -11,15 +11,16 @@ export class UserDialogComponent implements OnInit, OnDestroy { constructor(private userService: InternalUserService, private router: Router) { } - @ViewChild(RouterOutlet) outlet: RouterOutlet; + @ViewChild(RouterOutlet) outlet!: RouterOutlet; isLoading = true; ngOnInit() { // this is a workaround for a bug. see https://github.com/angular/angular/issues/20694 - this.router.events.subscribe(e => { + const subscription = this.router.events.subscribe(e => { if (e instanceof ActivationStart && e.snapshot.outlet === 'user') { this.outlet.deactivate(); + subscription.unsubscribe(); } }); 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 48e331d6..22f6a41f 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 @@ -1,8 +1,9 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { UserInfo } from '../entities'; import { InternalUserService } from '../internal-user-service/internal-user.service'; +import { throwIfNullOrUndefined } from 'src/app/utilities/language-untilities'; @Component({ selector: 'app-user-login-success', @@ -13,12 +14,12 @@ export class UserLoginSuccessComponent implements OnInit { displayLoginSuccessMessage = false; - userInfo: UserInfo; + userInfo!: UserInfo; constructor(private route: ActivatedRoute, private userService: InternalUserService) { } ngOnInit() { - this.userInfo = this.userService.currentUserInfo; + this.userInfo = throwIfNullOrUndefined(this.userService.currentUserInfo, () => 'Route error. No login now!'); this.displayLoginSuccessMessage = this.route.snapshot.paramMap.get('reason') === 'login'; } } 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 79a788de..3505d50b 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 @@ -4,7 +4,7 @@ import { ActivatedRoute } from '@angular/router'; import { InternalUserService } from '../internal-user-service/internal-user.service'; -export type LoginMessage = 'nologin' | 'invalidlogin' | string; +export type LoginMessage = 'nologin' | 'invalidlogin' | string | null | undefined; @Component({ |