update api.auth

multauth/api/auth/serializers.py

@@ -1,5 +1,5 @@
 from django.contrib.auth import authenticate
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.contrib.auth import get_user_model
 
 from rest_framework import exceptions, serializers
@@ -25,43 +25,6 @@ class TokenSerializer(serializers.Serializer):
  # RESERVED # expired_datetime = serializers.DateTimeField(read_only=True) # could be timestamp
 
 
-class SigninSerializer(serializers.ModelSerializer):
- hardcode = serializers.CharField(required=False)
- passcode = serializers.CharField(required=False)
-
- class Meta:
- model = UserModel
- fields = tuple(IDENTIFIERS + SECRETS)
-
- # experimental
- extra_kwargs = dict([]
- + [(x, {'required': False}) for x in IDENTIFIERS] # 'validators': None
- + [(x, {'required': False}) for x in SECRETS]
- )
-
- def validate(self, data):
- model = self.Meta.model
-
- # check identifiers
- data_identifiers = [x for x in data if x in IDENTIFIERS and data.get(x, None)]
- if not data_identifiers:
- msg = _('Invalid user credentials. No valid identifier found')
- raise exceptions.ValidationError(msg)
-
- user = authenticate(**data)
-
- if user:
- if not user.is_active:
- msg = _('User account is disabled.')
- raise exceptions.ValidationError(msg)
- else:
- msg = _('Unable to log in with provided credentials.')
- raise exceptions.ValidationError(msg)
-
- data['user'] = user
- return super().validate(data)
-
-
 class SignupSerializer(serializers.ModelSerializer):
  """
  For write (POST...) requests only
@@ -86,8 +49,6 @@ class Meta:
  def validate(self, data):
  model = self.Meta.model
 
- # check for one valid idntifier
-
  # check identifiers
  data_identifiers = [x for x in data if x in IDENTIFIERS and data.get(x, None)]
  if not data_identifiers:
@@ -115,3 +76,45 @@ class Meta:
  + [x for x in confirmation_fields if hasattr(UserModel, x)] # only that way :/
  + ['is_active']
  )
+
+
+signin_serializer_fields = dict([
+ [x, serializers.ModelField(model_field=UserModel()._meta.get_field(x), required=False)]
+ for x in (IDENTIFIERS + SECRETS) if hasattr(UserModel, x)
+])
+
+
+def signin_serializer_validate(self, data):
+ # model = self.Meta.model
+
+ # check identifiers
+ data_identifiers = [x for x in data if x in IDENTIFIERS and data.get(x, None)]
+ if not data_identifiers:
+ msg = _('Invalid user credentials. No valid identifier found')
+ raise exceptions.ValidationError(msg)
+
+ user = authenticate(**data)
+
+ if user:
+ if not user.is_active:
+ msg = _('User account is disabled.')
+ raise exceptions.ValidationError(msg)
+ else:
+ msg = _('Unable to log in with provided credentials.')
+ raise exceptions.ValidationError(msg)
+
+ data['user'] = user
+ return super(SigninSerializer, self).validate(data)
+
+
+SigninSerializer = type(
+ 'SigninSerializer',
+ (serializers.Serializer,),
+ {
+ # reserved # '__module__': 'multauth.api.auth',
+ 'validate': signin_serializer_validate,
+ 'hardcode': serializers.CharField(required=False),
+ 'passcode': serializers.CharField(required=False),
+ **signin_serializer_fields,
+ }
+)

multauth/api/auth/views.py

@@ -1,6 +1,6 @@
 from django.db import transaction
 from django.contrib.auth import get_user_model
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from rest_framework import exceptions, parsers, views, status
 from rest_framework.permissions import AllowAny, IsAuthenticated

multauth/api/authentication.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from rest_framework import authentication
 from rest_framework import exceptions

multauth/api/devices/email/auth/serializers.py

@@ -1,5 +1,5 @@
 from django.contrib.auth import authenticate
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.contrib.auth import get_user_model
 
 from rest_framework import exceptions, serializers

multauth/api/devices/email/auth/views.py

@@ -1,5 +1,5 @@
 from django.db import transaction
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from rest_framework import exceptions, parsers, views, status
 from rest_framework.permissions import AllowAny, IsAuthenticated

multauth/api/devices/email/me/serializers.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from rest_framework import exceptions, serializers
 

multauth/api/devices/email/me/views.py

@@ -1,5 +1,5 @@
 from django.db import transaction
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from rest_framework import exceptions, parsers, views, status
 from rest_framework.permissions import IsAuthenticated

multauth/api/devices/phone/auth/serializers.py

@@ -1,5 +1,5 @@
 from django.contrib.auth import authenticate
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from rest_framework import exceptions, serializers
 

multauth/api/devices/phone/auth/views.py

@@ -1,5 +1,5 @@
 from django.db import transaction
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from rest_framework import exceptions, parsers, views, status
 from rest_framework.permissions import AllowAny, IsAuthenticated

multauth/api/devices/phone/me/serializers.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from rest_framework import exceptions, serializers
 

multauth/api/devices/phone/me/views.py

@@ -1,5 +1,5 @@
 from django.db import transaction
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from rest_framework import exceptions, parsers, views, status
 from rest_framework.permissions import IsAuthenticated

multauth/api/me/serializers.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.contrib.auth import get_user_model
 
 from rest_framework import exceptions, serializers

multauth/api/me/views.py

@@ -1,5 +1,5 @@
 from django.db import transaction
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from rest_framework import exceptions, parsers, views, status
 from rest_framework.permissions import IsAuthenticated

multauth/backends.py

@@ -8,7 +8,7 @@
 
 FLOWS = tuple(getattr(settings, 'MULTAUTH_FLOWS', (
  ('username', 'password'),
- #('email', 'password'),
+ ('email', 'password'),
 )));
 
 FLOWS = FLOWS if type(FLOWS[0]) is tuple else tuple([FLOWS])
@@ -73,7 +73,7 @@ def authenticate(self, request, **kwargs):
  except UserModel.DoesNotExist:
  # Run the default password hasher once to reduce the timing
  # difference between an existing and a nonexistent user (#20760).
- UserModel().set_password(password)
+ UserModel().set_password(None)
  else:
  if self.user_can_authenticate(user):
  flow_secrets = [x for x in flow if x in UserModel.SECRETS]

multauth/devices/_chip.py

@@ -1,7 +1,7 @@
 from django.db import models
 from django.template.loader import get_template
 from django.template import TemplateDoesNotExist, TemplateSyntaxError
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.conf import settings
 
 from .abstract import AbstractDevice, AbstractUserMixin

multauth/devices/email.py

@@ -6,7 +6,7 @@
 from django.contrib.sites.shortcuts import get_current_site
 from django.template.loader import get_template
 from django.template import TemplateDoesNotExist, TemplateSyntaxError
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.conf import settings
 
 from django_otp.util import random_hex

multauth/devices/phone.py

@@ -2,7 +2,7 @@
 from django.contrib.auth.hashers import check_password, is_password_usable, make_password
 from django.template.loader import get_template
 from django.template import TemplateDoesNotExist, TemplateSyntaxError
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.conf import settings
 
 from phonenumber_field.modelfields import PhoneNumberField

multauth/devices/username.py

@@ -1,7 +1,7 @@
 from django.db import models
 from django.contrib.auth.hashers import check_password, is_password_usable, make_password
 from django.contrib.auth.validators import UnicodeUsernameValidator
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.conf import settings
 
 from django_otp.util import random_hex

multauth/mixins.py

@@ -2,7 +2,7 @@
 
 from django.db import models
 from django.db.models.signals import post_save
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.conf import settings
 from django_otp import devices_for_user