Bump main nightly to fix sso issue
This commit is contained in:
@@ -20,7 +20,7 @@ require (
|
|||||||
github.com/gorilla/mux v1.8.1
|
github.com/gorilla/mux v1.8.1
|
||||||
github.com/h2non/filetype v1.1.3
|
github.com/h2non/filetype v1.1.3
|
||||||
github.com/satori/go.uuid v1.2.0
|
github.com/satori/go.uuid v1.2.0
|
||||||
github.com/shuffle/shuffle-shared v0.6.50
|
github.com/shuffle/shuffle-shared v0.6.56
|
||||||
golang.org/x/crypto v0.22.0
|
golang.org/x/crypto v0.22.0
|
||||||
google.golang.org/api v0.176.1
|
google.golang.org/api v0.176.1
|
||||||
google.golang.org/grpc v1.63.2
|
google.golang.org/grpc v1.63.2
|
||||||
|
|||||||
+17
-14
@@ -895,7 +895,22 @@ func handleInfo(resp http.ResponseWriter, request *http.Request) {
|
|||||||
Image: org.Image,
|
Image: org.Image,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//}
|
|
||||||
|
orgPriorities := org.Priorities
|
||||||
|
if len(org.Priorities) < 10 {
|
||||||
|
//log.Printf("[WARNING] Should find and add priorities as length is less than 10 for org %s", userInfo.ActiveOrg.Id)
|
||||||
|
newPriorities, err := shuffle.GetPriorities(ctx, userInfo, org)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("[WARNING] Failed getting new priorities for org %s: %s", org.Id, err)
|
||||||
|
//orgPriorities = []shuffle.Priority{}
|
||||||
|
} else {
|
||||||
|
orgPriorities = newPriorities
|
||||||
|
|
||||||
|
// A way to manage them over time
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
orgInterests := org.Interests
|
||||||
|
|
||||||
userInfo.ActiveOrg.Users = []shuffle.UserMini{}
|
userInfo.ActiveOrg.Users = []shuffle.UserMini{}
|
||||||
userOrgs := []shuffle.OrgMini{}
|
userOrgs := []shuffle.OrgMini{}
|
||||||
@@ -942,19 +957,6 @@ func handleInfo(resp http.ResponseWriter, request *http.Request) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
userOrgs = shuffle.SortOrgList(userOrgs)
|
userOrgs = shuffle.SortOrgList(userOrgs)
|
||||||
orgPriorities := org.Priorities
|
|
||||||
if len(org.Priorities) < 10 {
|
|
||||||
//log.Printf("[WARNING] Should find and add priorities as length is less than 10 for org %s", userInfo.ActiveOrg.Id)
|
|
||||||
newPriorities, err := shuffle.GetPriorities(ctx, userInfo, org)
|
|
||||||
if err != nil {
|
|
||||||
log.Printf("[WARNING] Failed getting new priorities for org %s: %s", org.Id, err)
|
|
||||||
//orgPriorities = []shuffle.Priority{}
|
|
||||||
} else {
|
|
||||||
orgPriorities = newPriorities
|
|
||||||
|
|
||||||
// A way to manage them over time
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tutorialsFinished := []shuffle.Tutorial{}
|
tutorialsFinished := []shuffle.Tutorial{}
|
||||||
for _, tutorial := range userInfo.PersonalInfo.Tutorials {
|
for _, tutorial := range userInfo.PersonalInfo.Tutorials {
|
||||||
@@ -993,6 +995,7 @@ func handleInfo(resp http.ResponseWriter, request *http.Request) {
|
|||||||
ChatDisabled: chatDisabled,
|
ChatDisabled: chatDisabled,
|
||||||
Tutorials: tutorialsFinished,
|
Tutorials: tutorialsFinished,
|
||||||
|
|
||||||
|
Interests: orgInterests,
|
||||||
Priorities: orgPriorities,
|
Priorities: orgPriorities,
|
||||||
Licensed: licensed,
|
Licensed: licensed,
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user