From e1b1efeea2074254017909423ad628508508b736 Mon Sep 17 00:00:00 2001 From: Oscar Hinton Date: Wed, 17 Nov 2021 11:42:24 +0100 Subject: [PATCH] Add useKeyConnector flag (#551) --- common/src/models/api/ssoConfigApi.ts | 4 ++-- common/src/models/data/organizationData.ts | 6 ++++-- common/src/models/domain/organization.ts | 6 ++++-- common/src/models/response/profileOrganizationResponse.ts | 6 ++++-- .../models/response/profileProviderOrganizationResponse.ts | 2 +- common/src/services/keyConnector.service.ts | 2 +- 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/common/src/models/api/ssoConfigApi.ts b/common/src/models/api/ssoConfigApi.ts index 9c260116bc..c846524afb 100644 --- a/common/src/models/api/ssoConfigApi.ts +++ b/common/src/models/api/ssoConfigApi.ts @@ -37,7 +37,7 @@ enum Saml2SigningBehavior { export class SsoConfigApi extends BaseResponse { configType: SsoType; - useKeyConnector: boolean; + keyConnectorEnabled: boolean; keyConnectorUrl: string; // OpenId @@ -81,7 +81,7 @@ export class SsoConfigApi extends BaseResponse { this.configType = this.getResponseProperty('ConfigType'); - this.useKeyConnector = this.getResponseProperty('UseKeyConnector'); + this.keyConnectorEnabled = this.getResponseProperty('KeyConnectorEnabled'); this.keyConnectorUrl = this.getResponseProperty('KeyConnectorUrl'); this.authority = this.getResponseProperty('Authority'); diff --git a/common/src/models/data/organizationData.ts b/common/src/models/data/organizationData.ts index ed44822e8c..6c7a42b111 100644 --- a/common/src/models/data/organizationData.ts +++ b/common/src/models/data/organizationData.ts @@ -18,6 +18,7 @@ export class OrganizationData { use2fa: boolean; useApi: boolean; useSso: boolean; + useKeyConnector: boolean; useResetPassword: boolean; selfHost: boolean; usersGetPremium: boolean; @@ -33,7 +34,7 @@ export class OrganizationData { providerId: string; providerName: string; isProviderUser: boolean; - usesKeyConnector: boolean; + keyConnectorEnabled: boolean; keyConnectorUrl: string; constructor(response: ProfileOrganizationResponse) { @@ -50,6 +51,7 @@ export class OrganizationData { this.use2fa = response.use2fa; this.useApi = response.useApi; this.useSso = response.useSso; + this.useKeyConnector = response.useKeyConnector; this.useResetPassword = response.useResetPassword; this.selfHost = response.selfHost; this.usersGetPremium = response.usersGetPremium; @@ -64,7 +66,7 @@ export class OrganizationData { this.hasPublicAndPrivateKeys = response.hasPublicAndPrivateKeys; this.providerId = response.providerId; this.providerName = response.providerName; - this.usesKeyConnector = response.usesKeyConnector; + this.keyConnectorEnabled = response.keyConnectorEnabled; this.keyConnectorUrl = response.keyConnectorUrl; } } diff --git a/common/src/models/domain/organization.ts b/common/src/models/domain/organization.ts index 1ad1d6f763..4a51241d3b 100644 --- a/common/src/models/domain/organization.ts +++ b/common/src/models/domain/organization.ts @@ -19,6 +19,7 @@ export class Organization { use2fa: boolean; useApi: boolean; useSso: boolean; + useKeyConnector: boolean; useResetPassword: boolean; selfHost: boolean; usersGetPremium: boolean; @@ -34,7 +35,7 @@ export class Organization { providerId: string; providerName: string; isProviderUser: boolean; - usesKeyConnector: boolean; + keyConnectorEnabled: boolean; keyConnectorUrl: string; constructor(obj?: OrganizationData) { @@ -55,6 +56,7 @@ export class Organization { this.use2fa = obj.use2fa; this.useApi = obj.useApi; this.useSso = obj.useSso; + this.useKeyConnector = obj.useKeyConnector; this.useResetPassword = obj.useResetPassword; this.selfHost = obj.selfHost; this.usersGetPremium = obj.usersGetPremium; @@ -70,7 +72,7 @@ export class Organization { this.providerId = obj.providerId; this.providerName = obj.providerName; this.isProviderUser = obj.isProviderUser; - this.usesKeyConnector = obj.usesKeyConnector; + this.keyConnectorEnabled = obj.keyConnectorEnabled; this.keyConnectorUrl = obj.keyConnectorUrl; } diff --git a/common/src/models/response/profileOrganizationResponse.ts b/common/src/models/response/profileOrganizationResponse.ts index d4c77792af..8b71e799b6 100644 --- a/common/src/models/response/profileOrganizationResponse.ts +++ b/common/src/models/response/profileOrganizationResponse.ts @@ -15,6 +15,7 @@ export class ProfileOrganizationResponse extends BaseResponse { use2fa: boolean; useApi: boolean; useSso: boolean; + useKeyConnector: boolean; useResetPassword: boolean; selfHost: boolean; usersGetPremium: boolean; @@ -33,7 +34,7 @@ export class ProfileOrganizationResponse extends BaseResponse { userId: string; providerId: string; providerName: string; - usesKeyConnector: boolean; + keyConnectorEnabled: boolean; keyConnectorUrl: string; constructor(response: any) { @@ -48,6 +49,7 @@ export class ProfileOrganizationResponse extends BaseResponse { this.use2fa = this.getResponseProperty('Use2fa'); this.useApi = this.getResponseProperty('UseApi'); this.useSso = this.getResponseProperty('UseSso'); + this.useKeyConnector = this.getResponseProperty('UseKeyConnector') ?? false; this.useResetPassword = this.getResponseProperty('UseResetPassword'); this.selfHost = this.getResponseProperty('SelfHost'); this.usersGetPremium = this.getResponseProperty('UsersGetPremium'); @@ -66,7 +68,7 @@ export class ProfileOrganizationResponse extends BaseResponse { this.userId = this.getResponseProperty('UserId'); this.providerId = this.getResponseProperty('ProviderId'); this.providerName = this.getResponseProperty('ProviderName'); - this.usesKeyConnector = this.getResponseProperty('UsesKeyConnector') ?? false; + this.keyConnectorEnabled = this.getResponseProperty('KeyConnectorEnabled') ?? false; this.keyConnectorUrl = this.getResponseProperty('KeyConnectorUrl'); } } diff --git a/common/src/models/response/profileProviderOrganizationResponse.ts b/common/src/models/response/profileProviderOrganizationResponse.ts index dcf24561d8..d34b78d0c3 100644 --- a/common/src/models/response/profileProviderOrganizationResponse.ts +++ b/common/src/models/response/profileProviderOrganizationResponse.ts @@ -3,6 +3,6 @@ import { ProfileOrganizationResponse } from './profileOrganizationResponse'; export class ProfileProviderOrganizationResponse extends ProfileOrganizationResponse { constructor(response: any) { super(response); - this.usesKeyConnector = false; + this.keyConnectorEnabled = false; } } diff --git a/common/src/services/keyConnector.service.ts b/common/src/services/keyConnector.service.ts index d0b8e04007..d597469f39 100644 --- a/common/src/services/keyConnector.service.ts +++ b/common/src/services/keyConnector.service.ts @@ -72,7 +72,7 @@ export class KeyConnectorService implements KeyConnectorServiceAbstraction { async getManagingOrganization() { const orgs = await this.userService.getAllOrganizations(); return orgs.find(o => - o.usesKeyConnector && + o.keyConnectorEnabled && o.type !== OrganizationUserType.Admin && o.type !== OrganizationUserType.Owner && !o.isProviderUser);