Merge

Author: bphelan

Source/Immutable/Private/Immutable/Actions/ImtblPassportConfirmCodeAsyncAction.cpp

@@ -22,7 +22,7 @@ void UImtblPassportConnectAsyncAction::Activate()
     {
         FString Err = "Connect failed due to missing world or world context object.";
         IMTBL_WARN("%s", *Err)
-        Failed.Broadcast(Err, TEXT(""), TEXT(""), TEXT(""));
+        Failed.Broadcast(Err);
         return;
     }
 
@@ -35,29 +35,19 @@ void UImtblPassportConnectAsyncAction::DoConnect(TWeakObjectPtr<UImtblJSConnecto
     // Get Passport
     auto Passport = GetSubsystem()->GetPassport();
     // Run Connect
-    Passport->Connect(UImmutablePassport::FImtblPassportResponseDelegate::CreateUObject(this, &UImtblPassportConnectAsyncAction::OnConnectCodeReady));
+    Passport->Connect(UImmutablePassport::FImtblPassportResponseDelegate::CreateUObject(this, &UImtblPassportConnectAsyncAction::OnConnect));
 }
 
 
-void UImtblPassportConnectAsyncAction::OnConnectCodeReady(FImmutablePassportResult Result)
+void UImtblPassportConnectAsyncAction::OnConnect(FImmutablePassportResult Result)
 {
     if (Result.Success)
     {
-        if (auto Data = FImmutablePassportConnectData::FromJsonString(Result.Message))
-        {
-            ConnectData = Data.GetValue();
-            
-            CodeReady.Broadcast(TEXT(""), ConnectData.code, ConnectData.deviceCode, ConnectData.url);
-        }
-        else
-        {
-            IMTBL_WARN("Could not deserialize connect data.")
-            Failed.Broadcast(Result.Message, TEXT(""), TEXT(""), TEXT(""));
-        }
+        Success.Broadcast(TEXT(""));
     }
     else
     {
-        Failed.Broadcast(Result.Message, TEXT(""), TEXT(""), TEXT(""));
+        Failed.Broadcast(Result.Message);
     }
 }
 

Source/Immutable/Private/Immutable/Actions/ImtblPassportConnectAsyncAction.cpp

@@ -157,10 +157,11 @@ void UImmutablePassport::Connect(const FImtblPassportResponseDelegate& ResponseD
 }
 
 
-void UImmutablePassport::ConfirmCode(const FString& DeviceCode, const FImtblPassportResponseDelegate& ResponseDelegate)
+void UImmutablePassport::ConfirmCode(const FString& DeviceCode, const float Interval, const FImtblPassportResponseDelegate& ResponseDelegate)
 {
     FImmutablePassportCodeConfirmRequestData Data;
     Data.deviceCode = DeviceCode;
+    Data.interval = Interval;
     CallJS(
         ImmutablePassportAction::ConfirmCode,
         Data.ToJsonString(),
@@ -365,22 +366,28 @@ void UImmutablePassport::OnConnectResponse(FImtblJSResponse Response)
 {
     if (auto ResponseDelegate = GetResponseDelegate(Response))
     {
-        auto ConnectData = FImmutablePassportConnectData::FromJsonObject(Response.JsonObject);
-        
-        FString Msg;
-        bool bSuccess = true;
+        const auto ConnectData = FImmutablePassportConnectData::FromJsonObject(Response.JsonObject);
         if (!Response.success || !ConnectData || !ConnectData->code.Len())
         {
+            FString Msg;
             IMTBL_LOG("Connect attempt failed.");
             if (Response.Error.IsSet())
+            {
                 Msg = Response.Error->ToString();
-            bSuccess = false;
+            }
+            ResponseDelegate->ExecuteIfBound(FImmutablePassportResult{false, Msg});
+            return;
         }
-        else
+        FString Err;
+        FPlatformProcess::LaunchURL(*ConnectData->url, nullptr, &Err);
+        if (!Err.Len())
         {
-            Msg = ConnectData->ToJsonString();
+            FString Msg = "Failed to connect to Browser: " + Err;
+            IMTBL_ERR("%s", *Msg);
+            ResponseDelegate->ExecuteIfBound(FImmutablePassportResult{false, Msg});
+            return;
         }
-        ResponseDelegate->ExecuteIfBound(FImmutablePassportResult{bSuccess, Msg});
+        ConfirmCode(ConnectData->deviceCode, ConnectData->interval, ResponseDelegate.GetValue());
     }
 }
 

Source/Immutable/Private/Immutable/ImmutablePassport.cpp

@@ -16,7 +16,7 @@ class IMMUTABLE_API UImtblPassportConnectAsyncAction : public UImtblBlueprintAsy
 {
     GENERATED_BODY()
 
-    DECLARE_DYNAMIC_MULTICAST_DELEGATE_FourParams(FPassportConnectOutputPin, FString, ErrorMessage, FString, Code, FString, DeviceCode, FString, Url);
+    DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FPassportConnectOutputPin, FString, ErrorMessage);
 
 public:
     UFUNCTION(BlueprintCallable, meta = (WorldContext = "WorldContextObject", BlueprintInternalUseOnly = "true"), Category = "Immutable")
@@ -28,10 +28,10 @@ class IMMUTABLE_API UImtblPassportConnectAsyncAction : public UImtblBlueprintAsy
     FImmutablePassportConnectData ConnectData;
 
     void DoConnect(TWeakObjectPtr<class UImtblJSConnector> JSConnector);
-    void OnConnectCodeReady(FImmutablePassportResult Result);
+    void OnConnect(FImmutablePassportResult Result);
 
     UPROPERTY(BlueprintAssignable)
-    FPassportConnectOutputPin CodeReady;
+    FPassportConnectOutputPin Success;
     UPROPERTY(BlueprintAssignable)
     FPassportConnectOutputPin Failed;
 };

Source/Immutable/Public/Immutable/Actions/ImtblPassportConfirmCodeAsyncAction.h

@@ -127,7 +127,6 @@ class IMMUTABLE_API UImmutablePassport : public UObject
     void ConnectSilent(const FImtblPassportResponseDelegate& ResponseDelegate);
     void Logout(const FImtblPassportResponseDelegate& ResponseDelegate);
     void Connect(const FImtblPassportResponseDelegate& ResponseDelegate);
-    void ConfirmCode(const FString& DeviceCode, const FImtblPassportResponseDelegate& ResponseDelegate);
     void GetAddress(const FImtblPassportResponseDelegate& ResponseDelegate);
     void GetEmail(const FImtblPassportResponseDelegate& ResponseDelegate);
 
@@ -149,6 +148,7 @@ class IMMUTABLE_API UImmutablePassport : public UObject
     void CallJS(const FString& Action, const FString& Data, const FImtblPassportResponseDelegate& ClientResponseDelegate, const FImtblJSResponseDelegate& HandleJSResponse, const bool bCheckInitialized = true);
     // Pulls the ResponseDelegate from the ResponseDelegates map and returns it
     TOptional<FImtblPassportResponseDelegate> GetResponseDelegate(const FImtblJSResponse& Response);
+    void ConfirmCode(const FString& DeviceCode, const float Interval, const FImtblPassportResponseDelegate& ResponseDelegate);
 
     void OnInitializeResponse(FImtblJSResponse Response);
     void OnCheckStoredCredentialsResponse(FImtblJSResponse Response);

Source/Immutable/Public/Immutable/Actions/ImtblPassportConnectAsyncAction.h

@@ -22,7 +22,6 @@ class IMMUTABLE_API UImmutableSubsystem : public UGameInstanceSubsystem
     friend class UImtblPassportHasStoredCredentialsAsyncAction;
     friend class UImtblPassportConnectSilentAsyncAction;
     friend class UImtblPassportConnectAsyncAction;
-    friend class UImtblPassportConfirmCodeAsyncAction;
     friend class UImtblPassportLogoutAsyncAction;
     friend class UImtblPassportGetAddressAsyncAction;
     friend class UImtblPassportGetEmailAsyncAction;