[ENG-7039] Merge GV feature branch into develop (#10948)

Make the OSF work with GravyValet for addons. https://openscience.atlassian.net/issues/ENG-5782

Author: adlius

addons/base/models.py

@@ -377,6 +377,10 @@ def has_auth(self):
         """Whether the node has added credentials for this addon."""
         return False
 
+    @property
+    def display_name(self):
+        return self.short_name
+
     def to_json(self, user):
         ret = super().to_json(user)
         ret.update({
@@ -581,7 +585,7 @@ def _get_fileobj_child_metadata(self, filenode, user, cookie=None, version=None)
             **kwargs
         )
 
-        res = requests.get(metadata_url)
+        res = requests.get(metadata_url, cookies={settings.COOKIE_NAME: kwargs.get('cookie')})
 
         if res.status_code != 200:
             raise HTTPError(res.status_code, data={'error': res.json()})

addons/base/tests/views.py

@@ -1,3 +1,4 @@
+from osf.models.external import ExternalProvider
 import pytest
 from urllib.parse import urlparse, parse_qs
 from unittest import mock
@@ -22,6 +23,16 @@
 
 class OAuthAddonAuthViewsTestCaseMixin(OAuthAddonTestCaseMixin):
 
+    def setUp(self):
+
+        super().setUp()
+        if issubclass(self.Provider, ExternalProvider):
+            # only setup expected_oauth_callback_url_path if the provider uses oauth
+            if self.Provider._oauth_version == 1:
+                self.expected_oauth_callback_url_path = '/v1/oauth1/callback'
+            elif self.Provider._oauth_version == 2 :
+                self.expected_oauth_callback_url_path = '/v1/oauth2/callback'
+
     @property
     def ADDON_SHORT_NAME(self):
         raise NotImplementedError()
@@ -71,14 +82,16 @@ def test_oauth_finish_enable_gv(self, mock_requests_get):
         query_params = {
             'code': 'somecode',
             'state': 'somestatetoken',
+            'oauth_token': 'someoauthtoken',
+            'oauth_verifier': 'someverifier',
         }
         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)
         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 parsed_callback_url.path == self.expected_oauth_callback_url_path
         assert dict(parse_qsl(parsed_callback_url.query)) == query_params
 
     def test_delete_external_account(self):