From 67c4e34669e26ab3cfe1df52f93bd8ad85536949 Mon Sep 17 00:00:00 2001 From: Gbubemi Smith Date: Fri, 21 Oct 2022 15:03:14 -0400 Subject: [PATCH] [SG-699] No Error Displayed if SSO Required (#3865) * Introduced error handling when SSO authentication is required * Fixed comments from PR --- .../accounts/login/login-with-device.component.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/apps/web/src/app/accounts/login/login-with-device.component.ts b/apps/web/src/app/accounts/login/login-with-device.component.ts index 4fce6c05eb..3556f7d78e 100644 --- a/apps/web/src/app/accounts/login/login-with-device.component.ts +++ b/apps/web/src/app/accounts/login/login-with-device.component.ts @@ -14,13 +14,14 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { ValidationService } from "@bitwarden/common/abstractions/validation.service"; import { AuthRequestType } from "@bitwarden/common/enums/authRequestType"; import { Utils } from "@bitwarden/common/misc/utils"; import { PasswordlessLogInCredentials } from "@bitwarden/common/models/domain/log-in-credentials"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { PasswordlessCreateAuthRequest } from "@bitwarden/common/models/request/passwordless-create-auth.request"; import { AuthRequestResponse } from "@bitwarden/common/models/response/auth-request.response"; +import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; @Component({ selector: "app-login-with-device", @@ -53,11 +54,11 @@ export class LoginWithDeviceComponent private apiService: ApiService, private authService: AuthService, private logService: LogService, - private stateService: StateService, environmentService: EnvironmentService, i18nService: I18nService, platformUtilsService: PlatformUtilsService, - private anonymousHubService: AnonymousHubService + private anonymousHubService: AnonymousHubService, + private validationService: ValidationService ) { super(environmentService, i18nService, platformUtilsService); @@ -146,6 +147,12 @@ export class LoginWithDeviceComponent } } } catch (error) { + if (error instanceof ErrorResponse) { + this.router.navigate(["/login"]); + this.validationService.showError(error); + return; + } + this.logService.error(error); } }