From c5e45cc9ae12357354b806ffb7bbaaef954fb55a Mon Sep 17 00:00:00 2001
From: Benjamin Ledel <benjamin@schule-plus.com>
Date: Wed, 12 Mar 2025 15:21:52 +0100
Subject: [PATCH] * fix typos
---
.../commands/check_and_apply_migrations.py | 12 ++++--------
src/providers/views.py | 2 +-
src/users/custom_tokens.py | 4 ++--
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/backend/management/commands/check_and_apply_migrations.py b/src/backend/management/commands/check_and_apply_migrations.py
index c8733cd..cd024f0 100644
--- a/src/backend/management/commands/check_and_apply_migrations.py
+++ b/src/backend/management/commands/check_and_apply_migrations.py
@@ -3,7 +3,6 @@ from django.core.management import call_command
from django.db import connections
from django.db.migrations.executor import MigrationExecutor
from django.contrib.auth.models import Permission, ContentType, Group
-from rolepermissions.roles import get_roles
from users.models import CustomUser # Adjust this import based on your actual user model
class Command(BaseCommand):
@@ -28,7 +27,7 @@ class Command(BaseCommand):
# Ensure necessary permissions exist
permissions = {
"create_user": "Create User",
- "edit_user": "Edit User"
+ "edit_user": "Edit User",
"create_provider": "Create Provider",
"manage_provider_keys": "Manage Provider Keys",
"manage_analytics_tokens": "Manage Analytics Tokens",
@@ -50,15 +49,12 @@ class Command(BaseCommand):
self.stdout.write(self.style.SUCCESS(f'Permission created: {name}'))
else:
self.stdout.write(self.style.NOTICE(f'Permission already exists: {name}'))
-
- # Ensure roles exist
- for role in get_roles():
- self.stdout.write(self.style.SUCCESS(f'Role found: {role.__name__} with permissions: {role.available_permissions}'))
+
# Ensure auth groups exist and assign permissions
groups_permissions = {
- "polaris_administrator": ["create_user","edit_user","create_provider","change_provider","manage_provider_keys","manage_analytics_tokens","create_user_consent","request_user_data"]
- "provider": ["manage_provider_keys"],‚
+ "polaris_administrator": ["create_user","edit_user","create_provider","change_provider","manage_provider_keys","manage_analytics_tokens","create_user_consent","request_user_data"],
+ "provider": ["manage_provider_keys"],
"analyst": ["manage_analytics_tokens"],
"user": ["create_user_consent"]
}
diff --git a/src/providers/views.py b/src/providers/views.py
index 2985c37..9f6a42c 100644
--- a/src/providers/views.py
+++ b/src/providers/views.py
@@ -783,7 +783,7 @@ class GetAnalyticsEngineResults(APIView):
# Extract requested names, if any
requested_names = filters.get("name")
-
+
# If no names are provided, use the default allowed names
if not requested_names:
requested_names = list(allowed_names)
diff --git a/src/users/custom_tokens.py b/src/users/custom_tokens.py
index e511bde..5554f21 100644
--- a/src/users/custom_tokens.py
+++ b/src/users/custom_tokens.py
@@ -2,7 +2,7 @@ from rest_framework_simplejwt.serializers import TokenObtainPairSerializer
from rest_framework_simplejwt.views import TokenObtainPairView
from rolepermissions.checkers import has_role
-from backend.roles import Provider
+from backend.roles import ProviderManager
class CustomTokenObtainPairSerializer(TokenObtainPairSerializer):
@@ -11,7 +11,7 @@ class CustomTokenObtainPairSerializer(TokenObtainPairSerializer):
token = super().get_token(user)
token["email"] = user.email
- token["is_provider"] = has_role(user, [Provider])
+ token["is_provider"] = has_role(user, [ProviderManager])
return token
class CustomTokenObtainPairView(TokenObtainPairView):
--
GitLab