diff --git a/libs/common/src/admin-console/models/data/organization.data.spec.ts b/libs/common/src/admin-console/models/data/organization.data.spec.ts index 7d66e7bc0d5..a6a2caa49c7 100644 --- a/libs/common/src/admin-console/models/data/organization.data.spec.ts +++ b/libs/common/src/admin-console/models/data/organization.data.spec.ts @@ -58,6 +58,7 @@ describe("ORGANIZATIONS state", () => { familySponsorshipLastSyncDate: new Date(), userIsManagedByOrganization: false, useRiskInsights: false, + useOrganizationDomains: false, useAdminSponsoredFamilies: false, isAdminInitiated: false, }, diff --git a/libs/common/src/admin-console/models/data/organization.data.ts b/libs/common/src/admin-console/models/data/organization.data.ts index e0783957117..16f6f90f347 100644 --- a/libs/common/src/admin-console/models/data/organization.data.ts +++ b/libs/common/src/admin-console/models/data/organization.data.ts @@ -21,6 +21,7 @@ export class OrganizationData { use2fa: boolean; useApi: boolean; useSso: boolean; + useOrganizationDomains: boolean; useKeyConnector: boolean; useScim: boolean; useCustomPermissions: boolean; @@ -87,6 +88,7 @@ export class OrganizationData { this.use2fa = response.use2fa; this.useApi = response.useApi; this.useSso = response.useSso; + this.useOrganizationDomains = response.useOrganizationDomains; this.useKeyConnector = response.useKeyConnector; this.useScim = response.useScim; this.useCustomPermissions = response.useCustomPermissions; diff --git a/libs/common/src/admin-console/models/domain/organization.ts b/libs/common/src/admin-console/models/domain/organization.ts index 1864d56649b..f8de5293913 100644 --- a/libs/common/src/admin-console/models/domain/organization.ts +++ b/libs/common/src/admin-console/models/domain/organization.ts @@ -28,6 +28,7 @@ export class Organization { use2fa: boolean; useApi: boolean; useSso: boolean; + useOrganizationDomains: boolean; useKeyConnector: boolean; useScim: boolean; useCustomPermissions: boolean; @@ -111,6 +112,7 @@ export class Organization { this.use2fa = obj.use2fa; this.useApi = obj.useApi; this.useSso = obj.useSso; + this.useOrganizationDomains = obj.useOrganizationDomains; this.useKeyConnector = obj.useKeyConnector; this.useScim = obj.useScim; this.useCustomPermissions = obj.useCustomPermissions; @@ -281,7 +283,7 @@ export class Organization { } get canManageDomainVerification() { - return (this.isAdmin || this.permissions.manageSso) && this.useSso; + return (this.isAdmin || this.permissions.manageSso) && this.useOrganizationDomains; } get canManageScim() { diff --git a/libs/common/src/admin-console/models/response/profile-organization.response.ts b/libs/common/src/admin-console/models/response/profile-organization.response.ts index 3a86c764eb8..6e451ce9808 100644 --- a/libs/common/src/admin-console/models/response/profile-organization.response.ts +++ b/libs/common/src/admin-console/models/response/profile-organization.response.ts @@ -14,6 +14,7 @@ export class ProfileOrganizationResponse extends BaseResponse { use2fa: boolean; useApi: boolean; useSso: boolean; + useOrganizationDomains: boolean; useKeyConnector: boolean; useScim: boolean; useCustomPermissions: boolean; @@ -70,6 +71,7 @@ export class ProfileOrganizationResponse extends BaseResponse { this.use2fa = this.getResponseProperty("Use2fa"); this.useApi = this.getResponseProperty("UseApi"); this.useSso = this.getResponseProperty("UseSso"); + this.useOrganizationDomains = this.getResponseProperty("UseOrganizationDomains"); this.useKeyConnector = this.getResponseProperty("UseKeyConnector") ?? false; this.useScim = this.getResponseProperty("UseScim") ?? false; this.useCustomPermissions = this.getResponseProperty("UseCustomPermissions") ?? false; diff --git a/libs/common/src/key-management/key-connector/services/key-connector.service.spec.ts b/libs/common/src/key-management/key-connector/services/key-connector.service.spec.ts index b88ada56129..eff3fc7f47c 100644 --- a/libs/common/src/key-management/key-connector/services/key-connector.service.spec.ts +++ b/libs/common/src/key-management/key-connector/services/key-connector.service.spec.ts @@ -315,6 +315,7 @@ describe("KeyConnectorService", () => { name: "TEST_KEY_CONNECTOR_ORG", usePolicies: true, useSso: true, + useOrganizationDomains: true, useKeyConnector: usesKeyConnector, useScim: true, useGroups: true,