IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Vashchuk Nikita 2022-04-20 14:29:39 +03:00
parent 13fddb0dd2
commit bb8d0d7566
2 changed files with 15 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
web/ASC.Web.Api/Controllers/SettingsController.cs
View File

@ -3099,62 +3099,24 @@ namespace ASC.Api.Settings
/// <param name="serializeSettings">Serialized SSO settings</param>
/// <returns>SSO settings</returns>
[Create("ssov2")]
public SsoSettingsV2 SaveSsoSettingsV2FromBody([FromBody]string serializeSettings)
public SsoSettingsV2 SaveSsoSettingsV2FromBody([FromBody] SsoSettingsModel model)
{
CheckSsoPermissions();
if (string.IsNullOrEmpty(serializeSettings))
throw new ArgumentException(Resource.SsoSettingsCouldNotBeNull);
var settings = JsonSerializer.Deserialize<SsoSettingsV2>(serializeSettings);
if (settings == null)
throw new ArgumentException(Resource.SsoSettingsCouldNotBeNull);
if (string.IsNullOrWhiteSpace(settings.IdpSettings.EntityId))
throw new Exception(Resource.SsoSettingsInvalidEntityId);
if (string.IsNullOrWhiteSpace(settings.IdpSettings.SsoUrl) ||
!CheckUri(settings.IdpSettings.SsoUrl))
throw new Exception(string.Format(Resource.SsoSettingsInvalidBinding, "SSO " + settings.IdpSettings.SsoBinding));
if (!string.IsNullOrWhiteSpace(settings.IdpSettings.SloUrl) &&
!CheckUri(settings.IdpSettings.SloUrl))
throw new Exception(string.Format(Resource.SsoSettingsInvalidBinding, "SLO " + settings.IdpSettings.SloBinding));
if (string.IsNullOrWhiteSpace(settings.FieldMapping.FirstName) ||
string.IsNullOrWhiteSpace(settings.FieldMapping.LastName) ||
string.IsNullOrWhiteSpace(settings.FieldMapping.Email))
throw new Exception(Resource.SsoSettingsInvalidMapping);
if (string.IsNullOrEmpty(settings.SpLoginLabel))
{
settings.SpLoginLabel = SsoSettingsV2.SSO_SP_LOGIN_LABEL;
}
else if (settings.SpLoginLabel.Length > 100)
{
settings.SpLoginLabel = settings.SpLoginLabel.Substring(0, 100);
}
if (!SettingsManager.Save(settings))
throw new Exception(Resource.SsoSettingsCantSaveSettings);
if (!settings.EnableSso)
ConverSsoUsersToOrdinary();
var messageAction = settings.EnableSso ? MessageAction.SSOEnabled : MessageAction.SSODisabled;
MessageService.Send(messageAction);
return settings;
return SaveSsoSettingsV2(model);
}
[Create("ssov2")]
[Consumes("application/x-www-form-urlencoded")]
public SsoSettingsV2 SaveSsoSettingsV2FromForm([FromForm] string serializeSettings)
public SsoSettingsV2 SaveSsoSettingsV2FromForm([FromForm] SsoSettingsModel model)
{
return SaveSsoSettingsV2(model);
}
private SsoSettingsV2 SaveSsoSettingsV2(SsoSettingsModel model)
{
CheckSsoPermissions();
var serializeSettings = model.SerializeSettings;
if (string.IsNullOrEmpty(serializeSettings))
throw new ArgumentException(Resource.SsoSettingsCouldNotBeNull);

5
web/ASC.Web.Api/Models/SsoSettingsModel.cs Normal file
View File

@ -0,0 +1,5 @@
namespace ASC.Web.Api.Models;
public class SsoSettingsModel
{
public string SerializeSettings { get; set; }
}