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

Merge branch 'develop' into feature/management

Browse Source
This commit is contained in:
Viktor Fomin 2023-07-26 14:22:38 +03:00
commit 6b4b6f53ff
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/install/docker/docspace.overcome.yml
View File

@ -199,3 +199,5 @@ services:
<<: *x-profiles-local
volumes:
- ${DATA_DIR}:/var/www/onlyoffice/Data
ports:
- 8085:80

23
web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
View File

@ -269,7 +269,7 @@ public class WhitelabelController : BaseSettingsController
public async Task<bool> SaveCompanyWhiteLabelSettingsAsync(CompanyWhiteLabelSettingsWrapper companyWhiteLabelSettingsWrapper)
{
await _permissionContext.DemandPermissionsAsync(SecutiryConstants.EditPortalSettings);
await DemandWhiteLabelPermissionAsync();
await DemandRebrandingPermissionAsync();
if (companyWhiteLabelSettingsWrapper.Settings == null)
{
@ -295,7 +295,7 @@ public class WhitelabelController : BaseSettingsController
public async Task<CompanyWhiteLabelSettings> DeleteCompanyWhiteLabelSettingsAsync()
{
await _permissionContext.DemandPermissionsAsync(SecutiryConstants.EditPortalSettings);
await DemandWhiteLabelPermissionAsync();
await DemandRebrandingPermissionAsync();
var defaultSettings = _settingsManager.GetDefault<CompanyWhiteLabelSettings>();
@ -309,7 +309,7 @@ public class WhitelabelController : BaseSettingsController
public async Task<bool> SaveAdditionalWhiteLabelSettingsAsync(AdditionalWhiteLabelSettingsWrapper wrapper)
{
await _permissionContext.DemandPermissionsAsync(SecutiryConstants.EditPortalSettings);
await DemandWhiteLabelPermissionAsync();
await DemandRebrandingPermissionAsync();
if (wrapper.Settings == null)
{
@ -333,7 +333,7 @@ public class WhitelabelController : BaseSettingsController
public async Task<AdditionalWhiteLabelSettings> DeleteAdditionalWhiteLabelSettingsAsync()
{
await _permissionContext.DemandPermissionsAsync(SecutiryConstants.EditPortalSettings);
await DemandWhiteLabelPermissionAsync();
await DemandRebrandingPermissionAsync();
var defaultSettings = _settingsManager.GetDefault<AdditionalWhiteLabelSettings>();
@ -347,7 +347,7 @@ public class WhitelabelController : BaseSettingsController
public async Task<bool> SaveMailWhiteLabelSettingsAsync(MailWhiteLabelSettings settings)
{
await _permissionContext.DemandPermissionsAsync(SecutiryConstants.EditPortalSettings);
await DemandWhiteLabelPermissionAsync();
await DemandRebrandingPermissionAsync();
ArgumentNullException.ThrowIfNull(settings);
@ -360,7 +360,7 @@ public class WhitelabelController : BaseSettingsController
public async Task<bool> UpdateMailWhiteLabelSettings(MailWhiteLabelSettingsRequestsDto inDto)
{
await _permissionContext.DemandPermissionsAsync(SecutiryConstants.EditPortalSettings);
await DemandWhiteLabelPermissionAsync();
await DemandRebrandingPermissionAsync();
await _settingsManager.ManageAsync<MailWhiteLabelSettings>(settings =>
{
@ -382,7 +382,7 @@ public class WhitelabelController : BaseSettingsController
public async Task<MailWhiteLabelSettings> DeleteMailWhiteLabelSettingsAsync()
{
await _permissionContext.DemandPermissionsAsync(SecutiryConstants.EditPortalSettings);
await DemandWhiteLabelPermissionAsync();
await DemandRebrandingPermissionAsync();
var defaultSettings = _settingsManager.GetDefault<MailWhiteLabelSettings>();
@ -407,4 +407,13 @@ public class WhitelabelController : BaseSettingsController
throw new BillingException(Resource.ErrorNotAllowedOption, "WhiteLabel");
}
}
private async Task DemandRebrandingPermissionAsync()
{
if (!_coreBaseSettings.Standalone || _coreBaseSettings.CustomMode)
{
throw new SecurityException(Resource.ErrorAccessDenied);
}
await DemandWhiteLabelPermissionAsync();
}
}