Merge pull request #203 from 0xsequence/jd/retry_intents

Jd/retry intents

Author: colezemind

Plugins/SequencePlugin/Source/SequencePlugin/Private/RequestHandler.cpp

@@ -121,8 +121,10 @@ void URequestHandler::ProcessAndThen(TFunction<void(UTexture2D*)> OnSuccess, FFa
 			if (!Response.IsValid())
 			{
 				OnFailure(FSequenceError(RequestFail, "The Request is invalid!"));
+			} else
+			{
+				OnFailure(FSequenceError(RequestFail, "Request failed: " + Response->GetContentAsString()));
 			}
-			OnFailure(FSequenceError(RequestFail, "Request failed: " + Response->GetContentAsString()));
 		}//if wasn't successful
 		//catch all error case!
 		OnFailure(FSequenceError(RequestFail, "Failed to build QR Image data"));
@@ -132,32 +134,51 @@ void URequestHandler::ProcessAndThen(TFunction<void(UTexture2D*)> OnSuccess, FFa
 void URequestHandler::ProcessAndThen(TFunction<void (FString)> OnSuccess, FFailureCallback OnFailure) const
 {
 	Process().BindLambda([OnSuccess, OnFailure](FHttpRequestPtr Req, const FHttpResponsePtr& Response, const bool bWasSuccessful)
+	{
+		FString CurlCommand = FString::Printf(
+			TEXT("curl -X %s \"%s\" -H \"Content-Type: application/json\" -H \"Accept: application/json\" -H \"X-Access-Key: %s\" --data \"%s\""),
+			*Req->GetVerb(),                
+			*Req->GetURL(),                 
+			*Req->GetHeader("X-Access-Key"),
+			*FString::Printf(TEXT("%s"),*FString(UTF8_TO_TCHAR(Req->GetContent().GetData())).Replace(TEXT("\""), TEXT("\\\"")))
+		);
+
+		SEQ_LOG_EDITOR(Log,TEXT("%s"), *CurlCommand);
+		SEQ_LOG_EDITOR(Log,TEXT("%s"), *Response->GetContentAsString());
+
+		if (bWasSuccessful)
 		{
-			FString CurlCommand = FString::Printf(
-				TEXT("curl -X %s \"%s\" -H \"Content-Type: application/json\" -H \"Accept: application/json\" -H \"X-Access-Key: %s\" --data \"%s\""),
-				*Req->GetVerb(),                
-				*Req->GetURL(),                 
-				*Req->GetHeader("X-Access-Key"),
-				*FString::Printf(TEXT("%s"),*FString(UTF8_TO_TCHAR(Req->GetContent().GetData())).Replace(TEXT("\""), TEXT("\\\"")))
-			);
-
-			SEQ_LOG_EDITOR(Log,TEXT("%s"), *CurlCommand);
-			SEQ_LOG_EDITOR(Log,TEXT("%s"), *Response->GetContentAsString());
-
-			if (bWasSuccessful)
+			OnSuccess(Response->GetContentAsString());
+		}
+		else
+		{
+			if(Response.IsValid())
 			{
-				OnSuccess(Response->GetContentAsString());
+				OnFailure(FSequenceError(RequestFail, "Request is invalid" + Response->GetContentAsString()));
 			}
 			else
 			{
-				if (Response.IsValid())
-				{
-					OnFailure(FSequenceError(RequestFail, "Request is invalid" + Response->GetContentAsString()));
-				}
-				else
-				{
-					OnFailure(FSequenceError(RequestFail, "Request failed: No response received!"));
-				}
+				OnFailure(FSequenceError(RequestFail, "Request failed: No response received!"));
 			}
-		});
+		}
+	});
+}
+
+void URequestHandler::ProcessAndThen(TSuccessCallback<FHttpResponsePtr> OnSuccess,
+                                     const FFailureCallback& OnFailure) const
+{
+	Process().BindLambda([OnSuccess, OnFailure](FHttpRequestPtr Req, const FHttpResponsePtr& Response, const bool bWasSuccessful)
+	{		
+		if(bWasSuccessful)
+		{
+			OnSuccess(Response);
+		}
+		else
+		{
+			if(!Response.IsValid())
+				OnFailure(FSequenceError(RequestFail, "The Request is invalid!"));
+			else
+				OnFailure(FSequenceError(RequestFail, "Request failed: " + Response->GetContentAsString()));
+		}
+	});
 }

Plugins/SequencePlugin/Source/SequencePlugin/Private/RequestHandler.h

@@ -37,4 +37,5 @@ class SEQUENCEPLUGIN_API URequestHandler : public UObject
 	FHttpRequestCompleteDelegate& Process() const;
 	void ProcessAndThen(TFunction<void(UTexture2D*)> OnSuccess, FFailureCallback OnFailure);
 	void ProcessAndThen(TFunction<void (FString)> OnSuccess, FFailureCallback OnFailure) const;
+	void ProcessAndThen(TSuccessCallback<FHttpResponsePtr> OnSuccess, const FFailureCallback& OnFailure) const;
 };