Merge branch 'release/19.27.0'

Author: pattisdr

CHANGELOG

@@ -2,6 +2,14 @@
 
 We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
 
+19.27.0 (2019-09-18)
+===================
+- Automatically map subjects when a preprint is moved to a different
+  preprint provider in the admin app
+- Gitlab: return all repos to which the user has access
+- Upgrade Bower
+- Py3 backwards compatible changes
+
 19.26.0 (2019-09-11)
 ===================
 - Create a custom through table for linking files and versions

README-docker-compose.md

@@ -81,6 +81,9 @@
 
     `$ cp ./docker-compose-dist.override.yml ./docker-compose.override.yml`
 
+    For local tasks, (dev only)
+    `$ cp ./tasks/local-dist.py ./tasks/local.py`
+
 2. OPTIONAL (uncomment the below lines if you will use remote debugging) Environment variables (incl. remote debugging)
   - e.g. .docker-compose.env
 

addons/base/generic_views.py

@@ -1,6 +1,6 @@
 """Generic add-on view factories"""
 # -*- coding: utf-8 -*-
-import httplib as http
+from rest_framework import status as http_status
 
 from flask import request
 
@@ -28,12 +28,12 @@ def _import_auth(auth, node_addon, user_addon, **kwargs):
         )
 
         if not user_addon.external_accounts.filter(id=external_account.id).exists():
-            raise HTTPError(http.FORBIDDEN)
+            raise HTTPError(http_status.HTTP_403_FORBIDDEN)
 
         try:
             node_addon.set_auth(external_account, user_addon.owner)
         except PermissionsError:
-            raise HTTPError(http.FORBIDDEN)
+            raise HTTPError(http_status.HTTP_403_FORBIDDEN)
 
         node_addon.save()
 
@@ -60,7 +60,7 @@ def folder_list(addon_short_name, addon_full_name, get_folders):
     def _folder_list(node_addon, **kwargs):
         """Returns a list of folders"""
         if not node_addon.has_auth:
-            raise HTTPError(http.FORBIDDEN)
+            raise HTTPError(http_status.HTTP_403_FORBIDDEN)
 
         folder_id = request.args.get('folderId')
         return get_folders(node_addon, folder_id)

addons/base/tests/views.py

@@ -1,5 +1,5 @@
-import httplib as http
-import urlparse
+from rest_framework import status as http_status
+from future.moves.urllib.parse import urlparse, urljoin, parse_qs
 
 import mock
 import responses
@@ -25,11 +25,11 @@ def test_oauth_start(self):
             service_name=self.ADDON_SHORT_NAME
         )
         res = self.app.get(url, auth=self.user.auth)
-        assert res.status_code == http.FOUND
-        redirect_url = urlparse.urlparse(res.location)
-        redirect_params = urlparse.parse_qs(redirect_url.query)
-        provider_url = urlparse.urlparse(self.Provider().auth_url)
-        provider_params = urlparse.parse_qs(provider_url.query)
+        assert res.status_code == http_status.HTTP_302_FOUND
+        redirect_url = urlparse(res.location)
+        redirect_params = parse_qs(redirect_url.query)
+        provider_url = urlparse(self.Provider().auth_url)
+        provider_params = parse_qs(provider_url.query)
         for param, value in redirect_params.items():
             if param == 'state':  # state may change between calls
                 continue
@@ -43,7 +43,7 @@ def test_oauth_finish(self):
         with mock.patch.object(self.Provider, 'auth_callback') as mock_callback:
             mock_callback.return_value = True
             res = self.app.get(url, auth=self.user.auth)
-        assert_equal(res.status_code, http.OK)
+        assert_equal(res.status_code, http_status.HTTP_200_OK)
         name, args, kwargs = mock_callback.mock_calls[0]
         assert_equal(kwargs['user']._id, self.user._id)
 
@@ -53,7 +53,7 @@ def test_delete_external_account(self):
             external_account_id=self.external_account._id
         )
         res = self.app.delete(url, auth=self.user.auth)
-        assert_equal(res.status_code, http.OK)
+        assert_equal(res.status_code, http_status.HTTP_200_OK)
         self.user.reload()
         for account in self.user.external_accounts.all():
             assert_not_equal(account._id, self.external_account._id)
@@ -66,7 +66,7 @@ def test_delete_external_account_not_owner(self):
             external_account_id=self.external_account._id
         )
         res = self.app.delete(url, auth=other_user.auth, expect_errors=True)
-        assert_equal(res.status_code, http.FORBIDDEN)
+        assert_equal(res.status_code, http_status.HTTP_403_FORBIDDEN)
 
 class OAuthAddonConfigViewsTestCaseMixin(OAuthAddonTestCaseMixin):
 
@@ -94,7 +94,7 @@ def test_import_auth(self):
         res = self.app.put_json(url, {
             'external_account_id': ea._id
         }, auth=self.user.auth)
-        assert_equal(res.status_code, http.OK)
+        assert_equal(res.status_code, http_status.HTTP_200_OK)
         assert_in('result', res.json)
         node_settings.reload()
         assert_equal(node_settings.external_account._id, ea._id)
@@ -113,7 +113,7 @@ def test_import_auth_invalid_account(self):
         res = self.app.put_json(url, {
             'external_account_id': ea._id
         }, auth=self.user.auth, expect_errors=True)
-        assert_equal(res.status_code, http.FORBIDDEN)
+        assert_equal(res.status_code, http_status.HTTP_403_FORBIDDEN)
 
     def test_import_auth_cant_write_node(self):
         ea = self.ExternalAccountFactory()
@@ -130,15 +130,15 @@ def test_import_auth_cant_write_node(self):
         res = self.app.put_json(url, {
             'external_account_id': ea._id
         }, auth=user.auth, expect_errors=True)
-        assert_equal(res.status_code, http.FORBIDDEN)
+        assert_equal(res.status_code, http_status.HTTP_403_FORBIDDEN)
 
     def test_set_config(self):
         self.node_settings.set_auth(self.external_account, self.user)
         url = self.project.api_url_for('{0}_set_config'.format(self.ADDON_SHORT_NAME))
         res = self.app.put_json(url, {
             'selected': self.folder
         }, auth=self.user.auth)
-        assert_equal(res.status_code, http.OK)
+        assert_equal(res.status_code, http_status.HTTP_200_OK)
         self.project.reload()
         assert_equal(
             self.project.logs.latest().action,
@@ -150,7 +150,7 @@ def test_get_config(self):
         url = self.project.api_url_for('{0}_get_config'.format(self.ADDON_SHORT_NAME))
         with mock.patch.object(type(self.Serializer()), 'credentials_are_valid', return_value=True):
             res = self.app.get(url, auth=self.user.auth)
-        assert_equal(res.status_code, http.OK)
+        assert_equal(res.status_code, http_status.HTTP_200_OK)
         assert_in('result', res.json)
         serialized = self.Serializer().serialize_settings(
             self.node_settings,
@@ -164,17 +164,17 @@ def test_get_config_unauthorized(self):
         user = AuthUserFactory()
         self.project.add_contributor(user, permissions=permissions.READ, auth=self.auth, save=True)
         res = self.app.get(url, auth=user.auth, expect_errors=True)
-        assert_equal(res.status_code, http.FORBIDDEN)
+        assert_equal(res.status_code, http_status.HTTP_403_FORBIDDEN)
 
     def test_get_config_not_logged_in(self):
         url = self.project.api_url_for('{0}_get_config'.format(self.ADDON_SHORT_NAME))
         res = self.app.get(url, auth=None, expect_errors=True)
-        assert_equal(res.status_code, http.FOUND)
+        assert_equal(res.status_code, http_status.HTTP_302_FOUND)
 
     def test_account_list_single(self):
         url = api_url_for('{0}_account_list'.format(self.ADDON_SHORT_NAME))
         res = self.app.get(url, auth=self.user.auth)
-        assert_equal(res.status_code, http.OK)
+        assert_equal(res.status_code, http_status.HTTP_200_OK)
         assert_in('accounts', res.json)
         assert_equal(len(res.json['accounts']), 1)
 
@@ -185,14 +185,14 @@ def test_account_list_multiple(self):
 
         url = api_url_for('{0}_account_list'.format(self.ADDON_SHORT_NAME))
         res = self.app.get(url, auth=self.user.auth)
-        assert_equal(res.status_code, http.OK)
+        assert_equal(res.status_code, http_status.HTTP_200_OK)
         assert_in('accounts', res.json)
         assert_equal(len(res.json['accounts']), 2)
 
     def test_account_list_not_authorized(self):
         url = api_url_for('{0}_account_list'.format(self.ADDON_SHORT_NAME))
         res = self.app.get(url, auth=None, expect_errors=True)
-        assert_equal(res.status_code, http.FOUND)
+        assert_equal(res.status_code, http_status.HTTP_302_FOUND)
 
     def test_folder_list(self):
         # Note: if your addon's folder_list view makes API calls
@@ -202,13 +202,13 @@ def test_folder_list(self):
         self.node_settings.save()
         url = self.project.api_url_for('{0}_folder_list'.format(self.ADDON_SHORT_NAME))
         res = self.app.get(url, auth=self.user.auth)
-        assert_equal(res.status_code, http.OK)
+        assert_equal(res.status_code, http_status.HTTP_200_OK)
         # TODO test result serialization?
 
     def test_deauthorize_node(self):
         url = self.project.api_url_for('{0}_deauthorize_node'.format(self.ADDON_SHORT_NAME))
         res = self.app.delete(url, auth=self.user.auth)
-        assert_equal(res.status_code, http.OK)
+        assert_equal(res.status_code, http_status.HTTP_200_OK)
         self.node_settings.reload()
         assert_is_none(self.node_settings.external_account)
         assert_false(self.node_settings.has_auth)
@@ -256,7 +256,7 @@ def test_set_config(self):
                 'external_list_id': self.folder.json['id'],
                 'external_list_name': self.folder.name,
             }, auth=self.user.auth)
-            assert_equal(res.status_code, http.OK)
+            assert_equal(res.status_code, http_status.HTTP_200_OK)
             self.project.reload()
             assert_equal(
                 self.project.logs.latest().action,
@@ -271,7 +271,7 @@ def test_get_config(self):
             self.node_settings.save()
             url = self.project.api_url_for('{0}_get_config'.format(self.ADDON_SHORT_NAME))
             res = self.app.get(url, auth=self.user.auth)
-            assert_equal(res.status_code, http.OK)
+            assert_equal(res.status_code, http_status.HTTP_200_OK)
             assert_in('result', res.json)
             result = res.json['result']
             serialized = self.Serializer(
@@ -287,7 +287,7 @@ def test_folder_list(self):
             self.node_settings.save()
             url = self.project.api_url_for('{0}_citation_list'.format(self.ADDON_SHORT_NAME))
             res = self.app.get(url, auth=self.user.auth)
-            assert_equal(res.status_code, http.OK)
+            assert_equal(res.status_code, http_status.HTTP_200_OK)
 
     def test_check_credentials(self):
         with mock.patch.object(self.client, 'client', new_callable=mock.PropertyMock) as mock_client:
@@ -412,4 +412,4 @@ def test_citation_list_non_linked_or_child_non_authorizer(self):
             auth=non_authorizing_user.auth,
             expect_errors=True
         )
-        assert_equal(res.status_code, http.FORBIDDEN)
+        assert_equal(res.status_code, http_status.HTTP_403_FORBIDDEN)