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

fix

Browse Source
This commit is contained in:
Vashchuk Nikita 2022-04-26 11:49:55 +03:00
parent 62c66e6e1f
commit e812d3ec53
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,7 @@ public class SsoHandlerService
MessageService messageService, MessageService messageService,
DisplayUserSettingsHelper displayUserSettingsHelper) DisplayUserSettingsHelper displayUserSettingsHelper)
{ {
_log = optionsMonitor.Get("ASC"); _log = optionsMonitor.CurrentValue;
_coreBaseSettings = coreBaseSettings; _coreBaseSettings = coreBaseSettings;
_userManager = userManager; _userManager = userManager;
_tenantManager = tenantManager; _tenantManager = tenantManager;
@ -206,17 +206,19 @@ public class SsoHandlerService
_cookiesManager.ResetUserCookie(); _cookiesManager.ResetUserCookie();
_securityContext.Logout(); _securityContext.Logout();
context.Response.Redirect(AUTH_PAGE, false);
} }
} }
catch (SsoException ex)
{
throw ex;
}
catch (Exception e) catch (Exception e)
{ {
ErrorWithStatus("Unexpected error. {0}", e); ErrorWithStatus("Unexpected error. {0}", e);
} }
finally finally
{ {
await context.Response.CompleteAsync(); //await context.Response.CompleteAsync();
//context.ApplicationInstance.CompleteRequest(); //context.ApplicationInstance.CompleteRequest();
} }
} }
@ -224,7 +226,7 @@ public class SsoHandlerService
private void ErrorWithStatus(string errorText, object errorArg = null) private void ErrorWithStatus(string errorText, object errorArg = null)
{ {
_log.ErrorFormat(errorText, errorArg); _log.ErrorFormat(errorText, errorArg);
throw new Exception(string.Format(errorText, errorArg)); throw new SsoException(errorText, errorArg);
} }
private UserInfo AddUser(UserInfo userInfo) private UserInfo AddUser(UserInfo userInfo)
@ -274,6 +276,11 @@ public class SsoHandlerService
} }
} }
public class SsoException : Exception
{
public SsoException(string message, object errorArg) : base(string.Format(message, errorArg)) { }
}
public static class SsoHandlerExtensions public static class SsoHandlerExtensions
{ {
public static IApplicationBuilder UseSsoHandler(this IApplicationBuilder builder) public static IApplicationBuilder UseSsoHandler(this IApplicationBuilder builder)