Skip to content
This repository has been archived by the owner on Sep 16, 2022. It is now read-only.

rename api endpoints #384

Merged
merged 1 commit into from
Aug 27, 2019
Merged

rename api endpoints #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions backend/device_registry/templates/credentials.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ <h6 class="card-subtitle text-muted">View credentials.</h6>
// Datatables basic
table = $('#datatables-basic').DataTable({
responsive: true,
ajax: '/ajax-creds/',
ajax: '/ajax-credentials/',
columns: [
{'data': 'name'},
{'data': 'data', sorting:false},
Expand Down Expand Up @@ -381,7 +381,7 @@ <h6 class="card-subtitle text-muted">View credentials.</h6>
});

let type = pk? 'PATCH': 'POST',
url = pk? `/ajax-creds/${pk}/update/`: `/ajax-creds/create/`;
url = pk? `/ajax-credentials/${pk}/update/`: `/ajax-credentials/create/`;
$.ajax({
url,
type,
Expand Down Expand Up @@ -468,7 +468,7 @@ <h6 class="card-subtitle text-muted">View credentials.</h6>
console.log('del');

$.ajax({
url: `/ajax-creds/${deleted_pk}/delete/`,
url: `/ajax-credentials/${deleted_pk}/delete/`,
type: "DELETE",
}).done(function () {
console.log('success');
Expand Down
14 changes: 7 additions & 7 deletions backend/device_registry/tests/test_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ def test_get_token_auth_fail(self):

class CredentialsViewTest(APITestCase):
def setUp(self):
self.url = reverse('ajax_creds')
self.url = reverse('ajax-credentials')
User = get_user_model()
self.user = User.objects.create_user('test')
self.user.set_password('123')
Expand Down Expand Up @@ -270,7 +270,7 @@ def setUp(self):
self.user.save()
self.credential = Credential.objects.create(owner=self.user, name='name1', data={'key1': 'value1'},
tags="tag1,tag2")
self.url = reverse('ajax_creds_delete', kwargs={'pk': self.credential.pk})
self.url = reverse('ajax-credentials-delete', kwargs={'pk': self.credential.pk})
self.client.login(username='test', password='123')

def test_delete(self):
Expand All @@ -288,7 +288,7 @@ def setUp(self):
self.user.set_password('123')
self.user.save()
self.credential1 = Credential.objects.create(owner=self.user, name='name1', data={'key1': 'value1'})
self.url = reverse('ajax_creds_update', kwargs={'pk': self.credential1.pk})
self.url = reverse('ajax-credentials-update', kwargs={'pk': self.credential1.pk})
self.client.login(username='test', password='123')
self.data = {'name': 'name2', 'data': {'key2': 'value2'}, 'linux_user': 'nobody',
'tags': [{'name': 'tag1'}, {'name': 'tag2'}]}
Expand All @@ -311,7 +311,7 @@ def test_patch_duplication(self):
self.assertDictEqual(response.data, {'error': "'Name'/'File owner' combination should be unique"})
self.assertEqual(Credential.objects.count(), 2)
# check for update the record itself
url2 = reverse('ajax_creds_update', kwargs={'pk': credential2.pk})
url2 = reverse('ajax-credentials-update', kwargs={'pk': credential2.pk})
response = self.client.patch(url2, self.data)
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertTaggedEqual(response.data, self.data)
Expand All @@ -321,7 +321,7 @@ def test_patch_duplication(self):
class CreateCredentialViewTest(APITestCase, AssertTaggedMixin):

def setUp(self):
self.url = reverse('ajax_creds_create')
self.url = reverse('ajax-credentials-create')
User = get_user_model()
self.user = User.objects.create_user('test')
self.user.set_password('123')
Expand Down Expand Up @@ -538,7 +538,7 @@ def test_get(self):

class MtlsCredsViewTest(APITestCase):
def setUp(self):
self.url = reverse('mtls-creds')
self.url = reverse('mtls-credentials')
User = get_user_model()
self.user = User.objects.create_user('test')
self.credential = Credential.objects.create(owner=self.user, name='name1', data={'key1': 'as9dfyaoiufhoasdfjh'},
Expand Down Expand Up @@ -588,7 +588,7 @@ def test_get_limited_by_meta_tags(self):
class MtlsDeviceMetadataViewTest(APITestCase):

def setUp(self):
self.url = reverse('mtls-dev-md')
self.url = reverse('mtls-device-metadata')
User = get_user_model()
self.user = User.objects.create_user('test')
self.device = Device.objects.create(device_id='device0.d.wott-dev.local', owner=self.user,
Expand Down
19 changes: 13 additions & 6 deletions backend/device_registry/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,15 @@
path('api/{}/action/<int:action_id>/<str:action_name>'.format(api_version), api_views.ActionView.as_view(),
name='action'),
path('api/{}/claimed'.format(api_version), api_views.IsDeviceClaimedView.as_view(), name='mtls-is_claimed'),
path('api/{}/creds'.format(api_version), api_views.MtlsCredsView.as_view(), name='mtls-creds'),
path('api/{}/dev-md'.format(api_version), api_views.MtlsDeviceMetadataView.as_view(), name='mtls-dev-md')

path('api/{}/credentials'.format(api_version), api_views.MtlsCredsView.as_view(), name='mtls-credentials'),
path('api/{}/device-metadata'.format(api_version), api_views.MtlsDeviceMetadataView.as_view(),
name='mtls-device-metadata'),

# TODO: deprecated names should be removed later (/creds, /dev-md) 2019-08-26:
path('api/{}/creds'.format(api_version), api_views.MtlsCredsView.as_view(), name='mtls-credentials'),
path('api/{}/dev-md'.format(api_version), api_views.MtlsDeviceMetadataView.as_view(),
name='mtls-device-metadata')
]

# Front-end
Expand Down Expand Up @@ -88,10 +95,10 @@
path('credentials/',
views.CredentialsView.as_view(),
name='credentials'),
path('ajax-creds/', api_views.CredentialsView.as_view(), name='ajax_creds'),
path('ajax-creds/<int:pk>/delete/', api_views.DeleteCredentialView.as_view(), name='ajax_creds_delete'),
path('ajax-creds/<int:pk>/update/', api_views.UpdateCredentialView.as_view(), name='ajax_creds_update'),
path('ajax-creds/create/', api_views.CreateCredentialView.as_view(), name='ajax_creds_create'),
path('ajax-credentials/', api_views.CredentialsView.as_view(), name='ajax-credentials'),
path('ajax-credentials/<int:pk>/delete/', api_views.DeleteCredentialView.as_view(), name='ajax-credentials-delete'),
path('ajax-credentials/<int:pk>/update/', api_views.UpdateCredentialView.as_view(), name='ajax-credentials-update'),
path('ajax-credentials/create/', api_views.CreateCredentialView.as_view(), name='ajax-credentials-create'),
path('actions/', views.actions_view, name='actions'),
path('devices/<int:device_pk>/actions/', views.actions_view, name='device_actions'),
path(
Expand Down