Merge branch 'main' of https://github.com/shuffle/shuffle-shared

Shuffle · May 26, 2024 · 4de3df8 · 4de3df8
2 parents 5d54006 + 141f8f2
commit 4de3df8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/shared.go b/shared.go
@@ -18097,7 +18097,7 @@ func PrepareWorkflowExecution(ctx context.Context, workflow Workflow, request *h
 								backupApikey = user.ApiKey
 							}
 
-							if len(user.Orgs) == 1 || user.ActiveOrg.Id == workflowExecution.Workflow.OrgId {
+							if (len(user.Orgs) == 1 || user.ActiveOrg.Id == workflowExecution.Workflow.OrgId) && action.Name != "send_email_shuffle" {
 								//log.Printf("Choice: %s, %s - %s", user.Username, user.Id, user.ApiKey)
 								action.Parameters[paramKey].Value = user.ApiKey
 								break

diff --git a/structs.go b/structs.go
@@ -3458,6 +3458,7 @@ type Mailcheck struct {
 	Body               string   `json:"body"`
 	Subject            string   `json:"subject"`
 	Type               string   `json:"type"`
+	EmailApp		   bool		`json:"email_app"`
 	SenderCompany      string   `json:"sender_company"`
 	WorkflowId         string   `json:"workflow_id"`
 	ReferenceExecution string   `json:"reference_execution"`