Merge branch 'master' of github.com:iMerica/dj-rest-auth

Author: iMerica

demo/demo/settings.py

@@ -120,7 +120,7 @@
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 SITE_ID = 1
 ACCOUNT_EMAIL_REQUIRED = False
-ACCOUNT_AUTHENTICATION_METHOD = 'username'
+ACCOUNT_LOGIN_METHODS = {'username'}
 ACCOUNT_EMAIL_VERIFICATION = 'optional'
 
 

demo/requirements.txt

@@ -5,5 +5,5 @@ django-allauth[socialaccount]>=64.0.0
 drf-yasg==1.21.7
 django-cors-headers==4.4.0
 coreapi==2.3.3
-setuptools==75.1.0
+setuptools==78.1.1
 -e ./..

dj_rest_auth/forms.py

@@ -73,8 +73,14 @@ def save(self, request, **kwargs):
                 'uid': uid,
             }
             if (
+                getattr(allauth_account_settings, "LOGIN_METHODS", None) and  # noqa: W504
+                allauth_account_settings.AuthenticationMethod.EMAIL not in allauth_account_settings.LOGIN_METHODS
+            ):
+                context['username'] = user_username(user)
+            elif (
                 allauth_account_settings.AUTHENTICATION_METHOD != allauth_account_settings.AuthenticationMethod.EMAIL
             ):
+                # AUTHENTICATION_METHOD is deprecated
                 context['username'] = user_username(user)
             get_adapter(request).send_mail(
                 'account/email/password_reset_key', email, context

dj_rest_auth/locale/ar/LC_MESSAGES/django.po

@@ -7,58 +7,74 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dj-rest-auth\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-28 11:41+0800\n"
+"POT-Creation-Date: 2025-07-11 16:58+0300\n"
 "PO-Revision-Date: 2023-02-04 21:36+0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=(n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5);\n"
+"Plural-Forms: nplurals=6; plural=(n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5);\n"
 "X-Generator: Poedit 3.2.2\n"
 
-#: registration/serializers.py:67
+#: app_settings.py:75
+msgid ""
+"The '{}' setting has been removed. Please refer to '{}' for available "
+"settings."
+msgstr ""
+
+#: jwt_auth.py:75
+msgid "WIll override cookie."
+msgstr ""
+
+#: jwt_auth.py:86
+msgid "No valid refresh token found."
+msgstr ""
+
+#: registration/serializers.py:78
+msgid "Define callback_url in view"
+msgstr "عرف \"callback_url\" في دالة العرض"
+
+#: registration/serializers.py:87
 msgid "View is not defined, pass it as a context variable"
 msgstr "لم يتم تعريف دالة العرض ، قم بتمريرها كمتغير في السياق"
 
-#: registration/serializers.py:72
+#: registration/serializers.py:92
 msgid "Define adapter_class in view"
 msgstr "عرف \"adapter_class\" في دالة العرض"
 
-#: registration/serializers.py:91
-msgid "Define callback_url in view"
-msgstr "عرف \"callback_url\" في دالة العرض"
-
-#: registration/serializers.py:95
+#: registration/serializers.py:118
 msgid "Define client_class in view"
 msgstr "حدد \"client_class\" في دالة العرض"
 
-#: registration/serializers.py:116
+#: registration/serializers.py:139
+msgid "Failed to exchange code for access token"
+msgstr ""
+
+#: registration/serializers.py:150
 msgid "Incorrect input. access_token or code is required."
 msgstr "مدخل غير صحيح. رمز وصول مطلوب."
 
-#: registration/serializers.py:125
+#: registration/serializers.py:163
 msgid "Incorrect value"
 msgstr "قيمة غير صحيحة"
 
-#: registration/serializers.py:139
+#: registration/serializers.py:180 registration/serializers.py:188
+#: registration/serializers.py:243
 msgid "User is already registered with this e-mail address."
 msgstr "يوجد مستخدم مسجل بعنوان البريد الإلكتروني هذا."
 
-#: registration/serializers.py:185
-msgid "A user is already registered with this e-mail address."
-msgstr "مستخدم مسجل بعنوان البريد الإلكتروني هذا."
-
-#: registration/serializers.py:193
+#: registration/serializers.py:252
 msgid "The two password fields didn't match."
 msgstr "لا يتطابق حقلا كلمة المرور."
 
-#: registration/views.py:51
+#: registration/views.py:52
 msgid "Verification e-mail sent."
 msgstr "تم إرسال رسالة التحقق عبر البريد الإلكتروني."
 
-#: registration/views.py:98
+#: registration/views.py:121 registration/views.py:142
 #, fuzzy
 msgid "ok"
 msgstr "تم"
@@ -67,38 +83,72 @@ msgstr "تم"
 msgid "Must include \"email\" and \"password\"."
 msgstr "يجب إدخال \"البريد الإلكتروني\" و \"كلمة المرور\"."
 
-#: serializers.py:44
+#: serializers.py:42
 msgid "Must include \"username\" and \"password\"."
 msgstr "يجب إدخال \"اسم المستخدم\" و \"كلمة المرور\"."
 
-#: serializers.py:57
+#: serializers.py:53
 msgid "Must include either \"username\" or \"email\" and \"password\"."
-msgstr "يجب إدخال \"اسم المستخدم\" أو \"البريد الإلكتروني\" مع \"كلمة المرور\"."
-
-#: serializers.py:98
-msgid "User account is disabled."
-msgstr "حساب المستخدم معطل."
+msgstr ""
+"يجب إدخال \"اسم المستخدم\" أو \"البريد الإلكتروني\" مع \"كلمة المرور\"."
 
-#: serializers.py:101
+#: serializers.py:99 serializers.py:124
 msgid "Unable to log in with provided credentials."
 msgstr "تعذر تسجيل الدخول بالبيانات المقدمة."
 
-#: serializers.py:110
+#: serializers.py:106
+msgid "User account is disabled."
+msgstr "حساب المستخدم معطل."
+
+#: serializers.py:115
 msgid "E-mail is not verified."
 msgstr "لم يتم التحقق من البريد الإلكتروني."
 
-#: views.py:127
+#: serializers.py:287 serializers.py:290
+msgid "Invalid value"
+msgstr ""
+
+#: serializers.py:334
+msgid "Your old password was entered incorrectly. Please enter it again."
+msgstr ""
+
+#: views.py:155
+msgid "You should be logged in to logout. Check whether the token is passed."
+msgstr ""
+
+#: views.py:167
 msgid "Successfully logged out."
 msgstr "تم تسجيل الخروج."
 
-#: views.py:175
+#: views.py:191
+msgid "Refresh token was not included in cookie data."
+msgstr ""
+
+#: views.py:197
+msgid "Refresh token was not included in request data."
+msgstr ""
+
+#: views.py:207 views.py:211
+msgid "An error has occurred."
+msgstr ""
+
+#: views.py:216
+msgid ""
+"Neither cookies or blacklist are enabled, so the token has not been deleted "
+"server side. Please make sure the token is deleted client side."
+msgstr ""
+
+#: views.py:268
 msgid "Password reset e-mail has been sent."
 msgstr "تم إرسال البريد الإلكتروني الخاص بإعادة تعيين كلمة المرور."
 
-#: views.py:201
+#: views.py:295
 msgid "Password has been reset with the new password."
 msgstr "تمت إعادة تعيين كلمة المرور بكلمة المرور الجديدة."
 
-#: views.py:223
+#: views.py:318
 msgid "New password has been saved."
 msgstr "تم حفظ كلمة المرور الجديدة."
+
+#~ msgid "A user is already registered with this e-mail address."
+#~ msgstr "مستخدم مسجل بعنوان البريد الإلكتروني هذا."

dj_rest_auth/locale/az/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-26 16:16+0200\n"
+"POT-Creation-Date: 2025-07-11 16:59+0300\n"
 "PO-Revision-Date: 2023-06-26 16:28+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -18,78 +18,131 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 3.3.1\n"
 
-#: registration/serializers.py:67
+#: app_settings.py:75
+msgid ""
+"The '{}' setting has been removed. Please refer to '{}' for available "
+"settings."
+msgstr ""
+
+#: jwt_auth.py:75
+msgid "WIll override cookie."
+msgstr ""
+
+#: jwt_auth.py:86
+msgid "No valid refresh token found."
+msgstr ""
+
+#: registration/serializers.py:78
+msgid "Define callback_url in view"
+msgstr "“view” içərisində  “callback_url” təyin et"
+
+#: registration/serializers.py:87
 msgid "View is not defined, pass it as a context variable"
 msgstr "“View” təyin edilməyib, “context” dəyişəni kimi ötürün"
 
-#: registration/serializers.py:72
+#: registration/serializers.py:92
 msgid "Define adapter_class in view"
 msgstr "“view” içərisində “adapter_class” təyin et"
 
-#: registration/serializers.py:91
-msgid "Define callback_url in view"
-msgstr "“view” içərisində  “callback_url” təyin et"
-
-#: registration/serializers.py:95
+#: registration/serializers.py:118
 msgid "Define client_class in view"
 msgstr "“view” içərisində  “client_class” təyin et"
 
-#: registration/serializers.py:116
+#: registration/serializers.py:139
+msgid "Failed to exchange code for access token"
+msgstr ""
+
+#: registration/serializers.py:150
 msgid "Incorrect input. access_token or code is required."
 msgstr "Yanlış daxiletmə. \"access_token\" və ya \"code\" tələb olunur."
 
-#: registration/serializers.py:125
+#: registration/serializers.py:163
 msgid "Incorrect value"
 msgstr "Yalnış dəyər"
 
-#: registration/serializers.py:185
-msgid "A user is already registered with this e-mail address."
+#: registration/serializers.py:180 registration/serializers.py:188
+#: registration/serializers.py:243
+msgid "User is already registered with this e-mail address."
 msgstr "Bu email adresi ilə istifadəçi mövcuddur."
 
-#: registration/serializers.py:193
+#: registration/serializers.py:252
 msgid "The two password fields didn't match."
 msgstr "İki şifrə sahəsi üst-üstə düşmür."
 
-#: registration/views.py:98
+#: registration/views.py:52
+msgid "Verification e-mail sent."
+msgstr ""
+
+#: registration/views.py:121 registration/views.py:142
 msgid "ok"
 msgstr "tamam"
 
 #: serializers.py:33
 msgid "Must include \"email\" and \"password\"."
 msgstr "\"email\" və \"password\" olmalıdır."
 
-#: serializers.py:44
+#: serializers.py:42
 msgid "Must include \"username\" and \"password\"."
 msgstr "“username\" və  \"password\" olmalıdır."
 
-#: serializers.py:57
+#: serializers.py:53
 msgid "Must include either \"username\" or \"email\" and \"password\"."
 msgstr "Ya ”username\" yada \"email\" və \"password\" olmalıdır."
 
-#: serializers.py:98
-msgid "User account is disabled."
-msgstr "İstifadəçi hesabı deaktivdir."
-
-#: serializers.py:101
+#: serializers.py:99 serializers.py:124
 msgid "Unable to log in with provided credentials."
 msgstr "Daxil edilən məlumatlarla giriş etmək mümkün olmadı."
 
-#: serializers.py:110
+#: serializers.py:106
+msgid "User account is disabled."
+msgstr "İstifadəçi hesabı deaktivdir."
+
+#: serializers.py:115
 msgid "E-mail is not verified."
 msgstr "Email təsdiqlənməyib."
 
-#: views.py:127
+#: serializers.py:287 serializers.py:290
+msgid "Invalid value"
+msgstr ""
+
+#: serializers.py:334
+msgid "Your old password was entered incorrectly. Please enter it again."
+msgstr ""
+
+#: views.py:155
+msgid "You should be logged in to logout. Check whether the token is passed."
+msgstr ""
+
+#: views.py:167
 msgid "Successfully logged out."
 msgstr "Uğurlu şəkildə çıxış edildi."
 
-#: views.py:175
+#: views.py:191
+msgid "Refresh token was not included in cookie data."
+msgstr ""
+
+#: views.py:197
+msgid "Refresh token was not included in request data."
+msgstr ""
+
+#: views.py:207 views.py:211
+msgid "An error has occurred."
+msgstr ""
+
+#: views.py:216
+msgid ""
+"Neither cookies or blacklist are enabled, so the token has not been deleted "
+"server side. Please make sure the token is deleted client side."
+msgstr ""
+
+#: views.py:268
 msgid "Password reset e-mail has been sent."
 msgstr "Şifrə sıfırlama emaili göndərildi."
 
-#: views.py:201
+#: views.py:295
 msgid "Password has been reset with the new password."
 msgstr "Şifrə yeni şifrə ilə sıfırlandı."
 
-#: views.py:223
+#: views.py:318
 msgid "New password has been saved."
 msgstr "Yeni şifrə yaddaşa verildi."