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

ASC.Web.Api: Settings: return custom base domain for standalone

Browse Source
This commit is contained in:
Andrey Savihin 2023-09-08 16:48:36 +03:00
parent 00bf52e41c
commit adcb0b502b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web/ASC.Web.Api/Api/Settings/SettingsController.cs
View File

@ -46,6 +46,7 @@ public class SettingsController : BaseSettingsController
private readonly WebItemManagerSecurity _webItemManagerSecurity; private readonly WebItemManagerSecurity _webItemManagerSecurity;
private readonly TenantInfoSettingsHelper _tenantInfoSettingsHelper; private readonly TenantInfoSettingsHelper _tenantInfoSettingsHelper;
private readonly TenantUtil _tenantUtil; private readonly TenantUtil _tenantUtil;
private readonly CoreSettings _coreSettings;
private readonly CoreBaseSettings _coreBaseSettings; private readonly CoreBaseSettings _coreBaseSettings;
private readonly CommonLinkUtility _commonLinkUtility; private readonly CommonLinkUtility _commonLinkUtility;
private readonly IConfiguration _configuration; private readonly IConfiguration _configuration;
@ -76,6 +77,7 @@ public class SettingsController : BaseSettingsController
WebItemManagerSecurity webItemManagerSecurity, WebItemManagerSecurity webItemManagerSecurity,
TenantInfoSettingsHelper tenantInfoSettingsHelper, TenantInfoSettingsHelper tenantInfoSettingsHelper,
TenantUtil tenantUtil, TenantUtil tenantUtil,
CoreSettings coreSettings,
CoreBaseSettings coreBaseSettings, CoreBaseSettings coreBaseSettings,
CommonLinkUtility commonLinkUtility, CommonLinkUtility commonLinkUtility,
IConfiguration configuration, IConfiguration configuration,
@ -115,6 +117,7 @@ public class SettingsController : BaseSettingsController
_webItemManagerSecurity = webItemManagerSecurity; _webItemManagerSecurity = webItemManagerSecurity;
_tenantInfoSettingsHelper = tenantInfoSettingsHelper; _tenantInfoSettingsHelper = tenantInfoSettingsHelper;
_tenantUtil = tenantUtil; _tenantUtil = tenantUtil;
_coreSettings = coreSettings;
_coreBaseSettings = coreBaseSettings; _coreBaseSettings = coreBaseSettings;
_commonLinkUtility = commonLinkUtility; _commonLinkUtility = commonLinkUtility;
_configuration = configuration; _configuration = configuration;
@ -157,7 +160,7 @@ public class SettingsController : BaseSettingsController
Personal = _coreBaseSettings.Personal, Personal = _coreBaseSettings.Personal,
DocSpace = !_coreBaseSettings.DisableDocSpace, DocSpace = !_coreBaseSettings.DisableDocSpace,
Standalone = _coreBaseSettings.Standalone, Standalone = _coreBaseSettings.Standalone,
BaseDomain = _coreBaseSettings.Basedomain, BaseDomain = _coreBaseSettings.Standalone ? await _coreSettings.GetSettingAsync("BaseDomain") ?? _coreBaseSettings.Basedomain : _coreBaseSettings.Basedomain,
Version = _configuration["version:number"] ?? "", Version = _configuration["version:number"] ?? "",
TenantStatus = (await _tenantManager.GetCurrentTenantAsync()).Status, TenantStatus = (await _tenantManager.GetCurrentTenantAsync()).Status,
TenantAlias = Tenant.Alias, TenantAlias = Tenant.Alias,