Fixed user input multi region url problem

Author: frikky

http/1.0.0/requirements.txt

@@ -1,2 +1,3 @@
 uncurl==0.0.10
-requests==2.32.2
+requests==2.32.2
+shuffle-sdk==0.0.26

http/1.0.0/src/app.py

@@ -8,7 +8,7 @@
 import requests
 import subprocess
 
-from walkoff_app_sdk.app_base import AppBase
+from shuffle_sdk import AppBase 
 
 class HTTP(AppBase):
     __version__ = "1.0.0"

shuffle-ai/1.0.0/src/app.py

@@ -456,8 +456,6 @@ def run_schemaless(self, category, action, app_name="", fields=""):
         if app_name:
             data["app_name"] = app_name
 
-        self.logger.info(f"\n\nFIELDS MAPPED\n\n: {fields}")
-
         if fields:
             if isinstance(fields, list):
                 data["fields"] = fields
@@ -522,7 +520,12 @@ def run_schemaless(self, category, action, app_name="", fields=""):
             self.logger.info("[ERROR] Failed to get response headers (category action url debug mapping): %s" % e)
 
         try: 
-            return request.json()
+            data = request.json()
+
+            #if "success" in data and "result" in data and "errors" in data:
+            #    return data["result"]
+
+            return data
         except:
             return request.text
 

shuffle-subflow/1.1.0/src/app.py

@@ -68,11 +68,16 @@ def run_userinput(self, user_apikey, sms="", email="", subflow="", information="
         if "shuffle-backend" in frontend_url:
             frontend_url = ""
 
+        api_continue_url = "%s/api/v1/workflows/%s/execute?authorization=%s&reference_execution=%s&answer=true&source_node=%s" % (frontend_url, self.full_execution["workflow"]["id"], self.full_execution["authorization"], self.full_execution["execution_id"], source_node)
+        api_abort_url = "%s/api/v1/workflows/%s/execute?authorization=%s&reference_execution=%s&answer=false&source_node=%s" % (frontend_url, self.full_execution["workflow"]["id"], self.full_execution["authorization"], self.full_execution["execution_id"], source_node)
+
+        # Remove subdomain before .shuffler.io so that https://*.shuffler.io -> https://shuffler.io
+        if ".shuffler.io" in frontend_url:
+            frontend_url = "https://shuffler.io"
+
         explore_path = "%s/forms/%s?authorization=%s&reference_execution=%s&source_node=%s" % (frontend_url, self.full_execution["workflow"]["id"], self.full_execution["authorization"], self.full_execution["execution_id"], source_node)
         frontend_continue_url = "%s/forms/%s?authorization=%s&reference_execution=%s&answer=true&source_node=%s" % (frontend_url, self.full_execution["workflow"]["id"], self.full_execution["authorization"], self.full_execution["execution_id"], source_node)
         frontend_abort_url = "%s/forms/%s?authorization=%s&reference_execution=%s&answer=false&source_node=%s" % (frontend_url, self.full_execution["workflow"]["id"], self.full_execution["authorization"], self.full_execution["execution_id"], source_node)
-        api_continue_url = "%s/api/v1/workflows/%s/execute?authorization=%s&reference_execution=%s&answer=true&source_node=%s" % (frontend_url, self.full_execution["workflow"]["id"], self.full_execution["authorization"], self.full_execution["execution_id"], source_node)
-        api_abort_url = "%s/api/v1/workflows/%s/execute?authorization=%s&reference_execution=%s&answer=false&source_node=%s" % (frontend_url, self.full_execution["workflow"]["id"], self.full_execution["authorization"], self.full_execution["execution_id"], source_node)
 
         result["links"]["frontend_no_answer"] = explore_path
         result["links"]["frontend_continue"] = frontend_continue_url