using redirectUri returned by torii

Author: christosachilleoudis

flask_app/auth.py

@@ -53,14 +53,15 @@ def login():
 
     auth_code = credentials.get('authorizationCode')
     provider = credentials.get("provider")
+    redirect_uri = credentials.get("redirectUri")
 
     _logger.info('AuthorizationCode recieved: {}', credentials)
 
     if provider == "google-oauth2":
         return _login_with_google_oauth2(auth_code)
 
     if provider == "azure-ad2-oauth2":
-        return _login_with_azure_oauth2(auth_code)
+        return _login_with_azure_oauth2(auth_code, redirect_uri)
 
     error_abort('No credentials were specified', code=requests.codes.unauthorized)
 
@@ -144,9 +145,9 @@ def _login_with_google_oauth2(auth_code):
 
     return _make_success_login_response(user, user_info)
 
-def _login_with_azure_oauth2(auth_code):
+def _login_with_azure_oauth2(auth_code, redirect_uri):
     """Logs in with azure oath2"""
-    user_info = get_oauth2_identity_azure(auth_code)
+    user_info = get_oauth2_identity_azure(auth_code, redirect_uri)
     if not user_info:
         error_abort('Could not complete OAuth2 exchange', code=requests.codes.unauthorized)
 

flask_app/utils/oauth2.py

@@ -44,7 +44,7 @@ def get_oauth2_identity(auth_code):
     _logger.debug('Found user info: {}', info)
     return info
 
-def get_oauth2_identity_azure(auth_code):
+def get_oauth2_identity_azure(auth_code, redirect_uri):
     """Gets identity from azure auth_code""" 
 
     config_dict = config.get_runtime_config_private_dict()
@@ -60,14 +60,8 @@ def get_oauth2_identity_azure(auth_code):
         _logger.error('No OAuth2 client secret configured')
         return
 
-    redirect_uri = request.host_url[:-1]
-
     _logger.info('get_oauth2_identity: Using redirect URI {!r}', redirect_uri)
 
-    _logger.info("Redirect URI from the environment: {}", os.environ.get("REDIRECT_URI"))
-
-    redirect_uri = os.environ.get("REDIRECT_URI", redirect_uri)
-
     client = msal.ConfidentialClientApplication(
         client_id, authority=authority,
         client_credential=client_secret, token_cache=None)