Changeset 387 for binary-improvements2/MapRendering/Web/Handlers/SessionHandler.cs

Timestamp:

Aug 6, 2022, 11:32:32 PM (2 years ago)

Author:

alloc

Message:

Big refactoring in Web to pass around a Context instead of a bunch of individual arguments all the time

File:

• binary-improvements2/MapRendering/Web/Handlers/SessionHandler.cs (modified) (7 diffs)

binary-improvements2/MapRendering/Web/Handlers/SessionHandler.cs

@@ -3 +3 @@
 using System.Net;
 using System.Text;
-using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;
-using HttpListenerResponse = SpaceWizards.HttpListener.HttpListenerResponse;
 
 namespace AllocsFixes.NetConnections.Servers.Web.Handlers {
@@ -29 +27 @@
                 }
 
-                public override void HandleRequest (string _requestPath, HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _con,
-                        int _permissionLevel) {
+                public override void HandleRequest (RequestContext _context) {
                         
-                        IPEndPoint reqRemoteEndPoint = _req.RemoteEndPoint;
+                        IPEndPoint reqRemoteEndPoint = _context.Request.RemoteEndPoint;
                         if (reqRemoteEndPoint == null) {
-                                _resp.Redirect (pageBasePath);
+                                _context.Response.Redirect (pageBasePath);
                                 return;
                         }
 
-                        string subpath = _requestPath.Remove (0, urlBasePath.Length);
+                        string subpath = _context.RequestPath.Remove (0, urlBasePath.Length);
 
                         StringBuilder result = new StringBuilder ();
@@ -47 +44 @@
 
                                 try {
-                                        ulong id = OpenID.Validate (_req);
+                                        ulong id = OpenID.Validate (_context.Request);
                                         if (id > 0) {
                                                 WebConnection con = connectionHandler.LogIn (id, reqRemoteEndPoint.Address);
@@ -60 +57 @@
                                                         Secure = false
                                                 };
-                                                _resp.AppendCookie (cookie);
-                                                _resp.Redirect (pageBasePath);
+                                                _context.Response.AppendCookie (cookie);
+                                                _context.Response.Redirect (pageBasePath);
 
                                                 return;
@@ -73 +70 @@
                                 result.Append ($"<h1>Login failed, <a href=\"{pageBasePath}\">click to return to main page</a>.</h1>");
                         } else if (subpath.StartsWith ("logout")) {
-                                if (_con != null) {
-                                        connectionHandler.LogOut (_con.SessionID);
+                                if (_context.Connection != null) {
+                                        connectionHandler.LogOut (_context.Connection.SessionID);
                                         Cookie cookie = new Cookie ("sid", "", "/") {
                                                 Expired = true
                                         };
-                                        _resp.AppendCookie (cookie);
-                                        _resp.Redirect (pageBasePath);
+                                        _context.Response.AppendCookie (cookie);
+                                        _context.Response.Redirect (pageBasePath);
                                         return;
                                 }
@@ -85 +82 @@
                                 result.Append ($"<h1>Not logged in, <a href=\"{pageBasePath}\">click to return to main page</a>.</h1>");
                         } else if (subpath.StartsWith (steamLoginUrl)) {
-                                string host = (Web.IsSslRedirected (_req) ? "https://" : "http://") + _req.UserHostName;
+                                string host = (Web.IsSslRedirected (_context.Request) ? "https://" : "http://") + _context.Request.UserHostName;
                                 string url = OpenID.GetOpenIdLoginUrl (host, host + urlBasePath + steamOpenIdVerifyUrl);
-                                _resp.Redirect (url);
+                                _context.Response.Redirect (url);
                                 return;
                         } else {
@@ -95 +92 @@
                         result.Append (footer);
 
-                        _resp.ContentType = MimeType.GetMimeType (".html");
-                        _resp.ContentEncoding = Encoding.UTF8;
-                        byte[] buf = Encoding.UTF8.GetBytes (result.ToString ());
-                        _resp.ContentLength64 = buf.Length;
-                        _resp.OutputStream.Write (buf, 0, buf.Length);
+                        WebUtils.WriteText (_context.Response, result.ToString (), _mimeType: WebUtils.MimeHtml);
                 }
         }