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

Author: frikky

shared.go

@@ -14469,10 +14469,8 @@ func GetOpenIdUrl(request *http.Request, org Org, user User, mode string) (strin
 	codeChallenge := verifier.CodeChallengeS256()
 
 	if !signIn {
-		// Initialize slice if needed
 		user.InitSSOInfos()
 
-		// Store SSO info per org (preserving existing Sub if present)
 		existingSSOInfo, _ := user.GetSSOInfo(org.Id)
 		user.SetSSOInfo(org.Id, SSOInfo{
 			Sub:             existingSSOInfo.Sub, // Keep existing Sub for this org
@@ -14482,7 +14480,7 @@ func GetOpenIdUrl(request *http.Request, org Org, user User, mode string) (strin
 		})
 
 		ctx := context.Background()
-		err := SetUser(ctx, &user, false)
+		err := SetUser(ctx, &user, true)
 		if err != nil {
 			return "", err
 		}
@@ -22597,6 +22595,7 @@ func HandleOpenId(resp http.ResponseWriter, request *http.Request) {
 					continue
 				}
 				ssoInfo, exists := fullUser.GetSSOInfo(org.Id)
+				log.Printf("[DEBUG] SSOInfo exists: %t", exists)
 				if exists && ssoInfo.CodeVerifier != "" {
 					verifierObj := &CodeVerifier{Value: ssoInfo.CodeVerifier}
 					if verifierObj.CodeChallengeS256() == foundChallenge {
@@ -22766,6 +22765,8 @@ func HandleOpenId(resp http.ResponseWriter, request *http.Request) {
 					}
 				}
 
+				// don't be confused. "AutoProvision" acts like "DisableAutoProvision"
+				// it's super stupid.
 				if (!foundOrgInUser || !foundUserInOrg) && org.SSOConfig.AutoProvision {
 					log.Printf("[WARNING] User %s (%s) is not in org %s (%s). Please contact the administrator - (1)", user.Username, user.Id, org.Name, org.Id)
 					resp.WriteHeader(401)
@@ -24623,7 +24624,7 @@ func PrepareWorkflowExecution(ctx context.Context, workflow Workflow, request *h
 				}
 
 				// Handles agentic run continues
-				// This is if shuffler.io/agents  => questions are answered 
+				// This is if shuffler.io/agents  => questions are answered
 				if agentic {
 					log.Printf("[INFO][%s] Should fix the decision by injecting the values and continuing to the next step! :3", oldExecution.ExecutionId)
 
@@ -24656,7 +24657,7 @@ func PrepareWorkflowExecution(ctx context.Context, workflow Workflow, request *h
 							findContinue = true
 						}
 
-						if debug { 
+						if debug {
 							log.Printf("[DEBUG][%s] Found decision '%s' inside the agentic workflow to update. Exec arg: %#v", workflowExecution.ExecutionId, decisionId, execArg)
 						}
 
@@ -24726,7 +24727,7 @@ func PrepareWorkflowExecution(ctx context.Context, workflow Workflow, request *h
 								continue
 							}
 
-							if debug { 
+							if debug {
 								log.Printf("[DEBUG] Mapping field %d to value %s", fieldNumber, value)
 							}
 
@@ -24778,13 +24779,13 @@ func PrepareWorkflowExecution(ctx context.Context, workflow Workflow, request *h
 						}
 					}
 
-					// This is a weird if statement, due to it being used for 
+					// This is a weird if statement, due to it being used for
 					// multiple purposes around field change & decision id finding
 
 					// FIXME: Not sure if this is correct to catch bad decision IDs
 					//if !fieldsChanged && cleanupFailures {
 					if !fieldsChanged {
-					//if cleanupFailures {
+						//if cleanupFailures {
 						return workflowExecution, ExecInfo{}, fmt.Sprintf("Could not find fields for decision '%s'. Did you fill them in?", decisionId), errors.New(fmt.Sprintf("Could not find fields decision '%s'. Did you fill them in?", decisionId))
 					}
 

structs.go

@@ -692,7 +692,7 @@ type SSOInfo struct {
 	Sub             string    `json:"sub"`
 	OrgID           string    `json:"org_id"`
 	ClientID        string    `json:"client_id"`
-	CodeVerifier    string    `json:"code_verifier"`    // PKCE code verifier
+	CodeVerifier    string    `json:"code_verifier"` // PKCE code verifier
 	ChallengeExpiry time.Time `json:"challenge_expiry"`
 }
 
@@ -3091,9 +3091,11 @@ type SSOConfig struct {
 	OpenIdAuthorization string `json:"openid_authorization" datastore:"openid_authorization"`
 	OpenIdToken         string `json:"openid_token" datastore:"openid_token"`
 	SSORequired         bool   `json:"SSORequired" datastore:"SSORequired"`
-	AutoProvision       bool   `json:"auto_provision" datastore:"auto_provision"`
-	RoleRequired        bool   `json:"role_required" datastore:"role_required"`
-	SkipSSOForAdmins    bool   `json:"skip_sso_for_admins" datastore:"skip_sso_for_admins"`
+	// i have a distinct hatered for this name.
+	// says "auto_provision" but all logic treats it as disable_auto_provision.
+	AutoProvision    bool `json:"auto_provision" datastore:"auto_provision"`
+	RoleRequired     bool `json:"role_required" datastore:"role_required"`
+	SkipSSOForAdmins bool `json:"skip_sso_for_admins" datastore:"skip_sso_for_admins"`
 }
 
 type SamlRequest struct {
@@ -4579,15 +4581,15 @@ type AgentOutput struct {
 	// For easy testing
 	DecisionString string `json:"decision_string,omitempty" datastore:"decision_string"`
 	// For tracking of details parent<->child
-	StartedAt     int64  `json:"started_at,omitempty" datastore:"started_at"`
-	CompletedAt   int64  `json:"completed_at,omitempty" datastore:"completed_at"`
-	ExecutionId   string `json:"execution_id,omitempty" datastore:"execution_id"`
-	NodeId        string `json:"node_id,omitempty" datastore:"node_id"`
-	Memory        string `json:"memory,omitempty" datastore:"memory"`
-	Input         string `json:"input" datastore:"input"`
-	OriginalInput string `json:"original_input,omitempty" datastore:"original_input"`
+	StartedAt      int64    `json:"started_at,omitempty" datastore:"started_at"`
+	CompletedAt    int64    `json:"completed_at,omitempty" datastore:"completed_at"`
+	ExecutionId    string   `json:"execution_id,omitempty" datastore:"execution_id"`
+	NodeId         string   `json:"node_id,omitempty" datastore:"node_id"`
+	Memory         string   `json:"memory,omitempty" datastore:"memory"`
+	Input          string   `json:"input" datastore:"input"`
+	OriginalInput  string   `json:"original_input,omitempty" datastore:"original_input"`
 	AllowedActions []string `json:"allowed_actions,omitempty" datastore:"allowed_actions"`
-	Output        string `json:"output,omitempty" datastore:"output"`
+	Output         string   `json:"output,omitempty" datastore:"output"`
 }
 
 type HTTPWrapper struct {