diff --git a/poetry.lock b/poetry.lock
index 34e4a6b127ac18854fd296f8bc525f826c837fa7..dbb6a5f83c56e79bc7c9ed722ef754102e4bb259 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -11,6 +11,41 @@ type = "legacy"
url = "https://edugit.org/api/v4/projects/461/packages/pypi/simple"
reference = "gitlab"
+[[package]]
+name = "aleksis-app-hjelp"
+version = "2.0rc3+20210816203201.22faa748"
+description = "AlekSIS (School Information System) — App Hjelp (FAQ, issue reporting and support)"
+category = "main"
+optional = false
+python-versions = ">=3.9,<4.0"
+
+[package.dependencies]
+aleksis-core = ">=2.0rc,<3.0"
+
+[package.source]
+type = "legacy"
+url = "https://edugit.org/api/v4/projects/461/packages/pypi/simple"
+reference = "gitlab"
+
+[[package]]
+name = "aleksis-app-ldap"
+version = "2.0rc1+20210623221228.b3b948af"
+description = "AlekSIS (School Information System) — App LDAP (General LDAP import/export)"
+category = "main"
+optional = false
+python-versions = ">=3.9,<4.0"
+
+[package.dependencies]
+aleksis-core = {version = ">=2.0rc,<3.0", extras = ["ldap"]}
+django-ldapdb = ">=1.4.0,<2.0.0"
+python-magic = ">=0.4.22,<0.5.0"
+tqdm = ">=4.44.1,<5.0.0"
+
+[package.source]
+type = "legacy"
+url = "https://edugit.org/api/v4/projects/461/packages/pypi/simple"
+reference = "gitlab"
+
[[package]]
name = "aleksis-builddeps"
version = "4"
@@ -70,6 +105,7 @@ colour = ">=0.1.5,<0.2.0"
Django = ">=3.2.5,<4.0.0"
django-allauth = ">=0.45.0,<0.46.0"
django-any-js = ">=1.1,<2.0"
+django-auth-ldap = {version = ">=2.2,<3.0", optional = true, markers = "extra == \"ldap\""}
django-bleach = ">=0.7.0,<0.8.0"
django-cachalot = ">=2.3.2,<3.0.0"
django-cache-memoize = ">=0.1.6,<0.2.0"
@@ -853,6 +889,23 @@ type = "legacy"
url = "https://edugit.org/api/v4/projects/461/packages/pypi/simple"
reference = "gitlab"
+[[package]]
+name = "django-auth-ldap"
+version = "2.4.0"
+description = "Django LDAP authentication backend."
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[package.dependencies]
+Django = ">=2.2"
+python-ldap = ">=3.1"
+
+[package.source]
+type = "legacy"
+url = "https://edugit.org/api/v4/projects/461/packages/pypi/simple"
+reference = "gitlab"
+
[[package]]
name = "django-bleach"
version = "0.7.2"
@@ -1284,6 +1337,26 @@ type = "legacy"
url = "https://edugit.org/api/v4/projects/461/packages/pypi/simple"
reference = "gitlab"
+[[package]]
+name = "django-ldapdb"
+version = "1.5.1"
+description = "A LDAP database backend for Django"
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[package.dependencies]
+Django = ">=2.2"
+python-ldap = ">=3.0"
+
+[package.extras]
+dev = ["check-manifest", "flake8", "isort (>=5.0.0)", "tox", "factory-boy", "volatildap (>=1.1.0)", "wheel", "zest.releaser"]
+
+[package.source]
+type = "legacy"
+url = "https://edugit.org/api/v4/projects/461/packages/pypi/simple"
+reference = "gitlab"
+
[[package]]
name = "django-maintenance-mode"
version = "0.16.0"
@@ -2535,7 +2608,7 @@ reference = "gitlab"
[[package]]
name = "phonenumbers"
-version = "8.12.31"
+version = "8.12.32"
description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers."
category = "main"
optional = false
@@ -2676,6 +2749,35 @@ type = "legacy"
url = "https://edugit.org/api/v4/projects/461/packages/pypi/simple"
reference = "gitlab"
+[[package]]
+name = "pyasn1"
+version = "0.4.8"
+description = "ASN.1 types and codecs"
+category = "main"
+optional = false
+python-versions = "*"
+
+[package.source]
+type = "legacy"
+url = "https://edugit.org/api/v4/projects/461/packages/pypi/simple"
+reference = "gitlab"
+
+[[package]]
+name = "pyasn1-modules"
+version = "0.2.8"
+description = "A collection of ASN.1-based protocols modules."
+category = "main"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+pyasn1 = ">=0.4.6,<0.5.0"
+
+[package.source]
+type = "legacy"
+url = "https://edugit.org/api/v4/projects/461/packages/pypi/simple"
+reference = "gitlab"
+
[[package]]
name = "pycodestyle"
version = "2.7.0"
@@ -2946,6 +3048,36 @@ type = "legacy"
url = "https://edugit.org/api/v4/projects/461/packages/pypi/simple"
reference = "gitlab"
+[[package]]
+name = "python-ldap"
+version = "3.3.1"
+description = "Python modules for implementing LDAP clients"
+category = "main"
+optional = false
+python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*"
+
+[package.dependencies]
+pyasn1 = ">=0.3.7"
+pyasn1_modules = ">=0.1.5"
+
+[package.source]
+type = "legacy"
+url = "https://edugit.org/api/v4/projects/461/packages/pypi/simple"
+reference = "gitlab"
+
+[[package]]
+name = "python-magic"
+version = "0.4.24"
+description = "File type identification using libmagic"
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+
+[package.source]
+type = "legacy"
+url = "https://edugit.org/api/v4/projects/461/packages/pypi/simple"
+reference = "gitlab"
+
[[package]]
name = "python3-openid"
version = "3.2.0"
@@ -3780,13 +3912,21 @@ reference = "gitlab"
[metadata]
lock-version = "1.1"
python-versions = "^3.9"
-content-hash = "38f57bd42afb1db42e6b72c044550171f26f7606b6e8aa018c3b4260f8408293"
+content-hash = "72a5295e8e38e4826c579bf736d98ae7838782f3286356cfe248754798cc08fd"
[metadata.files]
alabaster = [
{file = "alabaster-0.7.12-py2.py3-none-any.whl", hash = "sha256:446438bdcca0e05bd45ea2de1668c1d9b032e1a9154c2c259092d77031ddd359"},
{file = "alabaster-0.7.12.tar.gz", hash = "sha256:a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02"},
]
+aleksis-app-hjelp = [
+ {file = "AlekSIS-App-Hjelp-2.0rc3+20210816203201.22faa748.tar.gz", hash = "sha256:8803b782d9c1829604a2988673b7bb63ff67911467fd72ed84fc21c016928575"},
+ {file = "AlekSIS_App_Hjelp-2.0rc3+20210816203201.22faa748-py3-none-any.whl", hash = "sha256:8fa75804202770db16f2a1901333f273897e3e29e8ed0b7db202a198913bba90"},
+]
+aleksis-app-ldap = [
+ {file = "AlekSIS-App-LDAP-2.0rc1+20210623221228.b3b948af.tar.gz", hash = "sha256:de3d417cd59769d8ca7915f41e3000472452d025c486b66e9d8038c4023c0e54"},
+ {file = "AlekSIS_App_LDAP-2.0rc1+20210623221228.b3b948af-py3-none-any.whl", hash = "sha256:a4ddec54ed790675eb75c6ceec45a724ee3ffeefc0f8dd940c4f296df92add01"},
+]
aleksis-builddeps = [
{file = "AlekSIS-Builddeps-4.tar.gz", hash = "sha256:aaaa22965228b9b9b7de812e3e7fa9cbfdbf8635bb22d6f3a201dc0cc6d8d307"},
{file = "AlekSIS_Builddeps-4-py3-none-any.whl", hash = "sha256:02a93e503f5810e6c93a8bc829bc8cbda735ccbf78b91954d2f6507dfea3d01f"},
@@ -4063,6 +4203,10 @@ django-appconf = [
{file = "django-appconf-1.0.4.tar.gz", hash = "sha256:be58deb54a43d77d2e1621fe59f787681376d3cd0b8bd8e4758ef6c3a6453380"},
{file = "django_appconf-1.0.4-py2.py3-none-any.whl", hash = "sha256:1b1d0e1069c843ebe8ae5aa48ec52403b1440402b320c3e3a206a0907e97bb06"},
]
+django-auth-ldap = [
+ {file = "django-auth-ldap-2.4.0.tar.gz", hash = "sha256:60fcbfc3141c99c3c49d3ccd7311a3992a231c319d94b6d2c143968f63676676"},
+ {file = "django_auth_ldap-2.4.0-py3-none-any.whl", hash = "sha256:2d869955da8a0c9a4448671bd9826b9f87458f6a9fc20278e84de8a81200a2be"},
+]
django-bleach = [
{file = "django-bleach-0.7.2.tar.gz", hash = "sha256:2afc7ed5a10395b0bf84dfd43999305f77120902468071c18a7b666dcf5421bf"},
{file = "django_bleach-0.7.2-py2.py3-none-any.whl", hash = "sha256:8761714ff9737c81e595f0a362a0527fac31cf8208157f6d5f49c06863b21bad"},
@@ -4167,6 +4311,10 @@ django-jsonstore = [
{file = "django-jsonstore-0.5.0.tar.gz", hash = "sha256:896dc10b08f59807eda1c6cebf43cd26e50d0db29d13495c027dc31e464be3c3"},
{file = "django_jsonstore-0.5.0-py2-none-any.whl", hash = "sha256:9630c1fb43ae9f8e32733c5cf7d4c3775ba6f08532f517c64025053352d72844"},
]
+django-ldapdb = [
+ {file = "django-ldapdb-1.5.1.tar.gz", hash = "sha256:5ea333c3130abbb86f8629766370a7f490878706469fce4e5008e41fb566392a"},
+ {file = "django_ldapdb-1.5.1-py2.py3-none-any.whl", hash = "sha256:2daee828a7eb1ce6ad0634ce5311339d77c08128829e575ff14d62a46771b86a"},
+]
django-maintenance-mode = [
{file = "django-maintenance-mode-0.16.0.tar.gz", hash = "sha256:57595795062156d5f3f712c885acc18b77a303425bf78b5de80e7fd47d9ab433"},
{file = "django_maintenance_mode-0.16.0-py3-none-any.whl", hash = "sha256:88287573b4e95285052f664d4f08e15ac4c350c1a6c77bc743ca3fc6e1f6410c"},
@@ -4531,8 +4679,8 @@ pg8000 = [
{file = "pg8000-1.21.1.tar.gz", hash = "sha256:1ccbeec93b70e2e8532df3abddc6905c7821909c96dceaaef751b57c5291869a"},
]
phonenumbers = [
- {file = "phonenumbers-8.12.31-py2.py3-none-any.whl", hash = "sha256:3ede2a2fce9b2ed335c0168e8276546d717fceeffe23761877925dff0a8f54f1"},
- {file = "phonenumbers-8.12.31.tar.gz", hash = "sha256:091ed2b3158567f12c99f719570a1ccace00179f39b44f1e6b895f59d93dadc8"},
+ {file = "phonenumbers-8.12.32-py2.py3-none-any.whl", hash = "sha256:8a3c19c38852980961cc380b17ff8aeae844ccff7c4aae7a3789688f0351a628"},
+ {file = "phonenumbers-8.12.32.tar.gz", hash = "sha256:c52c9c3607483072303ba8d8759063edc44d2f8fe7b85afef40bd8d1aafb6483"},
]
pickleshare = [
{file = "pickleshare-0.7.5-py2.py3-none-any.whl", hash = "sha256:9649af414d74d4df115d5d718f82acb59c9d418196b7b4290ed47a12ce62df56"},
@@ -4654,6 +4802,14 @@ py = [
{file = "py-1.10.0-py2.py3-none-any.whl", hash = "sha256:3b80836aa6d1feeaa108e046da6423ab8f6ceda6468545ae8d02d9d58d18818a"},
{file = "py-1.10.0.tar.gz", hash = "sha256:21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3"},
]
+pyasn1 = [
+ {file = "pyasn1-0.4.8-py2.py3-none-any.whl", hash = "sha256:39c7e2ec30515947ff4e87fb6f456dfc6e84857d34be479c9d4a4ba4bf46aa5d"},
+ {file = "pyasn1-0.4.8.tar.gz", hash = "sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba"},
+]
+pyasn1-modules = [
+ {file = "pyasn1-modules-0.2.8.tar.gz", hash = "sha256:905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e"},
+ {file = "pyasn1_modules-0.2.8-py2.py3-none-any.whl", hash = "sha256:a50b808ffeb97cb3601dd25981f6b016cbb3d31fbf57a8b8a87428e6158d0c74"},
+]
pycodestyle = [
{file = "pycodestyle-2.7.0-py2.py3-none-any.whl", hash = "sha256:514f76d918fcc0b55c6680472f0a37970994e07bbb80725808c17089be302068"},
{file = "pycodestyle-2.7.0.tar.gz", hash = "sha256:c389c1d06bf7904078ca03399a4816f974a1d590090fecea0c63ec26ebaf1cef"},
@@ -4744,6 +4900,13 @@ python-gnupg = [
{file = "python-gnupg-0.4.7.tar.gz", hash = "sha256:2061f56b1942c29b92727bf9aecbd3cea3893acc9cccbdc7eb4604285efe4ac7"},
{file = "python_gnupg-0.4.7-py2.py3-none-any.whl", hash = "sha256:3ff5b1bf5e397de6e1fe41a7c0f403dad4e242ac92b345f440eaecfb72a7ebae"},
]
+python-ldap = [
+ {file = "python-ldap-3.3.1.tar.gz", hash = "sha256:4711cacf013e298754abd70058ccc995758177fb425f1c2d30e71adfc1d00aa5"},
+]
+python-magic = [
+ {file = "python-magic-0.4.24.tar.gz", hash = "sha256:de800df9fb50f8ec5974761054a708af6e4246b03b4bdaee993f948947b0ebcf"},
+ {file = "python_magic-0.4.24-py2.py3-none-any.whl", hash = "sha256:4fec8ee805fea30c07afccd1592c0f17977089895bdfaae5fec870a84e997626"},
+]
python3-openid = [
{file = "python3-openid-3.2.0.tar.gz", hash = "sha256:33fbf6928f401e0b790151ed2b5290b02545e8775f982485205a066f874aaeaf"},
{file = "python3_openid-3.2.0-py3-none-any.whl", hash = "sha256:6626f771e0417486701e0b4daff762e7212e820ca5b29fcc0d05f6f8736dfa6b"},
diff --git a/pyproject.toml b/pyproject.toml
index d35004b6c5befcb17c77ac8251e3e0b110bd8ab4..fb9a5d86e7de99d28084851df4ea357fdfb119af 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -27,8 +27,10 @@ secondary = true
[tool.poetry.dependencies]
python = "^3.9"
django-starfield = "^1.0.post2"
-aleksis-core = "2.0rc5"
+aleksis-core = {version = "2.0rc5", extras = ["ldap"]}
django-iban-field = "^0.8"
+aleksis-app-ldap = "^2.0rc1"
+aleksis-app-hjelp = "^2.0rc3"
[tool.poetry.plugins."aleksis.app"]
ticdesk = "aleksis.apps.ticdesk.apps:TICDeskConfig"