Updated to latest Protocol Version
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
package org.openautonomousconnection.webserver.api;
|
||||
|
||||
import org.openautonomousconnection.protocol.side.web.ConnectedWebClient;
|
||||
import org.openautonomousconnection.protocol.side.server.CustomConnectedClient;
|
||||
import org.openautonomousconnection.protocol.side.web.ProtocolWebServer;
|
||||
import org.openautonomousconnection.protocol.side.web.managers.SessionManager;
|
||||
|
||||
@@ -23,14 +23,14 @@ public final class SessionContext {
|
||||
this.valid = valid;
|
||||
}
|
||||
|
||||
public static SessionContext from(ConnectedWebClient client, ProtocolWebServer server, Map<String, String> headers) throws IOException {
|
||||
public static SessionContext from(CustomConnectedClient client, ProtocolWebServer server, Map<String, String> headers) throws IOException {
|
||||
if (headers == null) return new SessionContext(null, null, false);
|
||||
|
||||
String sessionId = headers.get("session");
|
||||
if (sessionId == null) return new SessionContext(null, null, false);
|
||||
|
||||
String ip = (client.getConnection().getSocket() != null && client.getConnection().getSocket().getInetAddress() != null)
|
||||
? client.getConnection().getSocket().getInetAddress().getHostAddress() : "";
|
||||
String ip = (client.getConnection().getTcpSocket() != null && client.getConnection().getTcpSocket().getInetAddress() != null)
|
||||
? client.getConnection().getTcpSocket().getInetAddress().getHostAddress() : "";
|
||||
|
||||
String userAgent = headers.getOrDefault("user-agent", "");
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package org.openautonomousconnection.webserver.api;
|
||||
|
||||
import org.openautonomousconnection.protocol.packets.v1_0_0.beta.web.WebRequestPacket;
|
||||
import org.openautonomousconnection.protocol.side.web.ConnectedWebClient;
|
||||
import org.openautonomousconnection.protocol.side.server.CustomConnectedClient;
|
||||
import org.openautonomousconnection.protocol.side.web.ProtocolWebServer;
|
||||
import org.openautonomousconnection.webserver.utils.WebHasher;
|
||||
import org.openautonomousconnection.webserver.utils.RequestParams;
|
||||
@@ -11,14 +11,14 @@ import org.openautonomousconnection.webserver.utils.RequestParams;
|
||||
*/
|
||||
public final class WebPageContext {
|
||||
|
||||
public final ConnectedWebClient client;
|
||||
public final CustomConnectedClient client;
|
||||
public final WebRequestPacket request;
|
||||
public final SessionContext session;
|
||||
public final RequestParams params;
|
||||
public final WebHasher hasher;
|
||||
|
||||
public WebPageContext(
|
||||
ConnectedWebClient client,
|
||||
CustomConnectedClient client,
|
||||
ProtocolWebServer server,
|
||||
WebRequestPacket request,
|
||||
RequestParams params,
|
||||
|
||||
Reference in New Issue
Block a user