Merge branch 'master' into feature/backport-workflow

Author: atif09

.github/workflows/ci.yml

@@ -24,7 +24,6 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - "3.9"
           - "3.10"
           - "3.11"
           - "3.12"
@@ -35,26 +34,19 @@ jobs:
           - django~=5.1.0
           - django~=5.2.0
         exclude:
-          # Django 5.0+ requires Python >=3.10
-          - python-version: "3.9"
-            django-version: django~=5.0.0
-          - python-version: "3.9"
-            django-version: django~=5.1.0
-          - python-version: "3.9"
-            django-version: django~=5.2.0
           # Python 3.13 supported only in Django >=5.1.3
           - python-version: "3.13"
             django-version: django~=4.2.0
           - python-version: "3.13"
             django-version: django~=5.0.0
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Cache APT packages
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: /var/cache/apt/archives
           key: apt-${{ runner.os }}-${{ hashFiles('.github/workflows/ci.yml') }}

.github/workflows/pypi.yml

@@ -17,7 +17,7 @@ jobs:
     permissions:
       id-token: write
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Python
         uses: actions/setup-python@v6
         with:

docs/developer/admin-utils.rst

@@ -65,7 +65,7 @@ creating filters for related multitenant models.
 
 Consider the following example from `IpAddressAdmin in openwisp-ipam
 <https://github.com/openwisp/openwisp-ipam/blob/956d9d25fc1ac339cb148ec7faf80046cc14be37/openwisp_ipam/admin.py#L216-L227>`_.
-``IpAddressAdmin`` allows filtering `IpAddress objects by ``Subnet``
+``IpAddressAdmin`` allows filtering ``IpAddress`` objects by ``Subnet``
 belonging to organizations managed by the user.
 
 .. code-block:: python

docs/developer/extending.rst

@@ -44,7 +44,7 @@ A Django app is nothing more than a `Python package
 of Python scripts). In the following examples, we'll call this Django app
 ``myusers``, but you can name it however you like:
 
-.. code-block::
+.. code-block:: bash
 
     django-admin startapp myusers
 
@@ -73,7 +73,7 @@ apps, please refer to the `Django documentation
 
 Install (and add to the requirements of your project) openwisp-users:
 
-.. code-block::
+.. code-block:: bash
 
     pip install openwisp-users
 
@@ -185,7 +185,7 @@ Substitute ``myusers`` with the name you chose in step 1.
 
 Create database migrations:
 
-.. code-block::
+.. code-block:: bash
 
     ./manage.py makemigrations
 
@@ -196,7 +196,7 @@ contents of the `sample_users/migrations/0004_default_groups.py
 
 Then, run the migrations:
 
-.. code-block::
+.. code-block:: bash
 
     ./manage.py migrate
 
@@ -361,7 +361,7 @@ to find out how to do this.
 
 You can then run tests with:
 
-.. code-block::
+.. code-block:: bash
 
     # the --parallel flag is optional
     ./manage.py test --parallel myusers

docs/developer/index.rst

@@ -8,7 +8,7 @@ Developer Docs
 
     ./installation.rst
     ./admin-utils.rst
-    ./django-rest-framework-utils
+    ./django-rest-framework-utils.rst
     ./misc-utils.rst
     ./extending.rst
 

docs/developer/misc-utils.rst

@@ -96,7 +96,7 @@ The cache is automatically invalidated on the following events:
 
 Usage example:
 
-.. code-block::
+.. code-block:: python-console
 
     >>> user.organizations_dict
     ... {'20135c30-d486-4d68-993f-322b8acb51c4': {'is_admin': True, 'is_owner': False}}
@@ -110,7 +110,7 @@ Returns a list of primary keys of organizations the user can manage.
 
 Usage example:
 
-.. code-block::
+.. code-block:: python-console
 
     >>> user.organizations_managed
     ... ['20135c30-d486-4d68-993f-322b8acb51c4']
@@ -122,7 +122,7 @@ Returns a list of primary keys of organizations the user owns.
 
 Usage example:
 
-.. code-block::
+.. code-block:: python-console
 
     >>> user.organizations_owned
     ... ['20135c30-d486-4d68-993f-322b8acb51c4']

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 @@
 
 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/static/openwisp-users/css/admin.css

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

openwisp_users/tests/test_adapter.py

@@ -43,3 +43,16 @@ def test_password_reset_email_sent(self):
         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)

requirements.txt

@@ -1,7 +1,7 @@
 django-organizations>=2.5.0,<2.6.0
 django-extensions>=3.2,<4.2
 django-allauth[socialaccount]>=65.12.0,<65.14.0
-django-phonenumber-field>=8.1.0,<8.2.0
+django-phonenumber-field>=8.1.0,<8.5.0
 phonenumbers>=9.0.10,<9.1.0
 openwisp-utils[rest,celery] @ https://github.com/openwisp/openwisp-utils/archive/refs/heads/1.3.tar.gz
 packaging