Decouple organization creation from registration

apps/accounts/forms.py

@@ -45,46 +45,12 @@ class RegistrationForm(forms.Form):
             }
         ),
     )
-    org_name = forms.CharField(
-        max_length=255,
-        widget=forms.TextInput(
-            attrs={
-                "class": "form-input",
-                "placeholder": "Acme Corp",
-                "id": "register-org-name",
-            }
-        ),
-        label="Organization Name",
-    )
-    business_type = forms.ChoiceField(
-        choices=[],  # Populated dynamically in __init__
-        widget=forms.Select(
-            attrs={
-                "class": "form-input",
-                "id": "register-business-type",
-            }
-        ),
-        label="Business Type",
-    )
     terms_agreement = forms.BooleanField(
         required=True,
         error_messages={"required": "You must agree to the Terms of Service to register."},
         widget=forms.CheckboxInput(attrs={"class": "h-4 w-4 rounded border-gray-300 text-indigo-600 focus:ring-indigo-600", "id": "register-terms"}),
     )
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        # Fetch dynamic business types from SystemSetting
-        try:
-            allowed_types_setting = SystemSetting.objects.get(key="ALLOWED_BUSINESS_TYPES")
-            types_list = allowed_types_setting.value
-            if not isinstance(types_list, list):
-                types_list = settings.DEFAULT_BUSINESS_TYPES
-        except SystemSetting.DoesNotExist:
-            types_list = settings.DEFAULT_BUSINESS_TYPES
-            
-        self.fields["business_type"].choices = [(bt, bt) for bt in types_list]
-
     def clean_email(self) -> str:
         email = self.cleaned_data["email"].lower()
         if User.objects.filter(email__iexact=email).exists():

apps/accounts/services/auth_service.py

@@ -51,14 +51,12 @@ class PasswordError(Exception):
 def register_user(
     email: str,
     password: str,
-    org_name: str,
-    business_type: str,
     terms_accepted: bool = False
 ) -> User:
     """
-    Create a new user account with all associated records, and create their first Organization.
+    Create a new user account with all associated records.
 
-    Creates: User + Credentials + Profile + EmailVerification + Organization + OrgMembership.
+    Creates: User + Credentials + Profile + EmailVerification.
     Returns the new User instance.
     """
     # Check against breached passwords
@@ -80,20 +78,12 @@ def register_user(
 
     EmailVerification.objects.create(user=user)
 
-    # Create the initial Organization for this user
-    from apps.organizations.services.org_service import create_org
-    create_org(
-        name=org_name,
-        owner=user,
-        vertical_type=business_type
-    )
-
     # Log intelligence event
     from apps.intelligence.services import log_event
     log_event(
         event_type="user_registered",
         actor=user,
-        metadata={"email_domain": email.split("@")[-1], "org_name": org_name, "business_type": business_type}
+        metadata={"email_domain": email.split("@")[-1]}
     )
 
     # Record Terms Consent

apps/accounts/views.py

@@ -101,8 +101,6 @@ def register_view(request):
             user = register_user(
                 email=form.cleaned_data["email"],
                 password=form.cleaned_data["password"],
-                org_name=form.cleaned_data["org_name"],
-                business_type=form.cleaned_data["business_type"],
                 terms_accepted=form.cleaned_data.get("terms_agreement", False),
             )
             # Conditional Verification or Auto-Login

config/settings/__init__.py

@@ -43,7 +43,7 @@ USE_X_FORWARDED_HOST = True
 SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
 
 # Subdomain Tenancy Settings
-BASE_DOMAIN = env("BASE_DOMAIN", default="localhost:9000")
+BASE_DOMAIN = env("BASE_DOMAIN", default="localhost:8000")
 
 # Cookie Domain — share sessions & CSRF across all *.localhost subdomains
 # Use None in production unless you explicitly need a wild card subdomain cookie.
@@ -52,9 +52,9 @@ CSRF_COOKIE_DOMAIN = env("CSRF_COOKIE_DOMAIN", default=None)
 
 # Trust all subdomains for CSRF
 CSRF_TRUSTED_ORIGINS = env.list("CSRF_TRUSTED_ORIGINS", default=[
-    "http://*.localhost:9000",
-    "http://localhost:9000",
-    "http://127.0.0.1:9000",
+    "http://*.localhost:8000",
+    "http://localhost:8000",
+    "http://127.0.0.1:8000",
     "https://*.hf.space",
     "https://*.ngrok-free.app",
     "https://*.ngrok.io",
@@ -62,7 +62,7 @@ CSRF_TRUSTED_ORIGINS = env.list("CSRF_TRUSTED_ORIGINS", default=[
 ])
 
 # Site URL (Used for email verification links)
-SITE_URL = "http://localhost:9000"
+SITE_URL = "http://localhost:8000"
 
 INTERNAL_IPS = [] # Added for Django Debug Toolbar, if needed.
 

docker-compose.yml

@@ -19,7 +19,7 @@ services:
     volumes:
       - .:/app
     ports:
-      - "9000:7860"
+      - "8000:7860"
     environment:
       - DATABASE_URL=postgres://postgres:postgres@db:5432/saas_db
       - DJANGO_SETTINGS_MODULE=config.settings

start_dev.ps1

@@ -45,5 +45,5 @@ Write-Host "Containers are up and running!" -ForegroundColor Green
 
 # 3. Start ngrok
 Write-Host "`n[3/3] Generating public ngrok URL..." -ForegroundColor Yellow
-Write-Host "Starting ngrok on port 9000..." -ForegroundColor Green
-ngrok http 9000
+Write-Host "Starting ngrok on port 8000..." -ForegroundColor Green
+ngrok http 8000

templates/pages/accounts/register.html

@@ -45,34 +45,7 @@
     {% endif %}
   </div>
 
-  <div class="relative mt-6">
-    <div class="absolute inset-0 flex items-center"><div class="w-full border-t border-[--border]"></div></div>
-    <div class="relative flex justify-center text-sm/6"><span class="bg-[--card] px-6 text-[--muted-foreground] font-semibold uppercase tracking-wider text-xs">Organization Details</span></div>
-  </div>
 
-  <div>
-    <label for="id_org_name" class="block text-sm/6 font-medium text-[--foreground]">Organization Name</label>
-    <div class="mt-2">
-      <input id="id_org_name" type="text" name="org_name" required placeholder="Acme Corp" class="block w-full rounded-md bg-[--input] px-3 py-1.5 text-base text-[--foreground] outline-1 -outline-offset-1 outline-[--border] placeholder:text-[--muted-foreground] focus:outline-2 focus:-outline-offset-2 focus:outline-[--primary] sm:text-sm/6" />
-    </div>
-    {% if form.org_name.errors %}
-        <p class="mt-1 text-sm text-[--destructive]">{{ form.org_name.errors[0] }}</p>
-    {% endif %}
-  </div>
-
-  <div>
-    <label for="id_business_type" class="block text-sm/6 font-medium text-[--foreground]">Business Type</label>
-    <div class="mt-2">
-      <select id="id_business_type" name="business_type" required class="block w-full rounded-md bg-[--input] px-3 py-2 text-base text-[--foreground] outline-1 -outline-offset-1 outline-[--border] focus:outline-2 focus:-outline-offset-2 focus:outline-[--primary] sm:text-sm/6">
-        {% for choice_val, choice_label in form.fields.business_type.choices %}
-            <option value="{{ choice_val }}">{{ choice_label }}</option>
-        {% endfor %}
-      </select>
-    </div>
-    {% if form.business_type.errors %}
-        <p class="mt-1 text-sm text-[--destructive]">{{ form.business_type.errors[0] }}</p>
-    {% endif %}
-  </div>
 
   <div class="flex items-start mt-6">
     <div class="flex h-6 items-center">