From 751753597e6cd1dce95d0c06564cd2e43084794b Mon Sep 17 00:00:00 2001 From: Luke Gehorsam Date: Wed, 11 Oct 2023 13:09:27 -0400 Subject: [PATCH] fix internal import and enum name, update changelog (#106) --- CHANGELOG.md | 5 +++++ Nakama/Nakama.uplugin | 2 +- Nakama/Source/NakamaUnreal/Private/NakamaClient.cpp | 8 ++++---- Nakama/Source/NakamaUnreal/Public/NakamaClient.h | 2 +- .../NakamaUnreal/Public/NakamaRealtimeRequestContext.h | 1 + Nakama/Source/NakamaUnreal/Public/NakamaUtils.h | 2 +- 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f0ea7e7..3f74c27a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project are documented below. The format is based on [keep a changelog](http://keepachangelog.com/) and this project uses [semantic versioning](http://semver.org/). ### Unreleased +### [2.9.1] - 2023-10-11 +### Fixed +- Fix support for non-ASCII characters in session authentication tokens. +- Fixed an internal import and enum name that could cause compilation failures depending on the project's build flags. + ### [2.9.0] - 2023-10-04 ### Added - Added `TFunction` support to our API calls for more concise use of callbacks. diff --git a/Nakama/Nakama.uplugin b/Nakama/Nakama.uplugin index 26bd56d7..c9468e24 100644 --- a/Nakama/Nakama.uplugin +++ b/Nakama/Nakama.uplugin @@ -1,7 +1,7 @@ { "FileVersion": 3, "Version": 2400, - "VersionName": "2.9.0", + "VersionName": "2.9.1", "FriendlyName": "Nakama client", "Description": "A UE4 and UE5 client for the Nakama server.", "Category": "HeroicLabs.Nakama", diff --git a/Nakama/Source/NakamaUnreal/Private/NakamaClient.cpp b/Nakama/Source/NakamaUnreal/Private/NakamaClient.cpp index 191f4ebb..55cff166 100644 --- a/Nakama/Source/NakamaUnreal/Private/NakamaClient.cpp +++ b/Nakama/Source/NakamaUnreal/Private/NakamaClient.cpp @@ -5270,7 +5270,7 @@ void UNakamaClient::DeleteFriends( } // Make the request - const auto HttpRequest = MakeRequest(Endpoint, TEXT(""), ENakamaRequestMethod::DELETE, QueryParams, Session->GetAuthToken()); + const auto HttpRequest = MakeRequest(Endpoint, TEXT(""), ENakamaRequestMethod::DEL, QueryParams, Session->GetAuthToken()); // Lock the ActiveRequests mutex to protect concurrent access FScopeLock Lock(&ActiveRequestsMutex); @@ -5654,7 +5654,7 @@ void UNakamaClient::DeleteGroup( } // Make the request - const auto HttpRequest = MakeRequest(Endpoint, TEXT(""), ENakamaRequestMethod::DELETE, TMultiMap(), Session->SessionData.AuthToken); + const auto HttpRequest = MakeRequest(Endpoint, TEXT(""), ENakamaRequestMethod::DEL, TMultiMap(), Session->SessionData.AuthToken); // Lock the ActiveRequests mutex to protect concurrent access FScopeLock Lock(&ActiveRequestsMutex); @@ -6990,7 +6990,7 @@ void UNakamaClient::DeleteLeaderboardRecord(UNakamaSession* Session, } // Make the request - const auto HttpRequest = MakeRequest(Endpoint, TEXT(""), ENakamaRequestMethod::DELETE, TMultiMap(), Session->GetAuthToken()); + const auto HttpRequest = MakeRequest(Endpoint, TEXT(""), ENakamaRequestMethod::DEL, TMultiMap(), Session->GetAuthToken()); // Lock the ActiveRequests mutex to protect concurrent access FScopeLock Lock(&ActiveRequestsMutex); @@ -7284,7 +7284,7 @@ void UNakamaClient::DeleteNotifications( } // Make the request - const auto HttpRequest = MakeRequest(Endpoint, TEXT(""), ENakamaRequestMethod::DELETE, QueryParams, Session->GetAuthToken()); + const auto HttpRequest = MakeRequest(Endpoint, TEXT(""), ENakamaRequestMethod::DEL, QueryParams, Session->GetAuthToken()); // Lock the ActiveRequests mutex to protect concurrent access FScopeLock Lock(&ActiveRequestsMutex); diff --git a/Nakama/Source/NakamaUnreal/Public/NakamaClient.h b/Nakama/Source/NakamaUnreal/Public/NakamaClient.h index 5c2884db..7d483de1 100644 --- a/Nakama/Source/NakamaUnreal/Public/NakamaClient.h +++ b/Nakama/Source/NakamaUnreal/Public/NakamaClient.h @@ -76,7 +76,7 @@ enum class ENakamaRequestMethod : uint8 { GET, POST, - DELETE, + DEL, PUT, }; diff --git a/Nakama/Source/NakamaUnreal/Public/NakamaRealtimeRequestContext.h b/Nakama/Source/NakamaUnreal/Public/NakamaRealtimeRequestContext.h index ca2cb9b2..21050f9d 100644 --- a/Nakama/Source/NakamaUnreal/Public/NakamaRealtimeRequestContext.h +++ b/Nakama/Source/NakamaUnreal/Public/NakamaRealtimeRequestContext.h @@ -5,6 +5,7 @@ #include "CoreMinimal.h" #include "NakamaRtError.h" //#include "NakamaUtils.h" +#include "Serialization/JsonSerializer.h" #include "UObject/NoExportTypes.h" #include "NakamaRealtimeRequestContext.generated.h" diff --git a/Nakama/Source/NakamaUnreal/Public/NakamaUtils.h b/Nakama/Source/NakamaUnreal/Public/NakamaUtils.h index bb407a2f..6c9e1873 100644 --- a/Nakama/Source/NakamaUnreal/Public/NakamaUtils.h +++ b/Nakama/Source/NakamaUnreal/Public/NakamaUtils.h @@ -25,7 +25,7 @@ class FNakamaUtils return TEXT("POST"); case ENakamaRequestMethod::PUT: return TEXT("PUT"); - case ENakamaRequestMethod::DELETE: + case ENakamaRequestMethod::DEL: return TEXT("DELETE"); default: // Handle unrecognized verb if needed