Browse Source

fix guest user token

master
alireza 1 year ago
parent
commit
b1e70c598b
  1. 4
      apps/account/admin/user.py
  2. 4
      apps/account/custom_user_login.py
  3. 2
      config/test_auth_middleware.py

4
apps/account/admin/user.py

@ -28,9 +28,9 @@ class NotificationAdmin(AjaxDatatable):
@admin.register(User)
class UserAdmin(UserAdmin, AjaxDatatable):
list_display = (
'email', 'fullname', 'user_type','last_login', 'date_joined',
'email', 'device_id', 'fullname', 'user_type','last_login', 'device_os', 'date_joined',
)
ordering = 'last_login',
ordering = '-id',
readonly_fields = ('date_joined',)
exclude = ('password', 'user_permissions')
add_fieldsets = (

4
apps/account/custom_user_login.py

@ -20,6 +20,6 @@ class CustomLoginBackend(BaseBackend):
def get_user(self, username):
try:
return User.objects.filter(Q(email=username) | Q(phone_number=username)).first()
except Exception.DoesNotExist:
return User.objects.filter(Q(email=username) | Q(phone_number=str(username)) | Q(id=int(username))).first()
except User.DoesNotExist:
return None

2
config/test_auth_middleware.py

@ -18,7 +18,7 @@ def test_auth_middleware(get_response):
if "/swagger" in request.path or "/redoc" in request.path:
if not request.META.get('HTTP_AUTHORIZATION'):
user = User.objects.filter(is_staff=True, email="aqila@gmail.com").first()
user = User.objects.filter(is_staff=True, email="admin@gmail.com").first()
if user:
t, _ = Token.objects.get_or_create(user=user)
request.META['HTTP_AUTHORIZATION'] = f"Token {t}"

Loading…
Cancel
Save