Skip to content

Commit

Permalink
[bug] Radius token for initial default org not created #71
Browse files Browse the repository at this point in the history
Auto create OrganizationRadiusSettings object for the default organizaiton.
Fixes #71
  • Loading branch information
wizanyx committed Jan 20, 2020
1 parent 7150e28 commit aabd701
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Expand Up @@ -98,6 +98,9 @@ venv.bak/
# Rope project settings
.ropeproject

# vscode project settings
.vscode/

# mkdocs documentation
/site

Expand Down
2 changes: 2 additions & 0 deletions openwisp_radius/migrations/__init__.py
Expand Up @@ -18,6 +18,8 @@ def add_default_organization(apps, schema_editor):
for record in Model.objects.all().iterator():
record.organization_id = settings._OPENWISP_DEFAULT_ORG_UUID
record.save()
OrganizationRadiusSettings = apps.get_model('openwisp_radius', 'organizationradiussettings')
OrganizationRadiusSettings.objects.create(organization_id=settings._OPENWISP_DEFAULT_ORG_UUID)


def add_default_groups(apps, schema_editor):
Expand Down
5 changes: 1 addition & 4 deletions openwisp_radius/tests/mixins.py
Expand Up @@ -5,8 +5,6 @@

from openwisp_users.models import Organization

from ..models import OrganizationRadiusSettings


class CreateRadiusObjectsMixin(BaseCreateRadiusObjectsMixin):
def _create_org(self, **kwargs):
Expand Down Expand Up @@ -58,8 +56,7 @@ class ApiTokenMixin(BasePostParamsMixin):
def setUp(self):
super().setUp()
org = self.default_org
rad = OrganizationRadiusSettings.objects.create(token='asdfghjklqwerty',
organization=org)
rad = self.default_org.radius_settings
self.auth_header = 'Bearer {0} {1}'.format(org.pk, rad.token)
self.token_querystring = '?token={0}&uuid={1}'.format(rad.token, str(org.pk))

Expand Down
7 changes: 6 additions & 1 deletion openwisp_radius/tests/tests.py
Expand Up @@ -618,7 +618,7 @@ class TestOgranizationRadiusSettings(ApiTokenMixin, BaseTestCase):
user_model = User

def setUp(self):
self.org = self._create_org()
self.org = self._create_org(name='test', slug='test')

def test_string_representation(self):
rad = OrganizationRadiusSettings.objects.create(organization=self.org)
Expand Down Expand Up @@ -675,6 +675,11 @@ def test_uuid_in_cache(self):
self.assertEqual(r.status_code, 200)
cache.clear()

def test_default_organisation_radius_settings(self):
org = Organization.objects.get(slug='default')
self.assertTrue(hasattr(org, 'radius_settings'))
self.assertIsInstance(org.radius_settings, OrganizationRadiusSettings)


class TestRadiusToken(BaseTestRadiusToken, BaseTestCase):
radius_token_model = RadiusToken

0 comments on commit aabd701

Please sign in to comment.