Fixed conflicts

Author: frikky

email/1.3.0/requirements.txt

@@ -4,4 +4,4 @@ jsonpickle==2.0.0
 
 eml-parser==2.0.0
 msg-parser==1.2.0
-shuffle_sdk==0.0.28
+shuffle_sdk==0.0.39

email/1.3.0/src/app.py

@@ -83,7 +83,7 @@ def send_email_shuffle(self, apikey, recipients, subject, body):
             "reference_execution": self.current_execution_id,
         }
 
-        url = "https://shuffler.io/functions/sendmail"
+        url = "%s/api/v1/functions/sendmail" % self.url
 
         if apikey.strip() == "" and self.authorization != "standalone":
             apikey = self.authorization
@@ -765,7 +765,7 @@ def send_sms_shuffle(self, apikey, phone_numbers, body):
 
         data = {"numbers": targets, "body": body}
 
-        url = "https://shuffler.io/api/v1/functions/sendsms"
+        url = "%s/api/v1/functions/sendsms" % self.url
         headers = {"Authorization": "Bearer %s" % apikey}
         return requests.post(url, headers=headers, json=data, verify=False).text
 

shuffle-subflow/1.1.0/requirements.txt

@@ -1,2 +1,2 @@
-requests==2.32.4
-shuffle-sdk
+requests==2.32.3
+shuffle-sdk==0.0.39

shuffle-subflow/1.1.0/src/app.py

@@ -208,6 +208,7 @@ def run_subflow(self, user_apikey, workflow, argument, source_workflow="", sourc
             "Authorization": "Bearer %s" % user_apikey,
             "User-Agent": "Shuffle Subflow 1.1.0"
         }
+        self.logger.info("[INFO] Sending a request to %s" % url)
 
         if len(auth_override) > 0:
             headers["appauth"] = auth_override
@@ -224,7 +225,7 @@ def run_subflow(self, user_apikey, workflow, argument, source_workflow="", sourc
             #print(f"ARG: {argument}")
             try:
                 ret = requests.post(url, headers=headers, params=params, json=argument, verify=False, proxies=self.proxy_config)
-                print(f"Successfully sent argument of length {len(str(argument))} as JSON")
+                self.logger.info(f"Successfully sent argument of length {len(str(argument))} as JSON")
             except:
                 try:
                     ret = requests.post(url, headers=headers, json=argument, params=params, verify=False, proxies=self.proxy_config)
@@ -233,8 +234,8 @@ def run_subflow(self, user_apikey, workflow, argument, source_workflow="", sourc
                     ret = requests.post(url, headers=headers, data=argument, params=params, verify=False, proxies=self.proxy_config)
                     print("Successfully sent as data (3)")
 
-        print("Status: %d" % ret.status_code)
-        print("RET: %s" % ret.text)
+        self.logger.info("Status: %d" % ret.status_code)
+        self.logger.info("RET: %s" % ret.text)
 
         return ret.text