Merge branch 'devel' into 1724-DAPS-feature-python-client-support-task-and-direct-response-allocation-create

Author: JoshuaSBrown

repository/gridftp/globus5/authz/tests/integration/test_gsi_authz_init.cpp

@@ -38,7 +38,7 @@ std::string get_env_or_default(const char* env_name, const std::string& default_
 }
 
 const std::string repo_id = "repo/samoas";
-const std::string default_server_key_path = "../../mock_core/datafed-mock-core-key.pub";
+const std::string default_server_key_path = "./mock-datafed-core-key.pub";
 const std::string server_address = "tcp://localhost:9998";
 const std::string pub_key_path = "./datafed-repo-key.pub";
 const std::string pub_key = "Wxwm^-Cf7cJrqS)}/B?cDAq(L=@AwSA*({jhBu1]";

scripts/globus/generate_web_server_credentials.py

@@ -5,6 +5,7 @@
 import utils
 
 import os, sys
+import urllib.parse
 
 CLIENT_ID = "d7a7db79-c746-4947-9273-54cf578e4785"
 
@@ -40,7 +41,7 @@
 DOMAIN = os.getenv("DATAFED_DOMAIN", default_DOMAIN)
 if len(DOMAIN) == 0:
     DOMAIN = default_DOMAIN
-REDIRECT_PATH = os.path.join("https://", DOMAIN, "ui/authn")
+REDIRECT_PATH = urllib.parse.urljoin(f"https://{DOMAIN}","ui/authn")
 
 # begin oauth
 client = globus_sdk.NativeAppAuthClient(CLIENT_ID)