refactor: ldap_user
This commit is contained in:
parent
10dc1b0487
commit
06ecba867c
18
apps/users/migrations/0004_alter_user_email.py
Normal file
18
apps/users/migrations/0004_alter_user_email.py
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 4.2.13 on 2024-07-16 17:03
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('users', '0003_user_source'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='user',
|
||||||
|
name='email',
|
||||||
|
field=models.EmailField(blank=True, max_length=254, null=True, unique=True, verbose_name='邮箱'),
|
||||||
|
),
|
||||||
|
]
|
||||||
@ -63,7 +63,7 @@ def get_user_dynamics_permission(user_id: str):
|
|||||||
|
|
||||||
class User(AppModelMixin):
|
class User(AppModelMixin):
|
||||||
id = models.UUIDField(primary_key=True, max_length=128, default=uuid.uuid1, editable=False, verbose_name="主键id")
|
id = models.UUIDField(primary_key=True, max_length=128, default=uuid.uuid1, editable=False, verbose_name="主键id")
|
||||||
email = models.EmailField(unique=True, verbose_name="邮箱")
|
email = models.EmailField(unique=True, null=True, blank=True, verbose_name="邮箱")
|
||||||
phone = models.CharField(max_length=20, verbose_name="电话", default="")
|
phone = models.CharField(max_length=20, verbose_name="电话", default="")
|
||||||
nick_name = models.CharField(max_length=150, verbose_name="昵称", default="")
|
nick_name = models.CharField(max_length=150, verbose_name="昵称", default="")
|
||||||
username = models.CharField(max_length=150, unique=True, verbose_name="用户名")
|
username = models.CharField(max_length=150, unique=True, verbose_name="用户名")
|
||||||
|
|||||||
@ -78,7 +78,7 @@ class LoginSerializer(ApiMixin, serializers.Serializer):
|
|||||||
user = QuerySet(User).filter(Q(username=username,
|
user = QuerySet(User).filter(Q(username=username,
|
||||||
password=password) | Q(email=username,
|
password=password) | Q(email=username,
|
||||||
password=password)).first()
|
password=password)).first()
|
||||||
if user is None or user.source != "LOCAL":
|
if user is None:
|
||||||
raise ExceptionCodeConstants.INCORRECT_USERNAME_AND_PASSWORD.value.to_app_api_exception()
|
raise ExceptionCodeConstants.INCORRECT_USERNAME_AND_PASSWORD.value.to_app_api_exception()
|
||||||
if not user.is_active:
|
if not user.is_active:
|
||||||
raise AppApiException(1005, "用户已被禁用,请联系管理员!")
|
raise AppApiException(1005, "用户已被禁用,请联系管理员!")
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user