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

Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/article

Browse Source
This commit is contained in:
Viktor Fomin 2022-07-25 16:47:15 +03:00
commit 46a0d3f446
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
web/ASC.Web.Api/Api/CapabilitiesController.cs
View File

@ -33,7 +33,8 @@ public class CapabilitiesController : ControllerBase
{
private readonly CoreBaseSettings _coreBaseSettings;
private readonly TenantManager _tenantManager;
private readonly ProviderManager _providerManager;
private readonly ProviderManager _providerManager;
private readonly SettingsManager _settingsManager;
private readonly IConfiguration _configuration;
private readonly IHttpContextAccessor _httpContextAccessor;
private readonly ILogger _log;
@ -42,14 +43,16 @@ public class CapabilitiesController : ControllerBase
public CapabilitiesController(
CoreBaseSettings coreBaseSettings,
TenantManager tenantManager,
ProviderManager providerManager,
ProviderManager providerManager,
SettingsManager settingsManager,
IConfiguration configuration,
IHttpContextAccessor httpContextAccessor,
ILogger<CapabilitiesController> logger)
{
_coreBaseSettings = coreBaseSettings;
_tenantManager = tenantManager;
_providerManager = providerManager;
_providerManager = providerManager;
_settingsManager = settingsManager;
_configuration = configuration;
_httpContextAccessor = httpContextAccessor;
_log = logger;
@ -120,18 +123,17 @@ public class CapabilitiesController : ControllerBase
|| SetupInfo.IsVisibleSettings(ManagementType.SingleSignOnSettings.ToString())
&& _tenantManager.GetTenantQuota(_tenantManager.GetCurrentTenant().Id).Sso)
{
//var settings = SettingsManager.Load<SsoSettingsV2>();
var settings = _settingsManager.Load<SsoSettingsV2>();
//if (settings.EnableSso)
//{
var uri = _httpContextAccessor.HttpContext.Request.GetUrlRewriter();
var configUrl = _configuration["web:sso:saml:login:url"] ?? "";
result.SsoUrl = $"{uri.Scheme}://{uri.Host}{((uri.Port == 80 || uri.Port == 443) ? "" : ":" + uri.Port)}{configUrl}";
result.SsoLabel = string.Empty;
// result.SsoLabel = settings.SpLoginLabel;
//}
if (settings.EnableSso)
{
var uri = _httpContextAccessor.HttpContext.Request.GetUrlRewriter();
var configUrl = _configuration["web:sso:saml:login:url"] ?? "";
result.SsoUrl = $"{uri.Scheme}://{uri.Host}{((uri.Port == 80 || uri.Port == 443) ? "" : ":" + uri.Port)}{configUrl}";
result.SsoLabel = settings.SpLoginLabel;
}
}
}
catch (Exception ex)