Skip to content

Commit ab31917

Browse files
committed
Fixed subflow to use /forms/X instead of /run urls
1 parent 7a4e5ab commit ab31917

File tree

10 files changed

+7
-184
lines changed

10 files changed

+7
-184
lines changed

oauth2-example/1.0.0/Dockerfile

Lines changed: 0 additions & 26 deletions
This file was deleted.

oauth2-example/1.0.0/api.yaml

Lines changed: 0 additions & 53 deletions
This file was deleted.

oauth2-example/1.0.0/docker-compose.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

oauth2-example/1.0.0/env.txt

Lines changed: 0 additions & 4 deletions
This file was deleted.

oauth2-example/1.0.0/requirements.txt

Lines changed: 0 additions & 3 deletions
This file was deleted.

oauth2-example/1.0.0/run

Lines changed: 0 additions & 17 deletions
This file was deleted.

oauth2-example/1.0.0/src/app.py

Lines changed: 0 additions & 61 deletions
This file was deleted.

shuffle-subflow/1.0.0/src/app.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ def run_userinput(self, user_apikey, sms="", email="", subflow="", information="
7777
argument = json.dumps({
7878
"information": information,
7979
"parent_workflow": self.full_execution["workflow"]["id"],
80-
"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"]),
81-
"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"]),
80+
"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"]),
81+
"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"]),
8282
"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"]),
8383
"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"]),
8484
})

shuffle-subflow/1.1.0/src/app.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ def run_userinput(self, user_apikey, sms="", email="", subflow="", information="
6868
if "shuffle-backend" in frontend_url:
6969
frontend_url = ""
7070

71-
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)
72-
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)
73-
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)
71+
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)
72+
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)
73+
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)
7474
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)
7575
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)
7676

shuffle-tools/1.2.0/src/app.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
3737
import concurrent.futures
3838
import multiprocessing
3939

40-
from walkoff_app_sdk.app_base import AppBase
40+
#from walkoff_app_sdk.app_base import AppBase
41+
from shuffle_sdk import AppBase
4142

4243
class Tools(AppBase):
4344
__version__ = "1.2.0"

0 commit comments

Comments
 (0)