From 28e98905a0cbddde651ce2eaa1503b1f55da0121 Mon Sep 17 00:00:00 2001 From: Thomas Rittson Date: Mon, 20 Dec 2021 11:31:09 +1000 Subject: [PATCH] Move api KC logic into entry method --- common/src/services/auth.service.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/common/src/services/auth.service.ts b/common/src/services/auth.service.ts index 9a731ef8..3c733d38 100644 --- a/common/src/services/auth.service.ts +++ b/common/src/services/auth.service.ts @@ -197,6 +197,12 @@ export class AuthService implements AuthServiceAbstraction { return result; } + const tokenResponse = response as IdentityTokenResponse; + if (tokenResponse.apiUseKeyConnector) { + const keyConnectorUrl = this.environmentService.getKeyConnectorUrl(); + await this.keyConnectorService.getAndSetKey(keyConnectorUrl); + } + await this.completeLogIn(); return result; } @@ -286,11 +292,6 @@ export class AuthService implements AuthServiceAbstraction { if (this.setCryptoKeys) { if (!this.isNewSsoUser(code, tokenResponse.key)) { - if (tokenResponse.apiUseKeyConnector) { - const keyConnectorUrl = this.environmentService.getKeyConnectorUrl(); - await this.keyConnectorService.getAndSetKey(keyConnectorUrl); - } - await this.cryptoService.setEncKey(tokenResponse.key); // User doesn't have a key pair yet (old account), let's generate one for them