marker/shuffle-cracked
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2 from tesla999936/main

Browse Source 
reverting getUserApps
This commit is contained in:
Hari Krishna
2024-03-09 18:00:10 +05:30
parent 6bc64f3657
commit 40d84087cd
2 changed files with 1 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/go-app/main.go
+1 -1
View File
@@ -4785,7 +4785,7 @@ func initHandlers() {
r.HandleFunc("/api/v1/users/checkusers", checkAdminLogin).Methods("GET", "OPTIONS")
r.HandleFunc("/api/v1/users/getinfo", handleInfo).Methods("GET", "OPTIONS")
r.HandleFunc("/api/v1/users/apps", getUserApps).Methods("GET", "OPTIONS")
r.HandleFunc("/api/v1/users/apps", shuffle.HandleGetUserApps).Methods("GET", "OPTIONS")
r.HandleFunc("/api/v1/users/generateapikey", shuffle.HandleApiGeneration).Methods("GET", "POST", "OPTIONS")
r.HandleFunc("/api/v1/users/logout", shuffle.HandleLogout).Methods("POST", "OPTIONS")
r.HandleFunc("/api/v1/users/getsettings", shuffle.HandleSettings).Methods("GET", "OPTIONS")
backend/go-app/walkoff.go
-64
View File
@@ -2404,70 +2404,6 @@ func setExampleresult(ctx context.Context, result shuffle.AppExecutionExample) e
return nil
}
func getUserApps(resp http.ResponseWriter, request *http.Request) {
cors := shuffle.HandleCors(resp, request)
if cors {
return
}
ctx := context.Background()
user, userErr := shuffle.HandleApiAuthentication(resp, request)
if userErr != nil {
log.Printf("[WARNING] Api authentication failed in get all apps - this does NOT require auth in the cloud.: %s", userErr)
resp.WriteHeader(401)
resp.Write([]byte(`{"success": false}`))
return
}
workflowapps, err := shuffle.GetAllWorkflowApps(ctx, 1000, 0)
if err != nil {
log.Printf("[WARNING] Failed getting apps (getworkflowapps): %s", err)
resp.WriteHeader(401)
resp.Write([]byte(`{"success": false}`))
return
}
filteredApps := workflowapps[:0]
for _, app := range workflowapps {
if app.Owner == user.Id {
filteredApps = append(filteredApps, app)
} else if app.Contributors != nil {
for _, contributor := range app.Contributors {
if contributor == user.Id {
filteredApps = append(filteredApps, app)
}
}
}
}
if len(user.PrivateApps) > 0 {
for _, item := range user.PrivateApps {
found := false
for _, app := range filteredApps {
if item.ID == app.ID || !(item.Owner == user.Id) {
found = true
break
}
}
if !found {
filteredApps = append(filteredApps, item)
}
}
}
newbody, err := json.Marshal(filteredApps)
if err != nil {
log.Printf("[ERROR] Failed unmarshalling all newapps: %s", err)
resp.WriteHeader(401)
resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Failed unpacking workflow apps"}`)))
return
}
resp.WriteHeader(200)
resp.Write(newbody)
}
func getWorkflowApps(resp http.ResponseWriter, request *http.Request) {
cors := shuffle.HandleCors(resp, request)
if cors {