use authentication token correctly

Author: jdkent

compose/backend/neurosynth_compose/resources/analysis.py

@@ -767,10 +767,12 @@ def _clone_project(self, source_id, copy_annotations):
             from auth0.authentication.get_token import GetToken
 
             domain = current_app.config["AUTH0_BASE_URL"].lstrip("https://")
-            g_token = GetToken(domain)
-            token_resp = g_token.client_credentials(
-                client_id=current_app.config["AUTH0_CLIENT_ID"],
+            g_token = GetToken(
+                domain,
+                current_app.config["AUTH0_CLIENT_ID"],
                 client_secret=current_app.config["AUTH0_CLIENT_SECRET"],
+            )
+            token_resp = g_token.client_credentials(
                 audience=current_app.config["AUTH0_API_AUDIENCE"],
             )
             access_token = " ".join(
@@ -1033,10 +1035,12 @@ def create_or_update_neurostore_study(ns_study):
     # use the client to authenticate if user credentials were not used
     if not access_token:
         domain = current_app.config["AUTH0_BASE_URL"].lstrip("https://")
-        g_token = GetToken(domain)
-        token_resp = g_token.client_credentials(
-            client_id=current_app.config["AUTH0_CLIENT_ID"],
+        g_token = GetToken(
+            domain,
+            current_app.config["AUTH0_CLIENT_ID"],
             client_secret=current_app.config["AUTH0_CLIENT_SECRET"],
+        )
+        token_resp = g_token.client_credentials(
             audience=current_app.config["AUTH0_API_AUDIENCE"],
         )
         access_token = " ".join([token_resp["token_type"], token_resp["access_token"]])

compose/backend/neurosynth_compose/resources/tasks.py

@@ -107,10 +107,12 @@ def create_or_update_neurostore_analysis(
         # use the client to authenticate if user credentials were not used
         if not access_token:
             domain = app.config["AUTH0_BASE_URL"].lstrip("https://")
-            g_token = GetToken(domain)
-            token_resp = g_token.client_credentials(
-                client_id=app.config["AUTH0_CLIENT_ID"],
+            g_token = GetToken(
+                domain,
+                app.config["AUTH0_CLIENT_ID"],
                 client_secret=app.config["AUTH0_CLIENT_SECRET"],
+            )
+            token_resp = g_token.client_credentials(
                 audience=app.config["AUTH0_API_AUDIENCE"],
             )
             access_token = " ".join(

compose/backend/neurosynth_compose/tests/conftest.py

@@ -406,7 +406,11 @@ def add_users(real_app, real_db):
     from neurosynth_compose.resources.auth import decode_token
 
     domain = real_app.config["AUTH0_BASE_URL"].split("://")[1]
-    token = GetToken(domain)
+    token = GetToken(
+        domain,
+        real_app.config["AUTH0_CLIENT_ID"],
+        client_secret=real_app.config["AUTH0_CLIENT_SECRET"],
+    )
 
     users = [
         {
@@ -424,8 +428,6 @@ def add_users(real_app, real_db):
         name = u["name"]
         passw = u["password"]
         payload = token.login(
-            client_id=real_app.config["AUTH0_CLIENT_ID"],
-            client_secret=real_app.config["AUTH0_CLIENT_SECRET"],
             username=name + "@email.com",
             password=passw,
             realm="Username-Password-Authentication",