Merge branch 'master' of github.com:Shuffle/python-apps

email/1.3.0/api.yaml

@@ -24,7 +24,7 @@ actions:
       - name: recipients
         description: The recipients of the email
         multiline: false
-        example: "[email protected],frikky@shuffler.io"
+        example: "[email protected],support@shuffler.io"
         required: true
         schema:
           type: string
@@ -51,7 +51,7 @@ actions:
       - name: username
         description: The SMTP login username
         multiline: false
-        example: "frikky@shuffler.io"
+        example: "support@shuffler.io"
         required: false 
         schema:
           type: string
@@ -79,14 +79,14 @@ actions:
       - name: recipient
         description: The receiver(s) of the email
         multiline: false
-        example: "frikky@shuffler.io,frikky@shuffler.io"
+        example: "support@shuffler.io,test@shuffler.io"
         required: true
         schema:
           type: string
       - name: cc_emails
         description: cc_emails
         multiline: false
-        example: "frikky@shuffler.io,frikky@shuffler.io"
+        example: "support@shuffler.io,test@shuffler.io"
         required: false
         schema:
           type: string
@@ -138,7 +138,7 @@ actions:
       - name: username
         description: The SMTP login username
         multiline: false
-        example: "frikky@shuffler.io"
+        example: "support@shuffler.io"
         required: true
         schema:
           type: string

email/1.3.0/src/app.py

@@ -74,15 +74,15 @@ def send_email_shuffle(self, apikey, recipients, subject, body):
         headers = {"Authorization": "Bearer %s" % apikey}
         return requests.post(url, headers=headers, json=data).text
 
-    def send_email_smtp(
-        self, smtp_host, recipient, subject, body, smtp_port, attachments="", username="", password="", ssl_verify="True", body_type="html", cc_emails=""
-    ):
+    def send_email_smtp(self, smtp_host, recipient, subject, body, smtp_port, attachments="", username="", password="", ssl_verify="True", body_type="html", cc_emails=""):
+        self.logger.info("Sending email to %s with subject %s" % (recipient, subject))
         if type(smtp_port) == str:
             try:
                 smtp_port = int(smtp_port)
             except ValueError:
                 return "SMTP port needs to be a number (Current: %s)" % smtp_port
 
+        self.logger.info("Pre SMTP setup")
         try:
             s = smtplib.SMTP(host=smtp_host, port=smtp_port)
         except socket.gaierror as e:
@@ -95,6 +95,7 @@ def send_email_smtp(
         else:
             s.starttls()
 
+        self.logger.info("Pre SMTP auth")
         if len(username) > 1 or len(password) > 1:
             try:
                 s.login(username, password)
@@ -108,6 +109,7 @@ def send_email_smtp(
             body_type = "html"
 
         # setup the parameters of the message
+        self.logger.info("Pre mime multipart")
         msg = MIMEMultipart()
         msg["From"] = username
         msg["To"] = recipient
@@ -116,10 +118,12 @@ def send_email_smtp(
         if cc_emails != None and len(cc_emails) > 0:
             msg["Cc"] = cc_emails
 
+        self.logger.info("Pre mime check")
         msg.attach(MIMEText(body, body_type))
 
         # Read the attachments
         attachment_count = 0
+        self.logger.info("Pre attachments")
         try:
             if attachments != None and len(attachments) > 0:
                 print("Got attachments: %s" % attachments)
@@ -153,7 +157,7 @@ def send_email_smtp(
         except Exception as e:
             self.logger.info(f"Error in attachment parsing for email: {e}")
 
-
+        self.logger.info("Pre send msg")
         try:
             s.send_message(msg)
         except smtplib.SMTPDataError as e: 

shuffle-subflow/1.0.0/src/app.py

@@ -77,8 +77,8 @@ def run_userinput(self, user_apikey, sms="", email="", subflow="", information="
                 argument = json.dumps({
                     "information": information,
                     "parent_workflow": self.full_execution["workflow"]["id"],
-                    "frontend_continue": "%s/workflows/%s/run?authorization=%s&reference_execution=%s&answer=true" % (frontend_url, self.full_execution["workflow"]["id"], self.full_execution["authorization"], self.full_execution["execution_id"]),
-                    "frontend_abort": "%s/workflows/%s/run?authorization=%s&reference_execution=%s&answer=false" % (frontend_url, self.full_execution["workflow"]["id"], self.full_execution["authorization"], self.full_execution["execution_id"]),
+                    "frontend_continue": "%s/forms/%s?authorization=%s&reference_execution=%s&answer=true" % (frontend_url, self.full_execution["workflow"]["id"], self.full_execution["authorization"], self.full_execution["execution_id"]),
+                    "frontend_abort": "%s/forms/%s?authorization=%s&reference_execution=%s&answer=false" % (frontend_url, self.full_execution["workflow"]["id"], self.full_execution["authorization"], self.full_execution["execution_id"]),
                     "api_continue": "%s/api/v1/workflows/%s/execute?authorization=%s&reference_execution=%s&answer=true" % (frontend_url, self.full_execution["workflow"]["id"], self.full_execution["authorization"], self.full_execution["execution_id"]),
                     "api_abort": "%s/api/v1/workflows/%s/execute?authorization=%s&reference_execution=%s&answer=false" % (frontend_url, self.full_execution["workflow"]["id"], self.full_execution["authorization"], self.full_execution["execution_id"]),
                 })

shuffle-subflow/1.1.0/src/app.py

@@ -68,9 +68,9 @@ def run_userinput(self, user_apikey, sms="", email="", subflow="", information="
         if "shuffle-backend" in frontend_url:
             frontend_url = ""
 
-        explore_path = "%s/workflows/%s/run?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/workflows/%s/run?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/workflows/%s/run?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)
+        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)
 

shuffle-tools/1.2.0/src/app.py

@@ -38,6 +38,7 @@
 import multiprocessing
 
 from walkoff_app_sdk.app_base import AppBase
+#from shuffle_sdk import AppBase
 
 class Tools(AppBase):
     __version__ = "1.2.0"