Changeset 411

Timestamp:

Feb 22, 2023, 5:54:57 PM (22 months ago)

Author:

alloc

Message:

SessionHandler refactoring for login reuse

File:

• binary-improvements2/WebServer/src/UrlHandlers/SessionHandler.cs (modified) (3 diffs)

binary-improvements2/WebServer/src/UrlHandlers/SessionHandler.cs

@@ -17 +17 @@
 
                 private const string userPassLoginUrl = "login";
+                public const string userPassLoginName = "user/pass";
+                public const string userPassErrorPage = "UserPassLoginFailed";
 
                 private readonly ConnectionHandler connectionHandler;
@@ -96 +98 @@
                         }
 
-                        HandleUserIdLogin (_context, _remoteEndpointString, "user/pass", "UserPassLoginFailed", webUser.Value.Name, webUser.Value.PlatformUser, webUser.Value.CrossPlatformUser);
+                        HandleUserIdLogin (connectionHandler, _context, _remoteEndpointString, userPassLoginName, userPassErrorPage, webUser.Value.Name, webUser.Value.PlatformUser, webUser.Value.CrossPlatformUser);
                 }
 
@@ -138 +140 @@
 
                         UserIdentifierSteam userId = new UserIdentifierSteam (id);
-                        HandleUserIdLogin (_context, _remoteEndpointString, "Steam OpenID", steamLoginFailedPage, userId.ToString (), userId);
+                        HandleUserIdLogin (connectionHandler, _context, _remoteEndpointString, "Steam OpenID", steamLoginFailedPage, userId.ToString (), userId);
                 }
 
-                private void HandleUserIdLogin (RequestContext _context, string _remoteEndpointString, string _loginName, string _errorPage, string _username,
-                        PlatformUserIdentifierAbs _userId, PlatformUserIdentifierAbs _crossUserId = null) {
+                public static void HandleUserIdLogin (ConnectionHandler _connectionHandler, RequestContext _context, string _remoteEndpointString,
+                        string _loginName, string _errorPage, string _username, PlatformUserIdentifierAbs _userId, PlatformUserIdentifierAbs _crossUserId = null) {
                         try {
-                                WebConnection con = connectionHandler.LogIn (_context.Request.RemoteEndPoint!.Address, _username, _userId, _crossUserId);
+                                WebConnection con = _connectionHandler.LogIn (_context.Request.RemoteEndPoint!.Address, _username, _userId, _crossUserId);
 
                                 int level1 = GameManager.Instance.adminTools.Users.GetUserPermissionLevel (_userId);