diff --git a/backend/device_registry/api_views.py b/backend/device_registry/api_views.py index cb21a7577..1b67a8ff3 100644 --- a/backend/device_registry/api_views.py +++ b/backend/device_registry/api_views.py @@ -136,7 +136,7 @@ def post(self, request, *args, **kwargs): class DeviceCertView(APIView): """ - Returns a device certificate from the database. + Return a device certificate from the database. """ permission_classes = [AllowAny] @@ -146,18 +146,9 @@ def get(self, request, *args, **kwargs): except ObjectDoesNotExist: return Response('Device not found', status=status.HTTP_404_NOT_FOUND) - if 'format' in request.GET: - return Response({ - 'certificate': device.certificate, - 'certificate_expires': device.certificate_expires, - 'is_expired': - device.certificate_expires < timezone.now() if device.certificate_expires is not None else False, - 'device_id': device.device_id, - }) - else: - response = HttpResponse(device.certificate, content_type='application/x-pem-file') - response['Content-Disposition'] = 'attachment; filename={}.crt'.format(device.device_id) - return response + response = HttpResponse(device.certificate, content_type='application/x-pem-file') + response['Content-Disposition'] = 'attachment; filename={}.crt'.format(device.device_id) + return response class DeviceIDView(APIView): diff --git a/backend/device_registry/models.py b/backend/device_registry/models.py index aa5397363..c7745a861 100644 --- a/backend/device_registry/models.py +++ b/backend/device_registry/models.py @@ -112,13 +112,6 @@ def get_cert_expiration_date(self): except ValueError: pass - def get_cert_url(self): - if settings.IS_DEV: - cert_url = f'http://localhost:8001/api/v0.2/device-cert/{self.device_id}' - else: - cert_url = f'https://api.wott.io/v0.2/device-cert/{self.device_id}' - return cert_url - @property def actions_count(self): if self.firewallstate.policy == FirewallState.POLICY_ENABLED_ALLOW: diff --git a/backend/device_registry/templates/device_info_security.html b/backend/device_registry/templates/device_info_security.html index 1717bb339..704aa64cc 100644 --- a/backend/device_registry/templates/device_info_security.html +++ b/backend/device_registry/templates/device_info_security.html @@ -207,11 +207,11 @@