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

fix

Browse Source
This commit is contained in:
Anton Suhorukov 2022-05-20 17:02:09 +03:00
parent 75da995099
commit a585a425bc
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/services/ASC.Feed.Aggregator/GlobalUsings.cs
View File

@ -32,7 +32,7 @@ global using ASC.Common.Utils;
global using ASC.Core;
global using ASC.Core.Common;
global using ASC.Core.Notify.Signalr;
global using ASC.Feed.Aggregator.Log
global using ASC.Feed.Aggregator.Log;
global using ASC.Feed.Aggregator.Modules;
global using ASC.Feed.Configuration;

14
web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
View File

@ -44,7 +44,7 @@ public class SsoHandler
[Scope]
public class SsoHandlerService
{
private readonly ILog _log;
private readonly ILogger _log;
private readonly CoreBaseSettings _coreBaseSettings;
private readonly UserManager _userManager;
private readonly TenantManager _tenantManager;
@ -67,7 +67,7 @@ public class SsoHandlerService
public SsoHandlerService(
IOptionsMonitor<ILog> optionsMonitor,
ILoggerProvider option,
CoreBaseSettings coreBaseSettings,
UserManager userManager,
TenantManager tenantManager,
@ -83,7 +83,7 @@ public class SsoHandlerService
DisplayUserSettingsHelper displayUserSettingsHelper,
TenantUtil tenantUtil)
{
_log = optionsMonitor.CurrentValue;
_log = option.CreateLogger("ASC.Indexer");
_coreBaseSettings = coreBaseSettings;
_userManager = userManager;
_tenantManager = tenantManager;
@ -173,7 +173,7 @@ public class SsoHandlerService
}
else
{
_log.DebugFormat("User {0} already authenticated", context.User.Identity);
_log.LogDebug("User {0} already authenticated", context.User.Identity);
}
}
@ -218,12 +218,12 @@ public class SsoHandlerService
}
catch (SSOException e)
{
_log.Error(e);
_log.ErrorWithException(e);
await WriteErrorToResponse(context, e.MessageKey);
}
catch (Exception e)
{
_log.Error(e);
_log.ErrorWithException(e);
await WriteErrorToResponse(context, MessageKey.Error);
}
finally
@ -253,7 +253,7 @@ public class SsoHandlerService
return Constants.LostUser;
}
_log.DebugFormat("Adding or updating user in database, userId={0}", userInfo.Id);
_log.LogDebug("Adding or updating user in database, userId={0}", userInfo.Id);
_securityContext.AuthenticateMeWithoutCookie(ASC.Core.Configuration.Constants.CoreSystem);