Merge branch 'prepare-release-2.0' into 'release/2.0'

Prepare release 2.0

See merge request AlekSIS/official/AlekSIS-App-LDAP!82

CHANGELOG.rst

@@ -6,6 +6,14 @@ All notable changes to this project will be documented in this file.
 The format is based on `Keep a Changelog`_,
 and this project adheres to `Semantic Versioning`_.
 
+`2.0`_ - 2021-10-30
+-------------------
+
+Fixed
+~~~~~
+
+* Do not errornously handle password change/reset for non-LDAP users.
+
 `2.0rc2`_ - 2021-09-16
 ----------------------
 
@@ -64,3 +72,4 @@ Added
 .. _2.0b0: https://edugit.org/AlekSIS/Official/AlekSIS-App-LDAP/-/tags/2.0b0
 .. _2.0rc1: https://edugit.org/AlekSIS/Official/AlekSIS-App-LDAP/-/tags/2.0rc1
 .. _2.0rc2: https://edugit.org/AlekSIS/Official/AlekSIS-App-LDAP/-/tags/2.0rc2
+.. _2.0: https://edugit.org/AlekSIS/Official/AlekSIS-App-LDAP/-/tags/2.0

aleksis/apps/ldap/util/ldap_password.py

@@ -21,6 +21,10 @@ def ldap_change_password(request, user, **kwargs):
 
         user.ldap_user = _LDAPUser(LDAPBackend(), user=user)
 
+    if not user.ldap_user.dn:
+        # The user is not linked to an LDAP user, so we do not handle the password change
+        return
+
     # Get old and new password from submitted form
     # We rely on allauth already having validated the form before emitting the signal
     old = request.POST.get("oldpassword", None)

pyproject.toml

 [tool.poetry]
 name = "AlekSIS-App-LDAP"
-version = "2.0rc2"
+version = "2.0"
 packages = [
     { include = "aleksis" }
 ]
@@ -16,7 +16,7 @@ repository = "https://edugit.org/AlekSIS/official/AlekSIS-App-LDAP"
 documentation = "https://aleksis.org/AlekSIS/docs/html/"
 keywords = ["SIS", "education", "school", "ldap", "users"]
 classifiers = [
-    "Development Status :: 4 - Beta",
+    "Development Status :: 5 - Production/Stable",
     "Environment :: Web Environment",
     "Framework :: Django :: 3.0",
     "Intended Audience :: Education",
@@ -33,7 +33,7 @@ secondary = true
 python = "^3.9"
 django-ldapdb = "^1.4.0"
 tqdm = "^4.44.1"
-aleksis-core = {version = "^2.0rc", extras = ["ldap"]}
+aleksis-core = {version = "^2.0", extras = ["ldap"]}
 python-magic = "^0.4.22"
 
 [tool.poetry.dev-dependencies]