Skip to content

Commit 49488a0

Browse files
committed
Removed automatic SSO redirects, and if they happen, Shuffle mentions it properly
1 parent 9e0cb9e commit 49488a0

File tree

3 files changed

+90
-883
lines changed

3 files changed

+90
-883
lines changed

db-connector.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4461,7 +4461,7 @@ func GetTutorials(ctx context.Context, org Org, updateOrg bool) *Org {
44614461
}
44624462
}
44634463

4464-
if org.SSOConfig.SSOEntrypoint != "" && org.Defaults.NotificationWorkflow != "" {
4464+
if org.SSOConfig.SSORequired {
44654465
allSteps[3].Done = true
44664466
} else {
44674467
allSteps[3].Link = "/admin?admin_tab=organization"
@@ -12681,7 +12681,7 @@ func GetAllOrgs(ctx context.Context) ([]Org, error) {
1268112681

1268212682
return orgs, nil
1268312683
} else {
12684-
q := datastore.NewQuery(nameKey).Limit(100)
12684+
q := datastore.NewQuery(nameKey).Limit(400)
1268512685

1268612686
_, err := project.Dbclient.GetAll(ctx, q, &orgs)
1268712687
if err != nil {
@@ -14219,6 +14219,7 @@ func RunInit(dbclient datastore.Client, storageClient storage.Client, gceProject
1421914219
return project, errors.New(fmt.Sprintf("Bad status code from ES: %d", res.StatusCode))
1422014220
} else {
1422114221
//log.Printf("\n\n[INFO] Should check for SSO during setup - finding main org\n\n")
14222+
/*
1422214223
orgs, err := GetAllOrgs(ctx)
1422314224
if err == nil {
1422414225
for _, org := range orgs {
@@ -14231,6 +14232,7 @@ func RunInit(dbclient datastore.Client, storageClient storage.Client, gceProject
1423114232
} else {
1423214233
log.Printf("[WARNING] Error loading orgs: %s", err)
1423314234
}
14235+
*/
1423414236
}
1423514237
} else {
1423614238
// Fix potential cloud init problems here

0 commit comments

Comments
 (0)