fix: Initialize RegexMatcher locally in Notification flow

kirre-bylund · kirre-bylund · commit 595e471522e1 · 2025-05-23T13:07:03.000+02:00
diff --git a/LootLockerServerSDK/LootLockerServerSDK.uplugin b/LootLockerServerSDK/LootLockerServerSDK.uplugin
@@ -1,8 +1,8 @@
 {
     "FileVersion": 3,
     "FriendlyName": "LootLockerServerSDK",
-    "Version": 7,
-    "VersionName": "6.0.0",
+    "Version": 8,
+    "VersionName": "6.0.1",
     "CreatedBy": "LootLocker",
     "CreatedByURL": "https://www.lootlocker.com/",
     "DocsURL": "https://docs.lootlocker.com/",
diff --git a/LootLockerServerSDK/Source/LootLockerServerSDK/Private/ServerAPI/LootLockerServerNotificationsRequest.cpp b/LootLockerServerSDK/Source/LootLockerServerSDK/Private/ServerAPI/LootLockerServerNotificationsRequest.cpp
@@ -3,7 +3,6 @@
 #include "LootLockerServerHttpClient.h"
 
 const FString ULootLockerServerNotificationsRequest::NotificationTypeValidationPatternString = "^[-_a-z0-9]+\\.[-_a-z0-9]+\\.[-_a-z0-9]+$";
-const FRegexPattern ULootLockerServerNotificationsRequest::NotificationTypeValidationPattern = FRegexPattern(*NotificationTypeValidationPatternString);
 
 ULootLockerServerNotificationsRequest::ULootLockerServerNotificationsRequest()
 {
@@ -198,7 +197,7 @@ void ULootLockerServerNotificationsRequest::SendNotificationToPlayer(
 	const FLootLockerServerSendNotificationsResponseBP& OnCompletedRequestBP,
 	const FLootLockerServerSendNotificationsResponseDelegate& OnCompletedRequest)
 {
-	if (!FRegexMatcher(NotificationTypeValidationPattern, *Request.Notification_type).FindNext())
+	if (!FRegexMatcher(FRegexPattern(*NotificationTypeValidationPatternString), *Request.Notification_type).FindNext())
 	{
 		FLootLockerServerSendNotificationsResponse ErrorResponse = LootLockerServerResponseFactory::Error<FLootLockerServerSendNotificationsResponse>("Notification type '" + Request.Notification_type + "' did not match pattern " + NotificationTypeValidationPatternString, LootLockerServerStaticRequestErrorStatusCodes::LL_ERROR_INVALID_INPUT);
 		OnCompletedRequestBP.ExecuteIfBound(ErrorResponse);
diff --git a/LootLockerServerSDK/Source/LootLockerServerSDK/Public/ServerAPI/LootLockerServerNotificationsRequest.h b/LootLockerServerSDK/Source/LootLockerServerSDK/Public/ServerAPI/LootLockerServerNotificationsRequest.h
@@ -138,5 +138,4 @@ class LOOTLOCKERSERVERSDK_API ULootLockerServerNotificationsRequest : public UOb
 	static void SendNotificationToPlayer(const TSharedPtr<FJsonValue>& Content, const FLootLockerServerSendNotificationsToPlayerBaseRequest& Request, const FLootLockerServerSendNotificationsResponseBP& OnCompletedRequestBP = FLootLockerServerSendNotificationsResponseBP(), const FLootLockerServerSendNotificationsResponseDelegate& OnCompletedRequest = FLootLockerServerSendNotificationsResponseDelegate());
 
 	static const FString NotificationTypeValidationPatternString;
-	static const FRegexPattern NotificationTypeValidationPattern;
 };

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`#include "LootLockerServerHttpClient.h"`
`4`	`4`
`5`	`5`	`const FString ULootLockerServerNotificationsRequest::NotificationTypeValidationPatternString = "^[-_a-z0-9]+\\.[-_a-z0-9]+\\.[-_a-z0-9]+$";`
`6`		`-const FRegexPattern ULootLockerServerNotificationsRequest::NotificationTypeValidationPattern = FRegexPattern(*NotificationTypeValidationPatternString);`
`7`	`6`
`8`	`7`	`ULootLockerServerNotificationsRequest::ULootLockerServerNotificationsRequest()`
`9`	`8`	`{`
`@@ -198,7 +197,7 @@ void ULootLockerServerNotificationsRequest::SendNotificationToPlayer(`
`198`	`197`	`const FLootLockerServerSendNotificationsResponseBP& OnCompletedRequestBP,`
`199`	`198`	`const FLootLockerServerSendNotificationsResponseDelegate& OnCompletedRequest)`
`200`	`199`	`{`
`201`		`- if (!FRegexMatcher(NotificationTypeValidationPattern, *Request.Notification_type).FindNext())`
	`200`	`+ if (!FRegexMatcher(FRegexPattern(NotificationTypeValidationPatternString), Request.Notification_type).FindNext())`
`202`	`201`	`{`
`203`	`202`	`FLootLockerServerSendNotificationsResponse ErrorResponse = LootLockerServerResponseFactory::Error<FLootLockerServerSendNotificationsResponse>("Notification type '" + Request.Notification_type + "' did not match pattern " + NotificationTypeValidationPatternString, LootLockerServerStaticRequestErrorStatusCodes::LL_ERROR_INVALID_INPUT);`
`204`	`203`	`OnCompletedRequestBP.ExecuteIfBound(ErrorResponse);`