From 9784cd2f0151a4b27f89d190bea530f93493d297 Mon Sep 17 00:00:00 2001 From: "Joshua (MordenTral) Statzer" Date: Mon, 7 Mar 2022 08:20:21 -0500 Subject: [PATCH] Merge pull request #25 from lotodore/change_type_to_authtype Rename Login parameter "Type" to "AuthType". Not a relevant change, it predates EOS, but will merge for clarity --- .../AdvancedSessions/Classes/LoginUserCallbackProxy.h | 6 +++--- .../Private/LoginUserCallbackProxy.cpp | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/AdvancedSessions/Source/AdvancedSessions/Classes/LoginUserCallbackProxy.h b/AdvancedSessions/Source/AdvancedSessions/Classes/LoginUserCallbackProxy.h index db6dc34..08bfd4c 100644 --- a/AdvancedSessions/Source/AdvancedSessions/Classes/LoginUserCallbackProxy.h +++ b/AdvancedSessions/Source/AdvancedSessions/Classes/LoginUserCallbackProxy.h @@ -21,8 +21,8 @@ class ULoginUserCallbackProxy : public UOnlineBlueprintCallProxyBase FEmptyOnlineDelegate OnFailure; // Logs into the identity interface - UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject", AdvancedDisplay = "Type"), Category = "Online|AdvancedIdentity") - static ULoginUserCallbackProxy* LoginUser(UObject* WorldContextObject, class APlayerController* PlayerController, FString UserID, FString UserToken, FString Type); + UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject", AdvancedDisplay = "AuthType"), Category = "Online|AdvancedIdentity") + static ULoginUserCallbackProxy* LoginUser(UObject* WorldContextObject, class APlayerController* PlayerController, FString UserID, FString UserToken, FString AuthType); // UOnlineBlueprintCallProxyBase interface virtual void Activate() override; @@ -42,7 +42,7 @@ private: // The user pass / token FString UserToken; - FString Type; + FString AuthType; // The delegate executed by the online subsystem FOnLoginCompleteDelegate Delegate; diff --git a/AdvancedSessions/Source/AdvancedSessions/Private/LoginUserCallbackProxy.cpp b/AdvancedSessions/Source/AdvancedSessions/Private/LoginUserCallbackProxy.cpp index 3c9fb54..103354b 100644 --- a/AdvancedSessions/Source/AdvancedSessions/Private/LoginUserCallbackProxy.cpp +++ b/AdvancedSessions/Source/AdvancedSessions/Private/LoginUserCallbackProxy.cpp @@ -12,13 +12,13 @@ ULoginUserCallbackProxy::ULoginUserCallbackProxy(const FObjectInitializer& Objec { } -ULoginUserCallbackProxy* ULoginUserCallbackProxy::LoginUser(UObject* WorldContextObject, class APlayerController* PlayerController, FString UserID, FString UserToken, FString Type) +ULoginUserCallbackProxy* ULoginUserCallbackProxy::LoginUser(UObject* WorldContextObject, class APlayerController* PlayerController, FString UserID, FString UserToken, FString AuthType) { ULoginUserCallbackProxy* Proxy = NewObject(); Proxy->PlayerControllerWeakPtr = PlayerController; Proxy->UserID = UserID; Proxy->UserToken = UserToken; - Proxy->Type = Type; + Proxy->AuthType = AuthType; Proxy->WorldContextObject = WorldContextObject; return Proxy; } @@ -45,12 +45,12 @@ void ULoginUserCallbackProxy::Activate() if (Identity.IsValid()) { // Fallback to default AuthType if nothing is specified - if (Type.IsEmpty()) + if (AuthType.IsEmpty()) { - Type = Identity->GetAuthType(); + AuthType = Identity->GetAuthType(); } DelegateHandle = Identity->AddOnLoginCompleteDelegate_Handle(Player->GetControllerId(), Delegate); - FOnlineAccountCredentials AccountCreds(Type, UserID, UserToken); + FOnlineAccountCredentials AccountCreds(AuthType, UserID, UserToken); Identity->Login(Player->GetControllerId(), AccountCreds); return; }