Dev #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

levanluu merged 100 commits into master from dev

Dec 16, 2025

0 common/apps/organization_role/__init__.py → common/admin/__init__.py

File renamed without changes.

common/admin/base_admin.py

-Original file line number
+Diff line change
@@ -0,0 +1,12 @@
+    from django.contrib import admin
+    class ListDisplayMixin(admin.ModelAdmin):
+        list_display_exclude = ()
+        def get_list_display(self, request):
+            all_fields = [field.name for field in self.model._meta.fields]
+            list_display = [
+                field for field in all_fields if field not in self.list_display_exclude
+            ]
+            return list_display

common/apps/jwks/urls.py

-Original file line number
+Diff line change
@@ -1,6 +1,7 @@
-    from common.apps.jwks.views import JWKView
     from django.urls import path
+    from common.apps.jwks.views import JWKView
     app_name = "jwks"
     urlpatterns = [
@@ Expand Down @@

common/apps/oauth2/serializers.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,3 +4,7 @@ @@
     class OauthLoginSerializer(serializers.Serializer):
         authorization_code = serializers.CharField()
         code_verifier = serializers.CharField()
+    class CodeLoginSerializer(serializers.Serializer):
+        authorization_code = serializers.CharField()

common/apps/oauth2/views.py

-Original file line number
+Diff line change
@@ -1,13 +1,16 @@
     import logging
     from operator import itemgetter
-    from common.apps.oauth2.serializers import OauthLoginSerializer
-    from common.utils.oauth2 import get_access_token, handle_access_token
+    from django.shortcuts import redirect
     from rest_framework import generics, status
     from rest_framework.exceptions import ParseError
     from rest_framework.permissions import AllowAny
     from rest_framework.response import Response
+    from common.apps.oauth2.serializers import OauthLoginSerializer
+    from common.utils.encoder import decode_from_base64
+    from common.utils.oauth2 import get_access_token, handle_access_token
     class GoogleLoginView(generics.CreateAPIView):
         serializer_class = OauthLoginSerializer
@@ Expand All / @@ -30,3 +33,25 @@ def post(self, request, *args, **kwargs): @@
                     logging.exception(e)
                     raise ParseError(detail="Bad request")
             return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+    class GoogleLoginCallbackView(generics.RetrieveAPIView):
+        def get(self, request):
+            code = request.GET.get("code")
+            state = request.GET.get("state")
+            error = request.GET.get("error")
+            if not state:
+                return Response({"error": "Missing code or state"}, status=400)
+            try:
+                state_data = decode_from_base64(state)
+                callback_url = state_data["callback_url"]
+            except Exception as e:
+                return Response({"error": str(e)}, status=400)
+            if error == "access_denied":
+                return redirect(callback_url)
+            fe_redirect_url = f"{callback_url}?code={code}&state={state}"
+            return redirect(fe_redirect_url)

common/apps/organization/handler.py

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -7,9 +7,9 @@ class NewOrganizationHandlerBase:
  
        Use by set NEW_ORGANIZATION_HANDLER in Django setting file

        """

        def __init__(self, organization, owner_email):

        def __init__(self, organization, owner):

            self._organization = organization

            self._owner_email = owner_email

            self._owner = owner

        @abstractmethod

        def handle(self):

0 .../organization_role/migrations/__init__.py → .../apps/organization/management/__init__.py

File renamed without changes.

common/apps/organization/management/commands/__init__.py

Empty file.

common/apps/organization/management/commands/create_organization.py

-Original file line number
+Diff line change
@@ -0,0 +1,40 @@
+    from django.conf import settings
+    from django.core.management.base import BaseCommand
+    from common.apps.organization.models import Domain, Organization
+    class Command(BaseCommand):
+        help = "Create a new space"
+        def add_arguments(self, parser):
+            parser.add_argument("--name", type=str, help="Organization name")
+            parser.add_argument("--slug_name", type=str, help="Organization slug name")
+            parser.add_argument(
+                "--is_multi_tenant", type=bool, help="True if organization is multi-tenant"
+            )
+        def handle(self, *args, **kwargs):
+            name = kwargs.get("name") or input("Name [test]: ") or "test"
+            slug_name = kwargs.get("slug_name") or input("Slug name [test]: ") or "test"
+            is_multi_tenant = (
+                kwargs.get("is_multi_tenant") or input("Is multi-tenant [False]: ") or False
+            )
+            organization = Organization(
+                schema_name=slug_name,
+                name=name,
+                slug_name=slug_name,
+                is_active=True,
+                is_multi_tenant=is_multi_tenant,
+            )
+            organization.save()
+            Domain(
+                domain=f"{slug_name}.{settings.DEFAULT_TENANT_HOST}",
+                tenant=organization,
+                is_primary=True,
+            ).save()
+            self.stdout.write(
+                self.style.SUCCESS(f"Organization {organization.name} created successfully")
+            )

common/apps/organization/migrations/0001_initial.py

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,7 +1,8 @@
  
    # Generated by Django 5.0.6 on 2024-06-26 11:34

    # Generated by Django 5.0.6 on 2024-11-20 07:42

    import django.db.models.deletion

    import django_tenants.postgresql_backend.base

    import uuid

    from django.db import migrations, models

    @@ -14,15 +15,6 @@ class Migration(migrations.Migration):
  
            migrations.CreateModel(

                name="Organization",

                fields=[

                    (

                        "id",

                        models.BigAutoField(

                            auto_created=True,

                            primary_key=True,

                            serialize=False,

                            verbose_name="ID",

                        ),

                    ),

                    (

                        "schema_name",

                        models.CharField(

    @@ -34,6 +26,16 @@ class Migration(migrations.Migration):
  
                            ],

                        ),

                    ),

                    (

                        "id",

                        models.UUIDField(

                            default=uuid.uuid4,

                            editable=False,

                            primary_key=True,

                            serialize=False,

                            unique=True,

                        ),

                    ),

                    ("created_at", models.DateTimeField(auto_now_add=True)),

                    ("updated_at", models.DateTimeField(auto_now=True)),

                    ("name", models.CharField(max_length=100)),

    @@ -49,20 +51,21 @@ class Migration(migrations.Migration):
  
            migrations.CreateModel(

                name="Domain",

                fields=[

                    (

                        "domain",

                        models.CharField(db_index=True, max_length=253, unique=True),

                    ),

                    ("is_primary", models.BooleanField(db_index=True, default=True)),

                    (

                        "id",

                        models.BigAutoField(

                            auto_created=True,

                        models.UUIDField(

                            default=uuid.uuid4,

                            editable=False,

                            primary_key=True,

                            serialize=False,

                            verbose_name="ID",

                            unique=True,

                        ),

                    ),

                    (

                        "domain",

                        models.CharField(db_index=True, max_length=253, unique=True),

                    ),

                    ("is_primary", models.BooleanField(db_index=True, default=True)),

                    ("created_at", models.DateTimeField(auto_now_add=True)),

                    ("updated_at", models.DateTimeField(auto_now=True)),

                    (

common/apps/organization/models.py

-Original file line number
+Diff line change
@@ -1,7 +1,8 @@
-    from common.models.base_model import BaseModel
     from django.db import models
     from django_tenants.models import DomainMixin, TenantMixin
+    from common.models.base_model import BaseModel
     class Organization(TenantMixin, BaseModel):
         name = models.CharField(max_length=100)
@@ Expand Down @@

common/apps/organization/tasks.py

-Original file line number
+Diff line change
@@ -1,11 +1,12 @@
     import logging
-    from common.apps.organization.models import Domain, Organization
-    from common.celery.tasks import task
     from django.conf import settings
     from django.db import transaction
     from django.utils.module_loading import import_string
+    from common.apps.organization.models import Domain, Organization
+    from common.celery.tasks import task
     logger = logging.getLogger(__name__)
@@ Expand Down Expand Up @@
         if NewOrganizationHandler is not None:
             NewOrganizationHandler(organization, owner).handle()
+    @task(name="spacedf.tasks.delete_organization", max_retries=3)
+    @transaction.atomic
+    def delete_organization(slug_name):
+        logger.info(f"delete_organization({slug_name})")
+        organization = Organization.objects.get(schema_name=slug_name)
+        organization.delete(force_drop=True)

common/apps/organization_role/admin.py

This file was deleted.

common/apps/organization_role/apps.py

This file was deleted.

common/apps/organization_role/constants.py

This file was deleted.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Dev #53

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!