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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cardo-python-utils
-Version: 0.5.dev6
+Version: 0.5.dev8
 Summary: Python library enhanced with a wide range of functions for different scenarios.
 Author-email: CardoAI <hello@cardoai.com>
 License: MIT
@@ -24,10 +24,9 @@ Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-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
+Requires-Dist: PyJWT>=2.10.1; extra == "django-keycloak"
+Requires-Dist: mozilla-django-oidc>=4.0.1; extra == "django-keycloak"
 Provides-Extra: django-keycloak-groups
 Requires-Dist: python-keycloak>=5.8.1; extra == "django-keycloak-groups"
 Provides-Extra: all

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cardo-python-utils
-Version: 0.5.dev6
+Version: 0.5.dev8
 Summary: Python library enhanced with a wide range of functions for different scenarios.
 Author-email: CardoAI <hello@cardoai.com>
 License: MIT
@@ -24,10 +24,9 @@ Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-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
+Requires-Dist: PyJWT>=2.10.1; extra == "django-keycloak"
+Requires-Dist: mozilla-django-oidc>=4.0.1; extra == "django-keycloak"
 Provides-Extra: django-keycloak-groups
 Requires-Dist: python-keycloak>=5.8.1; extra == "django-keycloak-groups"
 Provides-Extra: all

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

@@ -20,9 +20,12 @@ python_utils/time.py
 python_utils/types_hinting.py
 python_utils/django/utils.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/ninja.py
 python_utils/django/keycloak/service.py
-python_utils/django/keycloak/user_groups_changelist.html
+python_utils/django/keycloak/admin/__init__.py
+python_utils/django/keycloak/admin/auth.py
+python_utils/django/keycloak/admin/user_group.py
+python_utils/django/keycloak/api/__init__.py
+python_utils/django/keycloak/api/drf.py
+python_utils/django/keycloak/api/ninja.py
+python_utils/django/keycloak/models/__init__.py
+python_utils/django/keycloak/models/user_group.py

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

@@ -10,11 +10,9 @@ pytest-django>=4.5
 coverage>=6.0
 tox>=3.25
 
-[django-keycloak-admin]
-mozilla-django-oidc>=4.0.1
-
-[django-keycloak-api]
+[django-keycloak]
 PyJWT>=2.10.1
+mozilla-django-oidc>=4.0.1
 
 [django-keycloak-groups]
 python-keycloak>=5.8.1

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cardo-python-utils"
-version = "0.5.dev6"
+version = "0.5.dev8"
 description = "Python library enhanced with a wide range of functions for different scenarios."
 readme = "README.rst"
 requires-python = ">=3.8"
@@ -31,10 +31,8 @@ classifiers = [
 dependencies = []
 
 [project.optional-dependencies]
-django-keycloak-api = [
+django-keycloak = [
     "PyJWT>=2.10.1",
-]
-django-keycloak-admin = [
     "mozilla-django-oidc>=4.0.1",
 ]
 django-keycloak-groups = [

cardo_python_utils-0.5.dev8/python_utils/django/keycloak/admin/auth.py

@@ -0,0 +1,48 @@
+from django.conf import settings
+from mozilla_django_oidc.auth import OIDCAuthenticationBackend
+
+
+class AdminAuthenticationBackend(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

cardo_python_utils-0.5.dev6/python_utils/django/keycloak/admin.py → cardo_python_utils-0.5.dev8/python_utils/django/keycloak/admin/user_group.py

@@ -1,57 +1,9 @@
-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 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
+from ..service import KeycloakService
 
 
 class UserGroupAdminBase(admin.ModelAdmin):

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

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