openwisp-users 1.2.0__tar.gz → 1.2.2__tar.gz

{openwisp_users-1.2.0 → openwisp_users-1.2.2}/CHANGES.rst

@@ -1,6 +1,35 @@
 Changelog
 =========
 
+Version 1.2.2 [2026-04-25]
+--------------------------
+
+Bugfixes
+~~~~~~~~
+
+- Added SocialAccount inline to UserAdmin when needed `#501
+  <https://github.com/openwisp/openwisp-users/issues/501>`_
+
+Version 1.2.1 [2026-04-22]
+--------------------------
+
+Changes
+~~~~~~~
+
+Dependencies
+++++++++++++
+
+- Allowed upgrade of django-allauth up to 65.13.0.
+
+Bugfixes
+~~~~~~~~
+
+- Allowed managing social auth secrets when needed.
+- Ensured ``site_name`` is displayed in password reset email `#482
+  <https://github.com/openwisp/openwisp-users/issues/482>`_.
+- Prevented authentication without a username in
+  ``UsersAuthenticationBackend``.
+
 Version 1.2.0 [2025-10-23]
 --------------------------
 

{openwisp_users-1.2.0/openwisp_users.egg-info → openwisp_users-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openwisp-users
-Version: 1.2.0
+Version: 1.2.2
 Summary: Provides basic multi-tenancy features for OpenWISP (using the Django web-framework)
 Home-page: http://openwisp.org
 Download-URL: https://github.com/openwisp/openwisp-users/releases
@@ -20,7 +20,7 @@ Classifier: Programming Language :: Python :: 3
 License-File: LICENSE
 Requires-Dist: django-organizations<2.6.0,>=2.5.0
 Requires-Dist: django-extensions<4.2,>=3.2
-Requires-Dist: django-allauth[socialaccount]<65.13.0,>=65.12.0
+Requires-Dist: django-allauth[socialaccount]<65.14.0,>=65.12.0
 Requires-Dist: django-phonenumber-field<8.2.0,>=8.1.0
 Requires-Dist: phonenumbers<9.1.0,>=9.0.10
 Requires-Dist: openwisp-utils[celery,rest]~=1.2.0

{openwisp_users-1.2.0 → openwisp_users-1.2.2}/openwisp_users/__init__.py

@@ -1,4 +1,4 @@
-VERSION = (1, 2, 0, "final")
+VERSION = (1, 2, 2, "final")
 __version__ = VERSION  # alias
 
 

{openwisp_users-1.2.0 → openwisp_users-1.2.2}/openwisp_users/accounts/adapter.py

@@ -1,4 +1,5 @@
 from allauth.account.adapter import DefaultAccountAdapter
+from django.contrib.sites.shortcuts import get_current_site
 from django.template import TemplateDoesNotExist
 from django.template.loader import render_to_string
 from django.utils.translation import gettext as _
@@ -8,6 +9,8 @@ from openwisp_utils.admin_theme.email import send_email
 
 class EmailAdapter(DefaultAccountAdapter):
     def send_mail(self, template_prefix, email, context):
+        if "current_site" not in context and hasattr(self, "request"):
+            context["current_site"] = get_current_site(self.request)
         subject = render_to_string("{0}_subject.txt".format(template_prefix), context)
         subject = " ".join(subject.splitlines()).strip()
         subject = self.format_email_subject(subject)

{openwisp_users-1.2.0 → openwisp_users-1.2.2}/openwisp_users/accounts/urls.py

@@ -77,12 +77,11 @@ urlpatterns = [
 
 if app_settings.SOCIALACCOUNT_ENABLED:
     urlpatterns += [path("social/", include("allauth.socialaccount.urls"))]
-
-for provider in providers.registry.get_class_list():
-    try:
-        prov_mod = import_module(provider.get_package() + ".urls")
-    except ImportError:
-        continue
-    prov_urlpatterns = getattr(prov_mod, "urlpatterns", None)
-    if prov_urlpatterns:
-        urlpatterns += prov_urlpatterns
+    for provider in providers.registry.get_class_list():
+        try:
+            prov_mod = import_module(provider.get_package() + ".urls")
+        except ImportError:
+            continue
+        prov_urlpatterns = getattr(prov_mod, "urlpatterns", None)
+        if prov_urlpatterns:
+            urlpatterns += prov_urlpatterns

{openwisp_users-1.2.0 → openwisp_users-1.2.2}/openwisp_users/admin.py

@@ -652,11 +652,32 @@ if admin.site.is_registered(EmailAddress):
     admin.site.unregister(EmailAddress)
 
 if allauth_settings.SOCIALACCOUNT_ENABLED:
-    for model in [
-        ("socialaccount", "SocialApp"),
+    _unregister_socialaccount_models = [
         ("socialaccount", "SocialToken"),
         ("socialaccount", "SocialAccount"),
-    ]:
+    ]
+    # allauth OAuth/SAML not enabled
+    if not app_settings.SOCIALACCOUNT_ADMIN_NEEDED:  # pragma: no cover
+        _unregister_socialaccount_models.append(("socialaccount", "SocialApp"))
+    # allauth OAuth/SAML enabled
+    else:
+        from allauth.socialaccount.models import SocialAccount
+
+        class SocialAccountInline(admin.StackedInline):
+            model = SocialAccount
+            extra = 0
+            readonly_fields = ("provider", "uid", "extra_data")
+
+            def has_add_permission(self, request, obj=None):
+                return False
+
+            def has_delete_permission(self, request, obj=None):
+                return False
+
+        UserAdmin.inlines.append(SocialAccountInline)
+
+    # Un-register cluttering socialaccount models
+    for model in _unregister_socialaccount_models:
         model_class = apps.get_model(*model)
         if admin.site.is_registered(model_class):
             admin.site.unregister(model_class)

{openwisp_users-1.2.0 → openwisp_users-1.2.2}/openwisp_users/backends.py

@@ -11,6 +11,11 @@ User = get_user_model()
 
 class UsersAuthenticationBackend(ModelBackend):
     def authenticate(self, request, username=None, password=None, **kwargs):
+        # Only proceed if a username is provided. Other auth backends may attempt
+        # authentication without a username; returning early here avoids querying
+        # the database with a `None` username, which can be inefficient.
+        if not username:
+            return
         for user in self.get_users(username):
             if user.check_password(password) and self.user_can_authenticate(user):
                 return user

{openwisp_users-1.2.0 → openwisp_users-1.2.2}/openwisp_users/settings.py

@@ -49,3 +49,12 @@ setattr(
         "openwisp_users.views.AutocompleteJsonView",
     ),
 )
+
+# if OAuth/SAML is enabled, allow manging keys/secrets
+if any(
+    app.startswith("allauth.socialaccount.providers") for app in settings.INSTALLED_APPS
+):  # pragma: no cover
+    SOCIALACCOUNT_ADMIN_NEEDED = True
+# otherwise hide the socialaccount admin (not needed)
+else:
+    SOCIALACCOUNT_ADMIN_NEEDED = False

openwisp_users-1.2.2/openwisp_users/static/openwisp-users/css/admin.css

@@ -0,0 +1,4 @@
+input.readonly {
+  border: 1px solid var(--hairline-color) !important;
+  background-color: var(--hairline-color);
+}

{openwisp_users-1.2.0 → openwisp_users-1.2.2}/openwisp_users/tests/test_adapter.py

@@ -43,3 +43,16 @@ class TestEmailAdapter(TestOrganizationMixin, TestCase):
         self.assertFalse(email.alternatives)
         self.assertIn("Password Reset Email", email.subject)
         self.assertIn("Click the link below to reset your password", email.body)
+
+    def test_password_reset_includes_site_name(self):
+        self._create_user()
+        params = {"email": "test@tester.com"}
+        self.client.post(reverse("account_reset_password"), params, follow=True)
+        self.assertEqual(len(mail.outbox), 1)
+        email = mail.outbox[0]
+        # plain text body should contain example.com from site name
+        self.assertIn("example.com", email.body)
+        # if there is an HTML alternative, check it too
+        if email.alternatives:
+            html = email.alternatives[0][0]
+            self.assertIn("example.com", html)

{openwisp_users-1.2.0 → openwisp_users-1.2.2}/openwisp_users/tests/test_admin.py

@@ -73,7 +73,7 @@ class TestUsersAdmin(
 
     @property
     def add_user_inline_params(self):
-        return {
+        params = {
             "emailaddress_set-TOTAL_FORMS": 0,
             "emailaddress_set-INITIAL_FORMS": 0,
             "emailaddress_set-MIN_NUM_FORMS": 0,
@@ -83,6 +83,19 @@ class TestUsersAdmin(
             f"{self.app_label}_organizationuser-MIN_NUM_FORMS": 0,
             f"{self.app_label}_organizationuser-MAX_NUM_FORMS": 0,
         }
+        self._add_socialaccount_inline_params(params)
+        return params
+
+    def _add_socialaccount_inline_params(self, params):
+        if app_settings.SOCIALACCOUNT_ADMIN_NEEDED:
+            params.update(
+                {
+                    "socialaccount_set-TOTAL_FORMS": 0,
+                    "socialaccount_set-INITIAL_FORMS": 0,
+                    "socialaccount_set-MIN_NUM_FORMS": 0,
+                    "socialaccount_set-MAX_NUM_FORMS": 0,
+                }
+            )
 
     def test_admin_add_user_auto_email(self):
         admin = self._create_admin()
@@ -1702,6 +1715,7 @@ class TestBasicUsersIntegration(
 
     app_label = "openwisp_users"
     is_integration_test = True
+    _add_socialaccount_inline_params = TestUsersAdmin._add_socialaccount_inline_params
 
     def _get_user_edit_form_inline_params(self, user, organization):
         params = {
@@ -1740,6 +1754,7 @@ class TestBasicUsersIntegration(
                     f"{self.app_label}_organizationuser-0-user": str(user.pk),
                 }
             )
+        self._add_socialaccount_inline_params(params)
         return params
 
     def test_change_user(self):

{openwisp_users-1.2.0 → openwisp_users-1.2.2}/openwisp_users/tests/test_backends.py

@@ -153,3 +153,13 @@ class TestBackends(TestOrganizationMixin, TestCase):
                 password="tester2",
             )
             self.assertEqual(auth_backend.get_users("911524370").count(), 0)
+
+    @mock.patch("openwisp_users.backends.UsersAuthenticationBackend.get_users")
+    def test_user_auth_without_email(self, mocked_get_users):
+        self._create_user(
+            username="tester",
+            password="tester",
+            email=None,
+        )
+        self.client.login(username=None, password=None)
+        mocked_get_users.assert_not_called()

{openwisp_users-1.2.0 → openwisp_users-1.2.2/openwisp_users.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openwisp-users
-Version: 1.2.0
+Version: 1.2.2
 Summary: Provides basic multi-tenancy features for OpenWISP (using the Django web-framework)
 Home-page: http://openwisp.org
 Download-URL: https://github.com/openwisp/openwisp-users/releases
@@ -20,7 +20,7 @@ Classifier: Programming Language :: Python :: 3
 License-File: LICENSE
 Requires-Dist: django-organizations<2.6.0,>=2.5.0
 Requires-Dist: django-extensions<4.2,>=3.2
-Requires-Dist: django-allauth[socialaccount]<65.13.0,>=65.12.0
+Requires-Dist: django-allauth[socialaccount]<65.14.0,>=65.12.0
 Requires-Dist: django-phonenumber-field<8.2.0,>=8.1.0
 Requires-Dist: phonenumbers<9.1.0,>=9.0.10
 Requires-Dist: openwisp-utils[celery,rest]~=1.2.0

{openwisp_users-1.2.0 → openwisp_users-1.2.2}/openwisp_users.egg-info/requires.txt

@@ -1,6 +1,6 @@
 django-organizations<2.6.0,>=2.5.0
 django-extensions<4.2,>=3.2
-django-allauth[socialaccount]<65.13.0,>=65.12.0
+django-allauth[socialaccount]<65.14.0,>=65.12.0
 django-phonenumber-field<8.2.0,>=8.1.0
 phonenumbers<9.1.0,>=9.0.10
 openwisp-utils[celery,rest]~=1.2.0

{openwisp_users-1.2.0 → openwisp_users-1.2.2}/requirements.txt

@@ -1,6 +1,6 @@
 django-organizations>=2.5.0,<2.6.0
 django-extensions>=3.2,<4.2
-django-allauth[socialaccount]>=65.12.0,<65.13.0
+django-allauth[socialaccount]>=65.12.0,<65.14.0
 django-phonenumber-field>=8.1.0,<8.2.0
 phonenumbers>=9.0.10,<9.1.0
 openwisp-utils[rest,celery]~=1.2.0

openwisp_users-1.2.0/openwisp_users/static/openwisp-users/css/admin.css

@@ -1,4 +0,0 @@
-input.readonly {
-  border: 1px solid rgba(0, 0, 0, 0.05) !important;
-  background-color: rgba(0, 0, 0, 0.07);
-}