CR followup

adlius · Apr 17, 2024 · 74a045f · 74a045f
1 parent bbd4437
commit 74a045f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/addons/base/tests/views.py b/addons/base/tests/views.py
@@ -6,7 +6,7 @@
 from waffle.testutils import override_flag
 from urllib.parse import (
     urlencode,
-    urlparse,
+    parse_qsl,
     urlunparse,
 )
 
@@ -75,9 +75,11 @@ def test_oauth_finish_enable_gv(self, mock_requests_get):
         with override_flag(ENABLE_GV, active=True):
             request_url = urlunparse(urlparse(url)._replace(query=urlencode(query_params)))
             res = self.app.get(request_url, auth=self.user.auth)
-        mock_requests_get.assert_called_with(
-            urlunparse(urlparse(GRAVYVALET_URL)._replace(path='callback', query=urlencode(query_params)))
-        )
+        gv_callback_url = mock_requests_get.call_args[0][0]
+        parsed_callback_url = urlparse(gv_callback_url)
+        assert parsed_callback_url.netloc == urlparse(GRAVYVALET_URL).netloc
+        assert parsed_callback_url.path == '/v1/oauth/callback'
+        assert dict(parse_qsl(parsed_callback_url.query)) == query_params
 
     def test_delete_external_account(self):
         url = api_url_for(

diff --git a/website/oauth/views.py b/website/oauth/views.py
@@ -51,14 +51,7 @@ def oauth_connect(service_name, auth):
 @must_be_logged_in
 def oauth_callback(service_name, auth):
     if waffle.flag_is_active(request, features.ENABLE_GV):
-        code = request.args.get('code')
-        state = request.args.get('state')
-        query_params = {
-            'code': code,
-            'state': state,
-        }
-        gv_url = urlunparse(urlparse(GRAVYVALET_URL)._replace(path='callback', query=urlencode(query_params)))
-        requests.get(gv_url)
+        _forward_to_addon_service()
     else:
         user = auth.user
         provider = get_service(service_name)
@@ -74,3 +67,13 @@ def oauth_callback(service_name, auth):
         oauth_complete.send(provider, account=provider.account, user=user)
 
     return {}
+
+def _forward_to_addon_service():
+    code = request.args.get('code')
+    state = request.args.get('state')
+    query_params = {
+        'code': code,
+        'state': state,
+    }
+    gv_url = urlunparse(urlparse(GRAVYVALET_URL)._replace(path='/v1/oauth/callback', query=urlencode(query_params)))
+    requests.get(gv_url)