Rework user-session to get only relevant parameters

Author: RicardRC

Satori/Source/SatoriUnreal/Private/SatoriSession.cpp

@@ -21,76 +21,17 @@ void USatoriSession::SetupSession(const FString& AuthResponse)
     	SessionData.RefreshToken = RefreshToken;
     	_RefreshToken = RefreshToken;
 
-    	// Check if the "created" field is available and set IsCreated accordingly
-    	bool IsSessionCreated;
-    	if (JsonObject->TryGetBoolField(TEXT("created"), IsSessionCreated))
+		const TSharedPtr<FJsonObject>* PropertiesJson = nullptr;
+    	if (JsonObject->TryGetObjectField(TEXT("properties"), PropertiesJson))
     	{
-    		SessionData.IsCreated = IsSessionCreated;
-    		_IsCreated = IsSessionCreated;
+			FSatoriProperties Properties = FSatoriProperties(*PropertiesJson);
+			SessionData.Properties = Properties;
+    		_Properties = Properties;
     	}
-
-        TSharedPtr<FJsonObject> PayloadJson;
-        if (ParseJwtPayload(Token, PayloadJson))
-        {
-            FString UserId;
-            FString Username;
-            PayloadJson->TryGetStringField(TEXT("uid"), UserId);
-            PayloadJson->TryGetStringField(TEXT("usn"), Username);
-
-            SessionData.Username = Username;
-        	_Username = Username;
-            SessionData.UserId = UserId;
-        	_UserId = UserId;
-
-            TMap<FString, FString> InVars;
-            if (PayloadJson->HasField(TEXT("vrs")))
-            {
-                const TSharedPtr<FJsonObject>& VarsJson = PayloadJson->GetObjectField(TEXT("vrs"));
-                for (const auto& Entry : VarsJson->Values)
-                {
-                    FString Key = Entry.Key;
-                    FString Value = Entry.Value->AsString();
-                    SessionData.Variables.Add(Key, Value);
-                	_Variables.Add(Key, Value);
-                }
-            }
-
-            int64 Expires;
-            if (PayloadJson->TryGetNumberField(TEXT("exp"), Expires))
-            {
-                FDateTime ExpireTime = FDateTime::FromUnixTimestamp(Expires);
-                SessionData.ExpireTime = ExpireTime;
-            	_ExpireTime = ExpireTime;
-                SessionData.IsExpired = (FDateTime::UtcNow() >= ExpireTime);
-            	_IsExpired = (FDateTime::UtcNow() >= ExpireTime);
-            }
-
-            // Parse and check expiration time of the refresh_token
-            TSharedPtr<FJsonObject> RefreshPayloadJson;
-            if (ParseJwtPayload(RefreshToken, RefreshPayloadJson))
-            {
-                int64 RefreshExpires;
-                if (RefreshPayloadJson->TryGetNumberField(TEXT("exp"), RefreshExpires))
-                {
-                    FDateTime RefreshExpireTime = FDateTime::FromUnixTimestamp(RefreshExpires);
-                    SessionData.RefreshExpireTime = RefreshExpireTime;
-                	_RefreshExpireTime = RefreshExpireTime;
-                    SessionData.IsRefreshExpired = (FDateTime::UtcNow() >= RefreshExpireTime);
-                	_IsRefreshExpired = (FDateTime::UtcNow() >= RefreshExpireTime);
-                }
-            }
-
-            SessionData.CreateTime = FDateTime::UtcNow();
-        	_CreateTime = FDateTime::UtcNow();
-        }
-        else
-        {
-        	SATORI_LOG_ERROR(TEXT("Failed to parse JWT payload"));
-        }
     }
     else
     {
-    	SATORI_LOG_ERROR(TEXT("Failed to deserialize Session JSON object"));
+    	SATORI_LOG_ERROR(TEXT("Failed to deserialize Satori Session JSON object"));
     }
 }
 
@@ -104,136 +45,17 @@ const FString USatoriSession::GetRefreshToken() const
 	return _RefreshToken;
 }
 
-bool USatoriSession::IsCreated() const
-{
-	return _IsCreated;
-}
-
-const FString USatoriSession::GetUsername() const
-{
-	return _Username;
-}
-
-const FString USatoriSession::GetUserId() const
-{
-	return _UserId;
-}
-
-const FDateTime USatoriSession::GetCreateTime() const
-{
-	return _CreateTime;
-}
-
-const FDateTime USatoriSession::GetExpireTime() const
-{
-	return _ExpireTime;
-}
-
-const FDateTime USatoriSession::GetRefreshExpireTime() const
-{
-	return _RefreshExpireTime;
-}
-
-bool USatoriSession::IsExpired() const
-{
-	return FDateTime::UtcNow() >= _ExpireTime;
-}
-
-bool USatoriSession::IsExpiredTime(FDateTime Time) const
+const FSatoriProperties USatoriSession::GetProperties() const
 {
-	return Time >= _ExpireTime;
-}
-
-bool USatoriSession::IsRefreshExpired() const
-{
-	return FDateTime::UtcNow() >= _RefreshExpireTime;
-}
-
-bool USatoriSession::IsRefreshExpiredTime(FDateTime Time) const
-{
-	return Time >= _RefreshExpireTime;
-}
-
-TMap<FString, FString> USatoriSession::GetVariables() const
-{
-	return _Variables;
-}
-
-FString USatoriSession::GetVariable(FString Name) const
-{
-	return _Variables.FindRef(Name);
+	return _Properties;
 }
 
 USatoriSession* USatoriSession::RestoreSession(FString Token, FString RefreshToken)
 {
-	// Setup the request content
-	const TSharedPtr<FJsonObject> ContentJson = MakeShared<FJsonObject>();
-	ContentJson->SetStringField(TEXT("token"), Token);
-	ContentJson->SetStringField(TEXT("refresh_token"), RefreshToken);
-	ContentJson->SetBoolField(TEXT("created"), false);
-
-	// Convert the JSON object to a JSON string
-	FString JsonString;
-	TSharedRef<TJsonWriter<>> JsonWriter = TJsonWriterFactory<>::Create(&JsonString);
-	bool bSerializationSuccessful = FJsonSerializer::Serialize(ContentJson.ToSharedRef(), JsonWriter);
-
-	// Check if serialization was successful
-	if (bSerializationSuccessful)
-	{
-		USatoriSession* ResultSession = NewObject<USatoriSession>();
-		ResultSession->SetupSession(JsonString);
-		return ResultSession;
-	}
-	else
-	{
-		SATORI_LOG_ERROR("Restore Session: Failed to serialize Restore Session JSON object");
-		return nullptr;
-	}
-}
-
-bool USatoriSession::ParseJwtPayload(const FString& jwt, TSharedPtr<FJsonObject>& payloadJson)
-{
-	// Split the JWT into its three parts
-	TArray<FString> jwtParts;
-	jwt.ParseIntoArray(jwtParts, TEXT("."));
-
-	if (jwtParts.Num() != 3)
-	{
-		// Invalid JWT format
-		return false;
-	}
-
-	// Convert Base64Url to Base64
-	FString payloadString = jwtParts[1];
-	payloadString.ReplaceInline(TEXT("-"), TEXT("+"));
-	payloadString.ReplaceInline(TEXT("_"), TEXT("/"));
-
-	// Handle padding
-	int32 mod = payloadString.Len() % 4;
-	if (mod != 0) {
-		for (int32 i = 0; i < (4 - mod); ++i) {
-			payloadString += TEXT("=");
-		}
-	}
-
-	// Decode to bytes
-	TArray<uint8> decodedBytes;
-	FBase64::Decode(payloadString, decodedBytes);
-
-	// Ensure null termination
-	decodedBytes.Add(0);
-
-	// Convert UTF-8 bytes to FString to handle special characters
-	FString decodedPayloadString = FString(UTF8_TO_TCHAR(reinterpret_cast<const ANSICHAR*>(decodedBytes.GetData())));
-
-	// Parse the decoded payload as a JSON object
-	TSharedRef<TJsonReader<>> reader = TJsonReaderFactory<>::Create(decodedPayloadString);
-	if (!FJsonSerializer::Deserialize(reader, payloadJson))
-	{
-		// Failed to parse JSON
-		return false;
-	}
-
-	return true;
+	USatoriSession* ResultSession = NewObject<USatoriSession>();
+	ResultSession->SessionData.AuthToken = Token;
+	ResultSession->_AuthToken = Token;
+	ResultSession->SessionData.RefreshToken = RefreshToken;
+	ResultSession->_RefreshToken = RefreshToken;
+	return ResultSession;
 }
-

Satori/Source/SatoriUnreal/Private/SatoriUserSession.cpp

@@ -1,6 +1,6 @@
 #include "SatoriUserSession.h"
 
-FSatoriUserSession::FSatoriUserSession(): IsCreated(false), CreateTime(FDateTime::MinValue()), ExpireTime(FDateTime::MinValue()), IsExpired(false), IsRefreshExpired(false)
+FSatoriUserSession::FSatoriUserSession()
 {
 
 }

Satori/Source/SatoriUnreal/Public/SatoriSession.h

@@ -37,93 +37,10 @@ class SATORIUNREAL_API USatoriSession : public UObject
 	const FString GetRefreshToken() const;
 
 	/**
-	 * @return <c>True</c> if the user account for this session was just created.
+	 * @return The refresh properties used to construct this session.
 	 */
 	UFUNCTION(BlueprintPure, Category = "Satori|Authentication")
-	bool IsCreated() const;
-
-	/**
-	 * @return The username of the user who owns this session.
-	 */
-	UFUNCTION(BlueprintPure, Category = "Satori|Authentication")
-	const FString GetUsername() const;
-
-	/**
-	 * @return The ID of the user who owns this session.
-	 */
-	UFUNCTION(BlueprintPure, Category = "Satori|Authentication")
-	const FString GetUserId() const;
-
-	/**
-	 * @return The timestamp in milliseconds when this session object was created.
-	 */
-	UFUNCTION(BlueprintPure, Category = "Satori|Authentication")
-	const FDateTime GetCreateTime() const;
-
-	/**
-	 * @return The timestamp in milliseconds when this session will expire.
-	 */
-	UFUNCTION(BlueprintPure, Category = "Satori|Authentication")
-	const FDateTime GetExpireTime() const;
-
-	/**
-	 * @return The timestamp in milliseconds when the refresh token will expire.
-	 */
-	UFUNCTION(BlueprintPure, Category = "Satori|Authentication")
-	const FDateTime GetRefreshExpireTime() const;
-
-	/**
-		 * @return <c>True</c> if the session has expired against the current time.
-		 */
-	UFUNCTION(BlueprintPure, Category = "Satori|Authentication")
-	bool IsExpired() const;
-
-	/**
-	 * Check if the session's token has expired against the input time.
-	 *
-	 * @param Time The time to compare against the session.
-	 *        Use getUnixTimestampMs() to get current time.
-	 * @return <c>true</c> if the session has expired.
-	 */
-	UFUNCTION(BlueprintPure, Category = "Satori|Authentication")
-	bool IsExpiredTime(FDateTime Time) const;
-
-	/**
-	 * Check if the session's token has expired against the input time.
-	 *
-	 * @param now The time to compare against the session.
-	 *        Use getUnixTimestampMs() to get current time.
-	 * @return <c>true</c> if the session has expired.
-	 */
-	UFUNCTION(BlueprintPure, Category = "Satori|Authentication")
-	bool IsRefreshExpired() const;
-
-	/**
-	 * Check if the session's refresh token has expired against the input time.
-	 *
-	 * @param Time The time to compare against the session.
-	 *        Use getUnixTimestampMs() to get current time.
-	 * @return <c>true</c> if the session has expired.
-	 */
-	UFUNCTION(BlueprintPure, Category = "Satori|Authentication")
-	bool IsRefreshExpiredTime(FDateTime Time) const;
-
-	/**
-	 * Get session variables.
-	 *
-	 * @return Variables.
-	 */
-	UFUNCTION(BlueprintPure, Category = "Satori|Authentication")
-	TMap<FString, FString> GetVariables() const;
-
-	/**
-	 * Get session variable value by name.
-	 *
-	 * @param Name Value Key
-	 * @return Variable for this key, or empty string if not found.
-	 */
-	UFUNCTION(BlueprintPure, Category = "Satori|Authentication")
-	FString GetVariable(FString Name) const;
+	const FSatoriProperties GetProperties() const;
 
 	/**
 	 * Restore User Session
@@ -138,15 +55,5 @@ class SATORIUNREAL_API USatoriSession : public UObject
 
 	FString _AuthToken;
 	FString _RefreshToken;
-	bool _IsCreated;
-	FString _Username;
-	FString _UserId;
-	FDateTime _CreateTime;
-	FDateTime _ExpireTime;
-	FDateTime _RefreshExpireTime;
-	bool _IsExpired;
-	bool _IsRefreshExpired;
-	TMap<FString, FString> _Variables;
-
-	bool ParseJwtPayload(const FString& jwt, TSharedPtr<FJsonObject>& payloadJson);
+	FSatoriProperties _Properties;
 };