Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
This commit is contained in:
commit
5e646b2992
@ -34,6 +34,7 @@ public class CapabilitiesController : ControllerBase
|
|||||||
private readonly CoreBaseSettings _coreBaseSettings;
|
private readonly CoreBaseSettings _coreBaseSettings;
|
||||||
private readonly TenantManager _tenantManager;
|
private readonly TenantManager _tenantManager;
|
||||||
private readonly ProviderManager _providerManager;
|
private readonly ProviderManager _providerManager;
|
||||||
|
private readonly SettingsManager _settingsManager;
|
||||||
private readonly IConfiguration _configuration;
|
private readonly IConfiguration _configuration;
|
||||||
private readonly IHttpContextAccessor _httpContextAccessor;
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
private readonly ILogger _log;
|
private readonly ILogger _log;
|
||||||
@ -43,6 +44,7 @@ public class CapabilitiesController : ControllerBase
|
|||||||
CoreBaseSettings coreBaseSettings,
|
CoreBaseSettings coreBaseSettings,
|
||||||
TenantManager tenantManager,
|
TenantManager tenantManager,
|
||||||
ProviderManager providerManager,
|
ProviderManager providerManager,
|
||||||
|
SettingsManager settingsManager,
|
||||||
IConfiguration configuration,
|
IConfiguration configuration,
|
||||||
IHttpContextAccessor httpContextAccessor,
|
IHttpContextAccessor httpContextAccessor,
|
||||||
ILogger<CapabilitiesController> logger)
|
ILogger<CapabilitiesController> logger)
|
||||||
@ -50,6 +52,7 @@ public class CapabilitiesController : ControllerBase
|
|||||||
_coreBaseSettings = coreBaseSettings;
|
_coreBaseSettings = coreBaseSettings;
|
||||||
_tenantManager = tenantManager;
|
_tenantManager = tenantManager;
|
||||||
_providerManager = providerManager;
|
_providerManager = providerManager;
|
||||||
|
_settingsManager = settingsManager;
|
||||||
_configuration = configuration;
|
_configuration = configuration;
|
||||||
_httpContextAccessor = httpContextAccessor;
|
_httpContextAccessor = httpContextAccessor;
|
||||||
_log = logger;
|
_log = logger;
|
||||||
@ -120,18 +123,17 @@ public class CapabilitiesController : ControllerBase
|
|||||||
|| SetupInfo.IsVisibleSettings(ManagementType.SingleSignOnSettings.ToString())
|
|| SetupInfo.IsVisibleSettings(ManagementType.SingleSignOnSettings.ToString())
|
||||||
&& _tenantManager.GetTenantQuota(_tenantManager.GetCurrentTenant().Id).Sso)
|
&& _tenantManager.GetTenantQuota(_tenantManager.GetCurrentTenant().Id).Sso)
|
||||||
{
|
{
|
||||||
//var settings = SettingsManager.Load<SsoSettingsV2>();
|
var settings = _settingsManager.Load<SsoSettingsV2>();
|
||||||
|
|
||||||
//if (settings.EnableSso)
|
if (settings.EnableSso)
|
||||||
//{
|
{
|
||||||
var uri = _httpContextAccessor.HttpContext.Request.GetUrlRewriter();
|
var uri = _httpContextAccessor.HttpContext.Request.GetUrlRewriter();
|
||||||
|
|
||||||
var configUrl = _configuration["web:sso:saml:login:url"] ?? "";
|
var configUrl = _configuration["web:sso:saml:login:url"] ?? "";
|
||||||
|
|
||||||
result.SsoUrl = $"{uri.Scheme}://{uri.Host}{((uri.Port == 80 || uri.Port == 443) ? "" : ":" + uri.Port)}{configUrl}";
|
result.SsoUrl = $"{uri.Scheme}://{uri.Host}{((uri.Port == 80 || uri.Port == 443) ? "" : ":" + uri.Port)}{configUrl}";
|
||||||
result.SsoLabel = string.Empty;
|
result.SsoLabel = settings.SpLoginLabel;
|
||||||
// result.SsoLabel = settings.SpLoginLabel;
|
}
|
||||||
//}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
|
Loading…
Reference in New Issue
Block a user