5.2 update and extra auth

can append more key:value pairs to auth map sent on connect
getnamo · Jun 26, 2023 · 64b4360 · 64b4360
1 parent fadf99a
commit 64b4360
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/SocketIOClient.uplugin b/SocketIOClient.uplugin
@@ -1,8 +1,8 @@
 {
 	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "2.5.8",
-	"EngineVersion": "5.1",
+	"VersionName": "2.6.0",
+	"EngineVersion": "5.2",
 	"FriendlyName": "Socket.IO Client",
 	"Description": "Real-time WebSocket networking via Socket.IO protocol usable from blueprints and c++.",
 	"Category": "Networking",

diff --git a/Source/SocketIOClient/Private/SocketIONative.cpp b/Source/SocketIOClient/Private/SocketIONative.cpp
@@ -54,6 +54,18 @@ void FSocketIONative::Connect(const FSIOConnectParams& InConnectParams)
 	{
 		AuthMessage->get_map()["token"] = sio::string_message::create(USIOMessageConvert::StdString(URLParams.AuthToken));
 	}
+	if (URLParams.ExtraAuth.Num() > 0)
+	{
+		TArray<FString> Keys;
+		URLParams.ExtraAuth.GetKeys(Keys);
+
+		for (const FString& Key : Keys)
+		{
+			std::string StdKey = USIOMessageConvert::StdString(Key);
+			std::string StdValue = USIOMessageConvert::StdString(URLParams.ExtraAuth[Key]);
+			AuthMessage->get_map()[StdKey] = sio::string_message::create(StdValue);
+		}
+	}
 
 	QueryMap = USIOMessageConvert::FStringMapToStdStringMap(URLParams.Query);
 	HeadersMap = USIOMessageConvert::FStringMapToStdStringMap(URLParams.Headers);

diff --git a/Source/SocketIOClient/Public/SIOMessageConvert.h b/Source/SocketIOClient/Public/SIOMessageConvert.h
@@ -31,10 +31,14 @@ struct SOCKETIOCLIENT_API FSIOConnectParams
 	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = SocketIOConnectionParams)
 	TMap<FString, FString> Headers;
 
-	/** Optional authorization JSON to send to the server upon initial connection*/
+	/** Optional authorization auth:{token:""} to send to the server upon initial connection */
 	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = SocketIOConnectionParams)
 	FString AuthToken;
 
+	/** Optional custom auth key:map pairs added, this is separate from token:"" pair  */
+	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = SocketIOConnectionParams)
+	TMap<FString, FString> ExtraAuth;
+
 	/** Optional path part of URL string. Default is 'socket.io'*/
 	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = SocketIOConnectionParams)
 	FString Path;