Allow to import public repositories on corporate site

readthedocs/oauth/models.py

@@ -22,8 +22,6 @@
 
 from .querysets import RemoteOrganizationQuerySet, RemoteRepositoryQuerySet
 
-DEFAULT_PRIVACY_LEVEL = getattr(settings, 'DEFAULT_PRIVACY_LEVEL', 'public')
-
 
 @python_2_unicode_compatible
 class RemoteOrganization(models.Model):

readthedocs/oauth/services/base.py

@@ -14,8 +14,6 @@
 from requests.exceptions import RequestException
 from requests_oauthlib import OAuth2Session
 
-DEFAULT_PRIVACY_LEVEL = getattr(settings, 'DEFAULT_PRIVACY_LEVEL', 'public')
-
 log = logging.getLogger(__name__)
 
 
@@ -158,8 +156,7 @@ def paginate(self, url, **kwargs):
     def sync(self):
         raise NotImplementedError
 
-    def create_repository(
-            self, fields, privacy=DEFAULT_PRIVACY_LEVEL, organization=None):
+    def create_repository(self, fields, privacy=None, organization=None):
         raise NotImplementedError
 
     def create_organization(self, fields):

readthedocs/oauth/services/bitbucket.py

@@ -19,8 +19,6 @@
 from .base import Service
 
 
-DEFAULT_PRIVACY_LEVEL = getattr(settings, 'DEFAULT_PRIVACY_LEVEL', 'public')
-
 log = logging.getLogger(__name__)
 
 
@@ -87,8 +85,7 @@ def sync_teams(self):
             raise Exception('Could not sync your Bitbucket team repositories, '
                             'try reconnecting your account')
 
-    def create_repository(self, fields, privacy=DEFAULT_PRIVACY_LEVEL,
-                          organization=None):
+    def create_repository(self, fields, privacy=None, organization=None):
         """
         Update or create a repository from Bitbucket API response.
 
@@ -103,8 +100,11 @@ def create_repository(self, fields, privacy=DEFAULT_PRIVACY_LEVEL,
         :type organization: RemoteOrganization
         :rtype: RemoteRepository
         """
-        if (fields['is_private'] is True and privacy == 'private' or
-                fields['is_private'] is False and privacy == 'public'):
+        privacy = privacy or settings.DEFAULT_PRIVACY_LEVEL
+        if (
+                (privacy == 'private') or
+                (fields['is_private'] is False and privacy == 'public')
+        ):
             repo, _ = RemoteRepository.objects.get_or_create(
                 full_name=fields['full_name'],
                 account=self.account,

readthedocs/oauth/services/github.py

@@ -19,9 +19,6 @@
 from ..models import RemoteOrganization, RemoteRepository
 from .base import Service
 
-
-DEFAULT_PRIVACY_LEVEL = getattr(settings, 'DEFAULT_PRIVACY_LEVEL', 'public')
-
 log = logging.getLogger(__name__)
 
 
@@ -70,8 +67,7 @@ def sync_organizations(self):
             raise Exception('Could not sync your GitHub organizations, '
                             'try reconnecting your account')
 
-    def create_repository(self, fields, privacy=DEFAULT_PRIVACY_LEVEL,
-                          organization=None):
+    def create_repository(self, fields, privacy=None, organization=None):
         """
         Update or create a repository from GitHub API response.
 
@@ -81,9 +77,11 @@ def create_repository(self, fields, privacy=DEFAULT_PRIVACY_LEVEL,
         :type organization: RemoteOrganization
         :rtype: RemoteRepository
         """
+        privacy = privacy or settings.DEFAULT_PRIVACY_LEVEL
         if (
                 (privacy == 'private') or
-                (fields['private'] is False and privacy == 'public')):
+                (fields['private'] is False and privacy == 'public')
+        ):
             try:
                 repo = RemoteRepository.objects.get(
                     full_name=fields['full_name'],

readthedocs/oauth/services/gitlab.py

@@ -15,7 +15,7 @@
 from readthedocs.integrations.models import Integration
 
 from ..models import RemoteOrganization, RemoteRepository
-from .base import DEFAULT_PRIVACY_LEVEL, Service
+from .base import Service
 
 try:
     from urlparse import urljoin, urlparse
@@ -108,8 +108,7 @@ def sync_organizations(self):
     def is_owned_by(self, owner_id):
         return self.account.extra_data['id'] == owner_id
 
-    def create_repository(
-            self, fields, privacy=DEFAULT_PRIVACY_LEVEL, organization=None):
+    def create_repository(self, fields, privacy=None, organization=None):
         """
         Update or create a repository from GitLab API response.
 
@@ -119,6 +118,7 @@ def create_repository(
         :type organization: RemoteOrganization
         :rtype: RemoteRepository
         """
+        privacy = privacy or settings.DEFAULT_PRIVACY_LEVEL
         repo_is_public = fields['visibility'] == 'public'
         if privacy == 'private' or (repo_is_public and privacy == 'public'):
             try:

readthedocs/rtd_tests/tests/test_oauth.py

@@ -6,6 +6,7 @@
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.test import TestCase
+from django.test.utils import override_settings
 
 from readthedocs.oauth.models import RemoteOrganization, RemoteRepository
 from readthedocs.oauth.services import (
@@ -131,6 +132,24 @@ def test_multiple_users_same_repo(self):
         self.assertEqual(github_project, github_project_5)
         self.assertEqual(github_project_2, github_project_6)
 
+    @override_settings(DEFAULT_PRIVACY_LEVEL='private')
+    def test_make_private_project(self):
+        """
+        Test ability to import ``public`` repositories under ``private`` level.
+        """
+        repo_json = {
+            'name': 'testrepo',
+            'full_name': 'testuser/testrepo',
+            'description': 'Test Repo',
+            'git_url': 'git://github.com/testuser/testrepo.git',
+            'private': False,
+            'ssh_url': 'ssh://[email protected]:testuser/testrepo.git',
+            'html_url': 'https://github.com/testuser/testrepo',
+            'clone_url': 'https://github.com/testuser/testrepo.git',
+        }
+        repo = self.service.create_repository(repo_json, organization=self.org)
+        self.assertIsNotNone(repo)
+
 
 class BitbucketOAuthTests(TestCase):
 
@@ -270,6 +289,16 @@ def test_make_project_fail(self):
             data, organization=self.org, privacy=self.privacy)
         self.assertIsNone(repo)
 
+    @override_settings(DEFAULT_PRIVACY_LEVEL='private')
+    def test_make_private_project(self):
+        """
+        Test ability to import ``public`` repositories under ``private`` level.
+        """
+        data = self.repo_response_data.copy()
+        data['is_private'] = False
+        repo = self.service.create_repository(data, organization=self.org)
+        self.assertIsNotNone(repo)
+
     def test_make_organization(self):
         org = self.service.create_organization(self.team_response_data)
         self.assertIsInstance(org, RemoteOrganization)
@@ -444,3 +473,15 @@ def test_make_organization(self):
             'https://secure.gravatar.com/avatar/test',
         )
         self.assertEqual(org.url, 'https://gitlab.com/testorga')
+
+    @override_settings(DEFAULT_PRIVACY_LEVEL='private')
+    def test_make_private_project(self):
+        """
+        Test ability to import ``public`` repositories under ``private`` level.
+        """
+        data = self.repo_response_data.copy()
+        data['visibility'] = 'public'
+        with mock.patch('readthedocs.oauth.services.gitlab.GitLabService.is_owned_by') as m:  # yapf: disable
+            m.return_value = True
+            repo = self.service.create_repository(data, organization=self.org)
+        self.assertIsNotNone(repo)