cardo-python-utils 0.5.dev4__tar.gz → 0.5.dev6__tar.gz

cardo_python_utils-0.5.dev6/MANIFEST.in

@@ -0,0 +1,4 @@
+include LICENSE
+include README.rst
+include python_utils/django/keycloak/user_groups_changelist.html
+recursive-exclude tests *

{cardo_python_utils-0.5.dev4/cardo_python_utils.egg-info → cardo_python_utils-0.5.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cardo-python-utils
-Version: 0.5.dev4
+Version: 0.5.dev6
 Summary: Python library enhanced with a wide range of functions for different scenarios.
 Author-email: CardoAI <hello@cardoai.com>
 License: MIT
@@ -24,24 +24,16 @@ Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Provides-Extra: django
-Requires-Dist: Django; extra == "django"
-Provides-Extra: django-ninja
-Requires-Dist: Django; extra == "django-ninja"
-Requires-Dist: django-ninja; extra == "django-ninja"
-Requires-Dist: PyJWT; extra == "django-ninja"
-Provides-Extra: drf
-Requires-Dist: Django; extra == "drf"
-Requires-Dist: djangorestframework; extra == "drf"
-Requires-Dist: PyJWT; extra == "drf"
-Provides-Extra: django-admin-auth
-Requires-Dist: Django; extra == "django-admin-auth"
-Requires-Dist: mozilla-django-oidc>=4.0.1; extra == "django-admin-auth"
+Provides-Extra: django-keycloak-api
+Requires-Dist: PyJWT>=2.10.1; extra == "django-keycloak-api"
+Provides-Extra: django-keycloak-admin
+Requires-Dist: mozilla-django-oidc>=4.0.1; extra == "django-keycloak-admin"
 Provides-Extra: django-keycloak-groups
-Requires-Dist: Django; extra == "django-keycloak-groups"
 Requires-Dist: python-keycloak>=5.8.1; extra == "django-keycloak-groups"
 Provides-Extra: all
-Requires-Dist: Django; extra == "all"
+Requires-Dist: PyJWT>=2.10.1; extra == "all"
+Requires-Dist: mozilla-django-oidc>=4.0.1; extra == "all"
+Requires-Dist: python-keycloak>=5.8.1; extra == "all"
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0; extra == "dev"
 Requires-Dist: pytest-django>=4.5; extra == "dev"

{cardo_python_utils-0.5.dev4 → cardo_python_utils-0.5.dev6/cardo_python_utils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cardo-python-utils
-Version: 0.5.dev4
+Version: 0.5.dev6
 Summary: Python library enhanced with a wide range of functions for different scenarios.
 Author-email: CardoAI <hello@cardoai.com>
 License: MIT
@@ -24,24 +24,16 @@ Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Provides-Extra: django
-Requires-Dist: Django; extra == "django"
-Provides-Extra: django-ninja
-Requires-Dist: Django; extra == "django-ninja"
-Requires-Dist: django-ninja; extra == "django-ninja"
-Requires-Dist: PyJWT; extra == "django-ninja"
-Provides-Extra: drf
-Requires-Dist: Django; extra == "drf"
-Requires-Dist: djangorestframework; extra == "drf"
-Requires-Dist: PyJWT; extra == "drf"
-Provides-Extra: django-admin-auth
-Requires-Dist: Django; extra == "django-admin-auth"
-Requires-Dist: mozilla-django-oidc>=4.0.1; extra == "django-admin-auth"
+Provides-Extra: django-keycloak-api
+Requires-Dist: PyJWT>=2.10.1; extra == "django-keycloak-api"
+Provides-Extra: django-keycloak-admin
+Requires-Dist: mozilla-django-oidc>=4.0.1; extra == "django-keycloak-admin"
 Provides-Extra: django-keycloak-groups
-Requires-Dist: Django; extra == "django-keycloak-groups"
 Requires-Dist: python-keycloak>=5.8.1; extra == "django-keycloak-groups"
 Provides-Extra: all
-Requires-Dist: Django; extra == "all"
+Requires-Dist: PyJWT>=2.10.1; extra == "all"
+Requires-Dist: mozilla-django-oidc>=4.0.1; extra == "all"
+Requires-Dist: python-keycloak>=5.8.1; extra == "all"
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0; extra == "dev"
 Requires-Dist: pytest-django>=4.5; extra == "dev"

{cardo_python_utils-0.5.dev4 → cardo_python_utils-0.5.dev6}/cardo_python_utils.egg-info/SOURCES.txt

@@ -19,10 +19,10 @@ python_utils/text.py
 python_utils/time.py
 python_utils/types_hinting.py
 python_utils/django/utils.py
-python_utils/django/auth/__init__.py
-python_utils/django/auth/admin.py
-python_utils/django/auth/drf.py
-python_utils/django/auth/ninja.py
+python_utils/django/keycloak/__init__.py
 python_utils/django/keycloak/admin.py
+python_utils/django/keycloak/drf.py
 python_utils/django/keycloak/models.py
-python_utils/django/keycloak/service.py
+python_utils/django/keycloak/ninja.py
+python_utils/django/keycloak/service.py
+python_utils/django/keycloak/user_groups_changelist.html

{cardo_python_utils-0.5.dev4 → cardo_python_utils-0.5.dev6}/cardo_python_utils.egg-info/requires.txt

@@ -1,6 +1,8 @@
 
 [all]
-Django
+PyJWT>=2.10.1
+mozilla-django-oidc>=4.0.1
+python-keycloak>=5.8.1
 
 [dev]
 pytest>=7.0
@@ -8,23 +10,11 @@ pytest-django>=4.5
 coverage>=6.0
 tox>=3.25
 
-[django]
-Django
-
-[django-admin-auth]
-Django
+[django-keycloak-admin]
 mozilla-django-oidc>=4.0.1
 
+[django-keycloak-api]
+PyJWT>=2.10.1
+
 [django-keycloak-groups]
-Django
 python-keycloak>=5.8.1
-
-[django-ninja]
-Django
-django-ninja
-PyJWT
-
-[drf]
-Django
-djangorestframework
-PyJWT

{cardo_python_utils-0.5.dev4 → cardo_python_utils-0.5.dev6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cardo-python-utils"
-version = "0.5.dev4"
+version = "0.5.dev6"
 description = "Python library enhanced with a wide range of functions for different scenarios."
 readme = "README.rst"
 requires-python = ">=3.8"
@@ -31,29 +31,19 @@ classifiers = [
 dependencies = []
 
 [project.optional-dependencies]
-django = [
-    "Django",
+django-keycloak-api = [
+    "PyJWT>=2.10.1",
 ]
-django-ninja = [
-    "Django",
-    "django-ninja",
-    "PyJWT",
-]
-drf = [
-    "Django",
-    "djangorestframework",
-    "PyJWT",
-]
-django-admin-auth = [
-    "Django",
+django-keycloak-admin = [
     "mozilla-django-oidc>=4.0.1",
 ]
 django-keycloak-groups = [
-    "Django",
     "python-keycloak>=5.8.1",
 ]
 all = [
-    "Django",
+    "PyJWT>=2.10.1",
+    "mozilla-django-oidc>=4.0.1",
+    "python-keycloak>=5.8.1",
 ]
 dev = [
     "pytest>=7.0",

{cardo_python_utils-0.5.dev4 → cardo_python_utils-0.5.dev6}/python_utils/django/keycloak/admin.py

@@ -1,16 +1,64 @@
+from django.conf import settings
 from django.contrib import admin, messages
 from django.core.cache import cache
 from django.urls import path
 from django.shortcuts import redirect
+from mozilla_django_oidc.auth import OIDCAuthenticationBackend
 
 from .service import KeycloakService
 
 
-class UserGroupAdmin(admin.ModelAdmin):
+class KeycloakAuthenticationBackend(OIDCAuthenticationBackend):
+    def _get_user_data(self, claims) -> dict:
+        client_roles = (
+            claims.get("resource_access", {})
+            .get(getattr(settings, "OIDC_RP_CLIENT_ID", ""), {})
+            .get("roles", [])
+        )
+        is_superuser = "Admin" in client_roles
+
+        return {
+            "username": claims.get("preferred_username"),
+            "email": claims.get("email"),
+            "first_name": claims.get("given_name", ""),
+            "last_name": claims.get("family_name", ""),
+            "is_staff": claims.get("is_staff", False),
+            "is_superuser": is_superuser,
+        }
+
+    def filter_users_by_claims(self, claims):
+        username = claims.get("preferred_username")
+        if not username:
+            return self.UserModel.objects.none()
+        return self.UserModel.objects.filter(username=username)
+
+    def create_user(self, claims):
+        return self.UserModel.objects.create_user(**self._get_user_data(claims))
+
+    def update_user(self, user, claims):
+        save_needed = False
+
+        for attr, value in self._get_user_data(claims).items():
+            if getattr(user, attr) != value:
+                setattr(user, attr, value)
+                save_needed = True
+
+        if save_needed:
+            user.save()
+
+        return user
+
+
+def has_admin_site_permission(request):
+    """Admin site is not publicly accessible."""
+    return request.user.is_active
+
+
+class UserGroupAdminBase(admin.ModelAdmin):
     list_display = ("path",)
     search_fields = ("id", "path")
     readonly_fields = ("id", "path")
-    
+
     # To show ManyToMany fields with a horizontal filter widget
     # filter_horizontal = ("allowed_entities",)
 

{cardo_python_utils-0.5.dev4 → cardo_python_utils-0.5.dev6}/python_utils/django/keycloak/models.py

@@ -15,5 +15,8 @@ class UserGroupBase(models.Model):
         db_index=True,
     )
 
+    def __str__(self):
+        return self.path
+
     class Meta:
         abstract = True

cardo_python_utils-0.5.dev6/python_utils/django/keycloak/user_groups_changelist.html

@@ -0,0 +1,7 @@
+{% extends 'admin/change_list.html' %}
+
+{% block object-tools-items %}
+{{ block.super }}
+    <li><a href="sync-with-keycloak/">Sync groups with Keycloak 🔄</a></li>
+
+{% endblock %}

cardo_python_utils-0.5.dev4/MANIFEST.in

@@ -1,3 +0,0 @@
-include LICENSE
-include README.rst
-recursive-exclude tests *

cardo_python_utils-0.5.dev4/python_utils/django/auth/admin.py

@@ -1,47 +0,0 @@
-from django.conf import settings
-from mozilla_django_oidc.auth import OIDCAuthenticationBackend
-
-
-class OIDCCustomAuthenticationBackend(OIDCAuthenticationBackend):
-    def _get_user_data(self, claims) -> dict:
-        client_roles = (
-            claims.get("resource_access", {})
-            .get(getattr(settings, "OIDC_RP_CLIENT_ID", ""), {})
-            .get("roles", [])
-        )
-        is_superuser = "Admin" in client_roles
-
-        return {
-            "username": claims.get("preferred_username"),
-            "email": claims.get("email"),
-            "first_name": claims.get("given_name", ""),
-            "last_name": claims.get("family_name", ""),
-            "is_staff": claims.get("is_staff", False),
-            "is_superuser": is_superuser,
-        }
-
-    def filter_users_by_claims(self, claims):
-        username = claims.get("preferred_username")
-        if not username:
-            return self.UserModel.objects.none()
-        return self.UserModel.objects.filter(username=username)
-
-    def create_user(self, claims):
-        return self.UserModel.objects.create_user(**self._get_user_data(claims))
-
-    def update_user(self, user, claims):
-        save_needed = False
-
-        for attr, value in self._get_user_data(claims).items():
-            if getattr(user, attr) != value:
-                setattr(user, attr, value)
-                save_needed = True
-
-        if save_needed:
-            user.save()
-
-        return user
-
-
-def has_permission(request):
-    return request.user.is_active