From 0446038739dc01924eb87809828e47bfebac19b1 Mon Sep 17 00:00:00 2001
From: Frederick Muriuki Muriithi
Date: Thu, 7 Sep 2023 14:20:03 +0300
Subject: Use auth-server for authentication

Authenticate with the Auth-server (gn-auth) to get the token to use on
the API server (GN3).
---
 wqflask/utility/tools.py                | 1 +
 wqflask/wqflask/oauth2/request_utils.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/wqflask/utility/tools.py b/wqflask/utility/tools.py
index 0d1357b9..283b0408 100644
--- a/wqflask/utility/tools.py
+++ b/wqflask/utility/tools.py
@@ -282,6 +282,7 @@ WEBSERVER_MODE = get_setting('WEBSERVER_MODE')
 GN2_BASE_URL = get_setting('GN2_BASE_URL')
 GN2_BRANCH_URL = get_setting('GN2_BRANCH_URL')
 GN_SERVER_URL = get_setting('GN_SERVER_URL')
+AUTH_SERVER_URL = get_setting('AUTH_SERVER_URL')
 GN_PROXY_URL = get_setting('GN_PROXY_URL')
 GN3_LOCAL_URL = get_setting('GN3_LOCAL_URL')
 SERVER_PORT = get_setting_int('SERVER_PORT')
diff --git a/wqflask/wqflask/oauth2/request_utils.py b/wqflask/wqflask/oauth2/request_utils.py
index 7d2ec539..4c5b970a 100644
--- a/wqflask/wqflask/oauth2/request_utils.py
+++ b/wqflask/wqflask/oauth2/request_utils.py
@@ -15,7 +15,7 @@ def authserver_authorise_uri():
     host_uri = f"{req_baseurl.scheme}://{req_baseurl.netloc}/"
     return urljoin(
         AUTH_SERVER_URL,
-        "/auth/authorise?response_type=code"
+        "auth/authorise?response_type=code"
         f"&client_id={OAUTH2_CLIENT_ID}"
         f"&redirect_uri={urljoin(host_uri, 'oauth2/code')}")
 
-- 
cgit 1.4.1