From 822fed8f7aaefb69df8f596bf605f5a7e32ac7b4 Mon Sep 17 00:00:00 2001 From: Shane Melton Date: Tue, 27 Sep 2022 11:49:28 -0700 Subject: [PATCH] [EC-19] Move SSO Identifier to Org SSO endpoint (#2184) * [EC-19] Move SSO identifier to Org SSO config endpoint * [EC-19] Add Jira tech debt issue reference --- src/Api/Controllers/OrganizationsController.cs | 2 ++ .../Models/Request/Organizations/OrganizationSsoRequestModel.cs | 2 ++ .../Request/Organizations/OrganizationUpdateRequestModel.cs | 1 + .../Response/Organizations/OrganizationSsoResponseModel.cs | 2 ++ 4 files changed, 7 insertions(+) diff --git a/src/Api/Controllers/OrganizationsController.cs b/src/Api/Controllers/OrganizationsController.cs index f38b0dbc3c..c02fa28906 100644 --- a/src/Api/Controllers/OrganizationsController.cs +++ b/src/Api/Controllers/OrganizationsController.cs @@ -706,8 +706,10 @@ public class OrganizationsController : Controller var ssoConfig = await _ssoConfigRepository.GetByOrganizationIdAsync(id); ssoConfig = ssoConfig == null ? model.ToSsoConfig(id) : model.ToSsoConfig(ssoConfig); + organization.Identifier = model.Identifier; await _ssoConfigService.SaveAsync(ssoConfig, organization); + await _organizationService.UpdateAsync(organization); return new OrganizationSsoResponseModel(organization, _globalSettings, ssoConfig); } diff --git a/src/Api/Models/Request/Organizations/OrganizationSsoRequestModel.cs b/src/Api/Models/Request/Organizations/OrganizationSsoRequestModel.cs index 47594703d0..6dd23aa7c6 100644 --- a/src/Api/Models/Request/Organizations/OrganizationSsoRequestModel.cs +++ b/src/Api/Models/Request/Organizations/OrganizationSsoRequestModel.cs @@ -16,6 +16,8 @@ public class OrganizationSsoRequestModel { [Required] public bool Enabled { get; set; } + [StringLength(50)] + public string Identifier { get; set; } [Required] public SsoConfigurationDataRequest Data { get; set; } diff --git a/src/Api/Models/Request/Organizations/OrganizationUpdateRequestModel.cs b/src/Api/Models/Request/Organizations/OrganizationUpdateRequestModel.cs index f67016bce1..0bd16767d2 100644 --- a/src/Api/Models/Request/Organizations/OrganizationUpdateRequestModel.cs +++ b/src/Api/Models/Request/Organizations/OrganizationUpdateRequestModel.cs @@ -12,6 +12,7 @@ public class OrganizationUpdateRequestModel public string Name { get; set; } [StringLength(50)] public string BusinessName { get; set; } + [Obsolete("2022-08-03 Moved to Org SSO request model, left for backwards compatability. Remove with EC-489.")] [StringLength(50)] public string Identifier { get; set; } [EmailAddress] diff --git a/src/Api/Models/Response/Organizations/OrganizationSsoResponseModel.cs b/src/Api/Models/Response/Organizations/OrganizationSsoResponseModel.cs index cd7e6c2665..897eaa54cc 100644 --- a/src/Api/Models/Response/Organizations/OrganizationSsoResponseModel.cs +++ b/src/Api/Models/Response/Organizations/OrganizationSsoResponseModel.cs @@ -16,10 +16,12 @@ public class OrganizationSsoResponseModel : ResponseModel Data = config.GetData(); } + Identifier = organization.Identifier; Urls = new SsoUrls(organization.Id.ToString(), globalSettings); } public bool Enabled { get; set; } + public string Identifier { get; set; } public SsoConfigurationData Data { get; set; } public SsoUrls Urls { get; set; } }