Devices get token correct
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
from rest_framework import serializers
|
||||
from .models import Device, Sistema, sistemas_por_cliente
|
||||
from Clientes.models import Clientes
|
||||
from django.db.models import Q
|
||||
from django.db.models import Q
|
||||
|
||||
class SistemaPrimaryKeyRelatedField(serializers.PrimaryKeyRelatedField):
|
||||
def to_internal_value(self,data):
|
||||
|
||||
@@ -22,6 +22,7 @@ from .models import sistemas_por_cliente, DeviceHistory,Device
|
||||
from .serializers import DeviceSerializer
|
||||
from .permissions import HasAuthorizationHeader
|
||||
from .models import Sistema, BitacoraErrores
|
||||
from Clientes.models import Clientes
|
||||
from .forms import SistemaForm,sistemas_por_clienteForm
|
||||
from django.utils import timezone
|
||||
import re
|
||||
@@ -42,6 +43,8 @@ from .customStorage import CustomStorage
|
||||
|
||||
from django.contrib.auth.decorators import login_required
|
||||
|
||||
from django.db.models import Q
|
||||
|
||||
@login_required
|
||||
def uploadZipViewHTML(request):
|
||||
if request.method=="GET":
|
||||
@@ -226,13 +229,17 @@ class GetDeviceToken(APIView):
|
||||
try:
|
||||
data = request.data
|
||||
sis = Sistema.objects.get(nombre_sistema=data.get('sistema'))
|
||||
cli = Clientes.objects.get(RFC=data.get('client'))
|
||||
print('cli.id',cli.id)
|
||||
device = Device.objects.filter(
|
||||
client__RFC=data.get('client'),
|
||||
device_name=data.get('device_name'),
|
||||
ip_address=data.get('ip_address'),
|
||||
sistema= sis.id,#data.get('sistema'),
|
||||
macAddress=data.get('macAddress')
|
||||
Q(client=cli.id)
|
||||
#& Q(device_name=data.get('device_name'))
|
||||
#& Q(ip_address=data.get('ip_address'))
|
||||
#& Q(sistema= int(sis.id))
|
||||
#& Q(macAddress__icontains=data.get('macAddress'))
|
||||
).first()
|
||||
|
||||
print('device',device)
|
||||
if device is not None:
|
||||
token = {"token":str(device.token)}
|
||||
else:
|
||||
@@ -249,8 +256,8 @@ class GetDeviceToken(APIView):
|
||||
|
||||
class RegisterDeviceView(APIView):
|
||||
"""Registra al Device"""
|
||||
permissions_classes = (permissions.AllowAny,)
|
||||
|
||||
#permissions_classes = (permissions.AllowAny,)
|
||||
permissions_classes=[IsAuthenticated, HasAuthorizationHeader]
|
||||
def post(self,request):
|
||||
try:
|
||||
serializer = DeviceSerializer(data=request.data,context={'request':request})
|
||||
@@ -262,9 +269,7 @@ class RegisterDeviceView(APIView):
|
||||
except Exception as ex:
|
||||
BitacoraErrores.objects.create(level=2, message=str(ex), traceback=traceback.format_exc(),
|
||||
view='Sistemas.RegisterDeviceView')
|
||||
return Response({'Error':f'{ex}','isError':True}
|
||||
, status=status.HTTP_200_OK
|
||||
)
|
||||
return Response({'Error':f'{ex}','isError':True}, status=status.HTTP_200_OK)
|
||||
|
||||
class AuthenticateDeviceView(APIView):
|
||||
"""Autentica al device"""
|
||||
|
||||
Reference in New Issue
Block a user