From 55ee54cd4fdf1ce0484f3eeca9768c063a51a029 Mon Sep 17 00:00:00 2001 From: Rene Vergara Date: Fri, 20 May 2022 09:47:17 -0500 Subject: [PATCH] Correct PIN processing --- src/app/login/login.component.ts | 8 ++------ src/app/user.service.ts | 12 +++++++----- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/app/login/login.component.ts b/src/app/login/login.component.ts index 02c60e0..9b64a72 100644 --- a/src/app/login/login.component.ts +++ b/src/app/login/login.component.ts @@ -194,12 +194,8 @@ export class LoginComponent implements OnInit, AfterViewInit { } confirmPin(){ - if (this.user.pin === this.pinForm.value.pinValue) { - this.userService.validateUser(); - this.router.navigate(['/shop']); - } else { - this.pinError = true; - } + this.userService.validateUser(this.pinForm.value.pinValue); + this.loginCheck(); } ngOnDestroy(){ diff --git a/src/app/user.service.ts b/src/app/user.service.ts index 3b567dc..93613f3 100644 --- a/src/app/user.service.ts +++ b/src/app/user.service.ts @@ -122,12 +122,14 @@ export class UserService{ } } - validateUser(){ - var validatedUser: User = this.dataStore.user; - validatedUser.validated = true; - this.http.post<{message: string, user: User}>(this.beUrl+'api/validateuser', {user: validatedUser}, {headers: this.reqHeaders}). + validateUser(pinString:string){ + this.http.post(this.beUrl+'api/validateuser', {pin: pinString, session: this.dataStore.user.session}, {headers: this.reqHeaders, observe: 'response'}). subscribe((responseData) => { - console.log(responseData.message); + if (responseData.status == 202) { + console.log('Pin validated!'); + } else { + console.log('Wrong pin!'); + } }); }