More subflow fixes

This commit is contained in:
frikky
2023-04-13 15:37:22 +02:00
parent 274a942e88
commit 27457637c1
8 changed files with 83 additions and 71 deletions
+2 -2
View File
@@ -3805,7 +3805,7 @@ class AppBase:
# BASE URL (backend)
try:
app.url = requestdata["url"]
logger.info(f"BACKEND URL: {app.url}")
logger.info(f"BACKEND URL (url): {app.url}")
except Exception as e:
logger.info(f"[ERROR] Failed parsing url (backend): {e}")
extra_info += f"\n{e}"
@@ -3813,7 +3813,7 @@ class AppBase:
# URL (worker)
try:
app.base_url = requestdata["base_url"]
logger.info(f"WORKER URL: {app.base_url}")
logger.info(f"WORKER URL (base url): {app.base_url}")
except Exception as e:
logger.info(f"[ERROR] Failed parsing base url (worker): {e}")
extra_info += f"\n{e}"
+1 -1
View File
@@ -19,7 +19,7 @@ require (
github.com/gorilla/mux v1.8.0
github.com/h2non/filetype v1.1.3
github.com/satori/go.uuid v1.2.0
github.com/shuffle/shuffle-shared v0.4.0
github.com/shuffle/shuffle-shared v0.4.1
golang.org/x/crypto v0.3.0
google.golang.org/api v0.103.0
google.golang.org/appengine v1.6.7
+2 -2
View File
@@ -13,7 +13,7 @@ import (
//"crypto/tls"
//"crypto/x509"
"encoding/base64"
//"encoding/base64"
"encoding/hex"
"encoding/json"
"errors"
@@ -1269,7 +1269,7 @@ func checkAdminLogin(resp http.ResponseWriter, request *http.Request) {
// Should run calculations
if len(org.SSOConfig.OpenIdAuthorization) > 0 {
baseSSOUrl = shuffle.GetOpenIdUrl(org)
baseSSOUrl = shuffle.GetOpenIdUrl(request, *org)
break
}