Merge branch 'develop' into feature/management
This commit is contained in:
commit
6b4b6f53ff
@ -199,3 +199,5 @@ services:
|
|||||||
<<: *x-profiles-local
|
<<: *x-profiles-local
|
||||||
volumes:
|
volumes:
|
||||||
- ${DATA_DIR}:/var/www/onlyoffice/Data
|
- ${DATA_DIR}:/var/www/onlyoffice/Data
|
||||||
|
ports:
|
||||||
|
- 8085:80
|
||||||
|
@ -269,7 +269,7 @@ public class WhitelabelController : BaseSettingsController
|
|||||||
public async Task<bool> SaveCompanyWhiteLabelSettingsAsync(CompanyWhiteLabelSettingsWrapper companyWhiteLabelSettingsWrapper)
|
public async Task<bool> SaveCompanyWhiteLabelSettingsAsync(CompanyWhiteLabelSettingsWrapper companyWhiteLabelSettingsWrapper)
|
||||||
{
|
{
|
||||||
await _permissionContext.DemandPermissionsAsync(SecutiryConstants.EditPortalSettings);
|
await _permissionContext.DemandPermissionsAsync(SecutiryConstants.EditPortalSettings);
|
||||||
await DemandWhiteLabelPermissionAsync();
|
await DemandRebrandingPermissionAsync();
|
||||||
|
|
||||||
if (companyWhiteLabelSettingsWrapper.Settings == null)
|
if (companyWhiteLabelSettingsWrapper.Settings == null)
|
||||||
{
|
{
|
||||||
@ -295,7 +295,7 @@ public class WhitelabelController : BaseSettingsController
|
|||||||
public async Task<CompanyWhiteLabelSettings> DeleteCompanyWhiteLabelSettingsAsync()
|
public async Task<CompanyWhiteLabelSettings> DeleteCompanyWhiteLabelSettingsAsync()
|
||||||
{
|
{
|
||||||
await _permissionContext.DemandPermissionsAsync(SecutiryConstants.EditPortalSettings);
|
await _permissionContext.DemandPermissionsAsync(SecutiryConstants.EditPortalSettings);
|
||||||
await DemandWhiteLabelPermissionAsync();
|
await DemandRebrandingPermissionAsync();
|
||||||
|
|
||||||
var defaultSettings = _settingsManager.GetDefault<CompanyWhiteLabelSettings>();
|
var defaultSettings = _settingsManager.GetDefault<CompanyWhiteLabelSettings>();
|
||||||
|
|
||||||
@ -309,7 +309,7 @@ public class WhitelabelController : BaseSettingsController
|
|||||||
public async Task<bool> SaveAdditionalWhiteLabelSettingsAsync(AdditionalWhiteLabelSettingsWrapper wrapper)
|
public async Task<bool> SaveAdditionalWhiteLabelSettingsAsync(AdditionalWhiteLabelSettingsWrapper wrapper)
|
||||||
{
|
{
|
||||||
await _permissionContext.DemandPermissionsAsync(SecutiryConstants.EditPortalSettings);
|
await _permissionContext.DemandPermissionsAsync(SecutiryConstants.EditPortalSettings);
|
||||||
await DemandWhiteLabelPermissionAsync();
|
await DemandRebrandingPermissionAsync();
|
||||||
|
|
||||||
if (wrapper.Settings == null)
|
if (wrapper.Settings == null)
|
||||||
{
|
{
|
||||||
@ -333,7 +333,7 @@ public class WhitelabelController : BaseSettingsController
|
|||||||
public async Task<AdditionalWhiteLabelSettings> DeleteAdditionalWhiteLabelSettingsAsync()
|
public async Task<AdditionalWhiteLabelSettings> DeleteAdditionalWhiteLabelSettingsAsync()
|
||||||
{
|
{
|
||||||
await _permissionContext.DemandPermissionsAsync(SecutiryConstants.EditPortalSettings);
|
await _permissionContext.DemandPermissionsAsync(SecutiryConstants.EditPortalSettings);
|
||||||
await DemandWhiteLabelPermissionAsync();
|
await DemandRebrandingPermissionAsync();
|
||||||
|
|
||||||
var defaultSettings = _settingsManager.GetDefault<AdditionalWhiteLabelSettings>();
|
var defaultSettings = _settingsManager.GetDefault<AdditionalWhiteLabelSettings>();
|
||||||
|
|
||||||
@ -347,7 +347,7 @@ public class WhitelabelController : BaseSettingsController
|
|||||||
public async Task<bool> SaveMailWhiteLabelSettingsAsync(MailWhiteLabelSettings settings)
|
public async Task<bool> SaveMailWhiteLabelSettingsAsync(MailWhiteLabelSettings settings)
|
||||||
{
|
{
|
||||||
await _permissionContext.DemandPermissionsAsync(SecutiryConstants.EditPortalSettings);
|
await _permissionContext.DemandPermissionsAsync(SecutiryConstants.EditPortalSettings);
|
||||||
await DemandWhiteLabelPermissionAsync();
|
await DemandRebrandingPermissionAsync();
|
||||||
|
|
||||||
ArgumentNullException.ThrowIfNull(settings);
|
ArgumentNullException.ThrowIfNull(settings);
|
||||||
|
|
||||||
@ -360,7 +360,7 @@ public class WhitelabelController : BaseSettingsController
|
|||||||
public async Task<bool> UpdateMailWhiteLabelSettings(MailWhiteLabelSettingsRequestsDto inDto)
|
public async Task<bool> UpdateMailWhiteLabelSettings(MailWhiteLabelSettingsRequestsDto inDto)
|
||||||
{
|
{
|
||||||
await _permissionContext.DemandPermissionsAsync(SecutiryConstants.EditPortalSettings);
|
await _permissionContext.DemandPermissionsAsync(SecutiryConstants.EditPortalSettings);
|
||||||
await DemandWhiteLabelPermissionAsync();
|
await DemandRebrandingPermissionAsync();
|
||||||
|
|
||||||
await _settingsManager.ManageAsync<MailWhiteLabelSettings>(settings =>
|
await _settingsManager.ManageAsync<MailWhiteLabelSettings>(settings =>
|
||||||
{
|
{
|
||||||
@ -382,7 +382,7 @@ public class WhitelabelController : BaseSettingsController
|
|||||||
public async Task<MailWhiteLabelSettings> DeleteMailWhiteLabelSettingsAsync()
|
public async Task<MailWhiteLabelSettings> DeleteMailWhiteLabelSettingsAsync()
|
||||||
{
|
{
|
||||||
await _permissionContext.DemandPermissionsAsync(SecutiryConstants.EditPortalSettings);
|
await _permissionContext.DemandPermissionsAsync(SecutiryConstants.EditPortalSettings);
|
||||||
await DemandWhiteLabelPermissionAsync();
|
await DemandRebrandingPermissionAsync();
|
||||||
|
|
||||||
var defaultSettings = _settingsManager.GetDefault<MailWhiteLabelSettings>();
|
var defaultSettings = _settingsManager.GetDefault<MailWhiteLabelSettings>();
|
||||||
|
|
||||||
@ -407,4 +407,13 @@ public class WhitelabelController : BaseSettingsController
|
|||||||
throw new BillingException(Resource.ErrorNotAllowedOption, "WhiteLabel");
|
throw new BillingException(Resource.ErrorNotAllowedOption, "WhiteLabel");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async Task DemandRebrandingPermissionAsync()
|
||||||
|
{
|
||||||
|
if (!_coreBaseSettings.Standalone || _coreBaseSettings.CustomMode)
|
||||||
|
{
|
||||||
|
throw new SecurityException(Resource.ErrorAccessDenied);
|
||||||
|
}
|
||||||
|
await DemandWhiteLabelPermissionAsync();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user