Fixed Hybrid triggers and minor view changes

backend/Dockerfile

@@ -7,7 +7,6 @@ WORKDIR /app
 ADD ./go-app/main.go /app
 ADD ./go-app/walkoff.go /app
 ADD ./go-app/docker.go /app
-ADD ./go-app/oauth2.go /app
 
 ADD ./go-app/go.mod /app
 

backend/app_sdk/app_base.py

@@ -1521,6 +1521,7 @@ class AppBase:
                                 if variablename.lower() == actionname_lower:
                                     baseresult = variable["value"]
                                     break
+
                         except KeyError as e:
                             print("[INFO] KeyError wf variables: %s" % e)
                             pass

backend/go-app/go.mod

@@ -2,7 +2,7 @@ module shuffle
 
 go 1.13
 
-replace github.com/frikky/shuffle-shared => ../../../../git/shuffle-shared
+//replace github.com/frikky/shuffle-shared => ../../../../git/shuffle-shared
 
 //replace github.com/frikky/kin-openapi => ../../../../git/kin-openapi
 
@@ -23,7 +23,7 @@ require (
 	github.com/docker/go-units v0.4.0 // indirect
 	github.com/elastic/go-elasticsearch/v7 v7.13.1 // indirect
 	github.com/frikky/kin-openapi v0.39.0
-	github.com/frikky/shuffle-shared v0.1.5
+	github.com/frikky/shuffle-shared v0.1.12
 	github.com/fsouza/go-dockerclient v1.7.2
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-git/go-billy/v5 v5.0.0

backend/go-app/main.go

@@ -2602,7 +2602,6 @@ func findValidScheduleAppFolders(rootAppFolder string) ([]string, error) {
 		appFiles, err := ioutil.ReadDir(appFolderLocation)
 		if err != nil {
 			// Invalid app folder (deleted within a few MS lol)
-			log.Printf("%s", err)
 			invalidRootFolders = append(invalidRootFolders, rootfile.Name())
 			continue
 		}
@@ -3168,7 +3167,6 @@ func buildSwaggerApp(resp http.ResponseWriter, body []byte, user shuffle.User) {
 	swagger, err := swaggerLoader.LoadSwaggerFromData(body)
 	if err != nil {
 		log.Printf("[ERROR] Swagger validation error: %s", err)
-		//log.Printf("%s", string(body))
 		resp.WriteHeader(500)
 		resp.Write([]byte(`{"success": false, "reason": "Failed verifying openapi"}`))
 		return

backend/go-app/walkoff.go

@@ -730,7 +730,7 @@ func handleGetStreamResults(resp http.ResponseWriter, request *http.Request) {
 	ctx := context.Background()
 	workflowExecution, err := shuffle.GetWorkflowExecution(ctx, actionResult.ExecutionId)
 	if err != nil {
-		//log.Printf("Failed getting execution (streamresult) %s: %s", actionResult.ExecutionId, err)
+		log.Printf("Failed getting execution (streamresult) %s: %s", actionResult.ExecutionId, err)
 		resp.WriteHeader(401)
 		resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Bad authorization key or execution_id might not exist."}`)))
 		return
@@ -1910,7 +1910,6 @@ func handleExecution(id string, workflow shuffle.Workflow, request *http.Request
 
 	//b, err := json.Marshal(workflowExecution)
 	//if err == nil {
-	//	log.Printf("%s", string(b))
 	//	log.Printf("LEN: %d", len(string(b)))
 	//	//workflowExecution.ExecutionOrg.SyncFeatures = Org{}
 	//}
@@ -3095,7 +3094,6 @@ func iterateOpenApiGithub(fs billy.Filesystem, dir []os.FileInfo, extra string,
 
 				// 3. Load this as a "standby" app
 				// FIXME: This should be a function ROFL
-				//log.Printf("%s", string(readFile))
 				swagger, err := openapi3.NewSwaggerLoader().LoadSwaggerFromData([]byte(parsedOpenApi.Body))
 				if err != nil {
 					log.Printf("[WARNING] Swagger validation error in loop (%s): %s. Continuing.", filename, err)