bitwarden/jslib
1
0
Fork 0
mirror of https://github.com/bitwarden/jslib synced 2025-12-06 00:03:29 +00:00
Code Issues Releases Wiki Activity

[EC-178] Logout on Key Connector error (#816)

Browse Source
This commit is contained in:
Thomas Rittson
2022-05-26 06:18:14 +10:00
committed by GitHub
parent cc751e0287
commit a6fe5c7900
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
angular/src/components/sso.component.ts
View File

@@ -218,11 +218,13 @@ export class SsoComponent {
} }
} catch (e) { } catch (e) {
this.logService.error(e); this.logService.error(e);
if (e.message === "Unable to reach key connector") {
// TODO: Key Connector Service should pass this error message to the logout callback instead of displaying here
if (e.message === "Key Connector error") {
this.platformUtilsService.showToast( this.platformUtilsService.showToast(
"error", "error",
null, null,
this.i18nService.t("ssoKeyConnectorUnavailable") this.i18nService.t("ssoKeyConnectorError")
); );
} }
} }

1
angular/src/services/jslib-services.module.ts
View File

@@ -399,6 +399,7 @@ export const SYSTEM_LANGUAGE = new InjectionToken<string>("SYSTEM_LANGUAGE");
LogService, LogService,
OrganizationServiceAbstraction, OrganizationServiceAbstraction,
CryptoFunctionServiceAbstraction, CryptoFunctionServiceAbstraction,
LOGOUT_CALLBACK,
], ],
}, },
{ {

18
common/src/services/keyConnector.service.ts
View File

@@ -22,7 +22,8 @@ export class KeyConnectorService implements KeyConnectorServiceAbstraction {
private tokenService: TokenService, private tokenService: TokenService,
private logService: LogService, private logService: LogService,
private organizationService: OrganizationService, private organizationService: OrganizationService,
private cryptoFunctionService: CryptoFunctionService private cryptoFunctionService: CryptoFunctionService,
private logoutCallback: (expired: boolean, userId?: string) => void
) {} ) {}
setUsesKeyConnector(usesKeyConnector: boolean) { setUsesKeyConnector(usesKeyConnector: boolean) {
@@ -52,7 +53,7 @@ export class KeyConnectorService implements KeyConnectorServiceAbstraction {
keyConnectorRequest keyConnectorRequest
); );
} catch (e) { } catch (e) {
throw new Error("Unable to reach key connector"); this.handleKeyConnectorError(e);
} }
await this.apiService.postConvertToKeyConnector(); await this.apiService.postConvertToKeyConnector();
@@ -65,8 +66,7 @@ export class KeyConnectorService implements KeyConnectorServiceAbstraction {
const k = new SymmetricCryptoKey(keyArr); const k = new SymmetricCryptoKey(keyArr);
await this.cryptoService.setKey(k); await this.cryptoService.setKey(k);
} catch (e) { } catch (e) {
this.logService.error(e); this.handleKeyConnectorError(e);
throw new Error("Unable to reach key connector");
} }
} }
@@ -102,7 +102,7 @@ export class KeyConnectorService implements KeyConnectorServiceAbstraction {
try { try {
await this.apiService.postUserKeyToKeyConnector(keyConnectorUrl, keyConnectorRequest); await this.apiService.postUserKeyToKeyConnector(keyConnectorUrl, keyConnectorRequest);
} catch (e) { } catch (e) {
throw new Error("Unable to reach key connector"); this.handleKeyConnectorError(e);
} }
const keys = new KeysRequest(pubKey, privKey.encryptedString); const keys = new KeysRequest(pubKey, privKey.encryptedString);
@@ -131,4 +131,12 @@ export class KeyConnectorService implements KeyConnectorServiceAbstraction {
async clear() { async clear() {
await this.removeConvertAccountRequired(); await this.removeConvertAccountRequired();
} }
private handleKeyConnectorError(e: any) {
this.logService.error(e);
if (this.logoutCallback != null) {
this.logoutCallback(false);
}
throw new Error("Key Connector error");
}
} }