request-n-org (#364)

Author: ewdurbin

cabotage/client/templates/_base.html

@@ -260,6 +260,10 @@
                 <a href="{{ url_for('user.guide') }}"
                    class="btn btn-ghost btn-sm text-base-content/60 hover:text-base-content text-xs font-medium">Guide</a>
                 {% if current_user.admin %}
+                {% if config.ORGANIZATION_REQUESTS_ENABLED %}
+                <a href="{{ url_for('user.organization_requests') }}"
+                   class="btn btn-ghost btn-sm text-base-content/60 hover:text-base-content text-xs font-medium">Requests</a>
+                {% endif %}
                 <a href="{{ url_for('user.infra_observe') }}"
                    class="btn btn-ghost btn-sm text-base-content/60 hover:text-base-content text-xs font-medium">Infra</a>
                 {% endif %}
@@ -616,6 +620,10 @@
             <a href="{{ url_for('user.guide') }}"
                class="btn btn-ghost btn-sm justify-start text-sm">Guide</a>
             {% if current_user.admin %}
+            {% if config.ORGANIZATION_REQUESTS_ENABLED %}
+            <a href="{{ url_for('user.organization_requests') }}"
+               class="btn btn-ghost btn-sm justify-start text-sm">Requests</a>
+            {% endif %}
             <a href="{{ url_for('user.infra_observe') }}"
                class="btn btn-ghost btn-sm justify-start text-sm">Infrastructure</a>
             {% endif %}

cabotage/client/templates/main/home.html

@@ -13,7 +13,14 @@
       <div class="empty-state py-16">
         <div class="text-base-content/15 mb-4">{{ icon('building', 'w-12 h-12') }}</div>
         <h1 class="text-xl font-semibold text-base-content mb-2">Welcome, {{ (current_user.username or current_user.email) | display_username }}</h1>
-        <p class="text-sm text-base-content/40 max-w-sm">You're not a member of any organizations yet. An administrator will need to add you to one.</p>
+        <p class="text-sm text-base-content/40 max-w-sm">{% if organization_requests_enabled %}You're not a member of any organizations yet. Request an organization to get started.{% else %}You're not a member of any organizations yet. An administrator will need to add you to one.{% endif %}</p>
+        {% if organization_requests_enabled %}
+        <a href="{{ url_for('user.organization_request_create') }}"
+           class="btn btn-primary btn-sm gap-2 mt-4">
+          {{ icon('plus', 'w-4 h-4') }}
+          Request Organization
+        </a>
+        {% endif %}
       </div>
     </div>
     {% else %}

cabotage/client/templates/user/organization_request_create.html

@@ -0,0 +1,37 @@
+{% extends "_base.html" %}
+{% from "_macros.html" import render_field, breadcrumbs %}
+
+{% block title %}Request Organization - Cabotage{% endblock %}
+
+{% block breadcrumbs %}
+{{ breadcrumbs([
+  {'label': 'Organizations', 'url': url_for('user.organizations')},
+  {'label': 'Request'}
+]) }}
+{% endblock %}
+
+{% block content %}
+<div class="form-card">
+  <div class="card bg-base-200 border border-base-300 shadow-xl">
+    <div class="card-body">
+      <h1 class="text-xl font-semibold text-base-content mb-4">Request Organization</h1>
+
+      <form action="{{ url_for('user.organization_request_create') }}" method="POST" name="organization_request_form" class="flex flex-col gap-4">
+        {{ organization_request_form.hidden_tag() }}
+        {{ render_field(organization_request_form.name) }}
+        {{ render_field(organization_request_form.slug) }}
+        {{ render_field(organization_request_form.note) }}
+        <div class="pt-2">
+          <button type="submit" class="btn btn-primary w-full">Submit Request</button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
+{% endblock %}
+
+{% block js %}
+<script>
+  applySlugify('#name', '#slug');
+</script>
+{% endblock %}

cabotage/client/templates/user/organization_requests.html

@@ -0,0 +1,64 @@
+{% extends "_base.html" %}
+{% from "_macros.html" import page_header, empty_state %}
+
+{% block title %}Organization Requests - Cabotage{% endblock %}
+
+{% block content %}
+  {% call page_header('Organization Requests', 'Review pending organization creation requests') %}
+  {% endcall %}
+
+  {% if organization_requests %}
+    <div class="overflow-x-auto border border-base-300 rounded-lg">
+      <table class="table table-sm">
+        <thead>
+          <tr>
+            <th>Organization</th>
+            <th>Requester</th>
+            <th>Status</th>
+            <th>Requested</th>
+            <th class="text-right">Actions</th>
+          </tr>
+        </thead>
+        <tbody>
+          {% for org_request in organization_requests %}
+          <tr>
+            <td>
+              <div class="font-medium">{{ org_request.name }}</div>
+              <div class="text-xs text-base-content/40">{{ org_request.slug }}</div>
+              {% if org_request.note %}
+              <div class="text-xs text-base-content/60 mt-1 max-w-md whitespace-normal">{{ org_request.note }}</div>
+              {% endif %}
+            </td>
+            <td>
+              <div>{{ (org_request.requester.username or org_request.requester.email) | display_username }}</div>
+              <div class="text-xs text-base-content/40">{{ org_request.requester.email }}</div>
+            </td>
+            <td>
+              <span class="badge badge-sm {% if org_request.status == 'approved' %}badge-success{% elif org_request.status == 'denied' %}badge-error{% else %}badge-neutral{% endif %}">{{ org_request.status }}</span>
+            </td>
+            <td>{{ org_request.created_at | humanize }}</td>
+            <td class="text-right">
+              {% if org_request.status == 'pending' %}
+              <div class="flex justify-end gap-2">
+                <form method="POST" action="{{ url_for('user.organization_request_approve', request_id=org_request.id) }}">
+                  {{ review_form.hidden_tag() }}
+                  <button type="submit" class="btn btn-primary btn-xs">Approve</button>
+                </form>
+                <form method="POST" action="{{ url_for('user.organization_request_deny', request_id=org_request.id) }}">
+                  {{ review_form.hidden_tag() }}
+                  <button type="submit" class="btn btn-ghost btn-xs">Deny</button>
+                </form>
+              </div>
+              {% elif org_request.organization %}
+              <a href="{{ url_for('user.organization', org_slug=org_request.organization.slug) }}" class="btn btn-ghost btn-xs">View Org</a>
+              {% endif %}
+            </td>
+          </tr>
+          {% endfor %}
+        </tbody>
+      </table>
+    </div>
+  {% else %}
+    {{ empty_state('No organization requests', 'New requests will appear here.', icon_name='building') }}
+  {% endif %}
+{% endblock %}

cabotage/client/templates/user/organizations.html

@@ -14,6 +14,12 @@
       {{ icon('plus', 'w-4 h-4') }}
       New Organization
     </button>
+    {% elif organization_requests_enabled %}
+    <a href="{{ url_for('user.organization_request_create') }}"
+       class="btn btn-primary btn-sm gap-2">
+      {{ icon('plus', 'w-4 h-4') }}
+      Request Organization
+    </a>
     {% endif %}
   {% endcall %}
 
@@ -49,6 +55,12 @@ <h3 class="text-base font-medium text-base-content/60 mb-1">No organizations yet
         {{ icon('plus', 'w-4 h-4') }}
         Create Organization
       </button>
+      {% elif organization_requests_enabled %}
+      <a href="{{ url_for('user.organization_request_create') }}"
+         class="btn btn-primary btn-sm gap-2 mt-4">
+        {{ icon('plus', 'w-4 h-4') }}
+        Request Organization
+      </a>
       {% endif %}
     </div>
   {% endif %}

cabotage/server/__init__.py

@@ -428,7 +428,7 @@ def server_error_page(error):
         return render_template("errors/500.html"), 500
 
     from cabotage.server.models.admin import AdminModelView
-    from cabotage.server.models.auth import Organization, Team
+    from cabotage.server.models.auth import Organization, OrganizationRequest, Team
     from cabotage.server.models.projects import (
         Project,
         Application,
@@ -445,6 +445,8 @@ def server_error_page(error):
 
     admin.add_view(AdminModelView(Role, db.session))
     admin.add_view(AdminModelView(Organization, db.session))
+    if app.config.get("ORGANIZATION_REQUESTS_ENABLED", False):
+        admin.add_view(AdminModelView(OrganizationRequest, db.session))
     admin.add_view(AdminModelView(Team, db.session))
     admin.add_view(AdminModelView(Project, db.session))
     admin.add_view(AdminModelView(Application, db.session))

cabotage/server/config.py

@@ -133,6 +133,7 @@ class Config(metaclass=MetaFlaskEnv):
     KUBERNETES_CONTEXT = "cabotage"
     KUBERNETES_BUILD_NAMESPACE = "cabotage-tenant-builds"
     NETWORK_POLICIES_ENABLED = False
+    ORGANIZATION_REQUESTS_ENABLED = False
     BACKING_SERVICE_POSTGRES_ENABLED = False
     BACKING_SERVICE_REDIS_ENABLED = False
     BACKING_SERVICES_POOL = None

cabotage/server/main/views.py

@@ -1,4 +1,4 @@
-from flask import render_template, Blueprint
+from flask import current_app, render_template, Blueprint
 from flask_login import current_user
 from sqlalchemy import func
 
@@ -19,6 +19,9 @@ def home():
     project_count = 0
     app_count = 0
     deploy_count = 0
+    organization_requests_enabled = current_app.config.get(
+        "ORGANIZATION_REQUESTS_ENABLED", False
+    )
     if current_user.is_authenticated:
         user_orgs = (
             db.session.query(OrganizationMember.organization_id)
@@ -60,6 +63,7 @@ def home():
         project_count=project_count,
         app_count=app_count,
         deploy_count=deploy_count,
+        organization_requests_enabled=organization_requests_enabled,
     )
 
 

cabotage/server/models/auth.py

@@ -448,6 +448,70 @@ def add_team(self, team):
         db.session.add(association)
 
 
+class OrganizationRequest(Model):
+    __tablename__ = "organization_requests"
+
+    STATUS_PENDING = "pending"
+    STATUS_APPROVED = "approved"
+    STATUS_DENIED = "denied"
+
+    id: Mapped[uuid.UUID] = mapped_column(
+        postgresql.UUID(as_uuid=True),
+        server_default=text("gen_random_uuid()"),
+        primary_key=True,
+    )
+    requester_user_id: Mapped[uuid.UUID] = mapped_column(
+        postgresql.UUID(as_uuid=True),
+        ForeignKey("users.id"),
+        index=True,
+    )
+    reviewer_user_id: Mapped[uuid.UUID | None] = mapped_column(
+        postgresql.UUID(as_uuid=True),
+        ForeignKey("users.id"),
+        index=True,
+    )
+    organization_id: Mapped[uuid.UUID | None] = mapped_column(
+        postgresql.UUID(as_uuid=True),
+        ForeignKey("organizations.id"),
+        index=True,
+    )
+    name: Mapped[str] = mapped_column(Text())
+    slug: Mapped[str] = mapped_column(postgresql.CITEXT(), index=True)
+    note: Mapped[str | None] = mapped_column(Text())
+    status: Mapped[str] = mapped_column(String(32), default=STATUS_PENDING, index=True)
+    created_at: Mapped[datetime.datetime] = mapped_column(
+        DateTime,
+        default=lambda: datetime.datetime.now(datetime.timezone.utc).replace(
+            tzinfo=None
+        ),
+        index=True,
+    )
+    updated_at: Mapped[datetime.datetime] = mapped_column(
+        DateTime,
+        default=lambda: datetime.datetime.now(datetime.timezone.utc).replace(
+            tzinfo=None
+        ),
+        onupdate=lambda: datetime.datetime.now(datetime.timezone.utc).replace(
+            tzinfo=None
+        ),
+    )
+    reviewed_at: Mapped[datetime.datetime | None] = mapped_column(DateTime)
+
+    requester: Mapped[User] = relationship(
+        foreign_keys=[requester_user_id],
+        backref=backref("organization_requests", lazy="dynamic"),
+    )
+    reviewer: Mapped[User | None] = relationship(foreign_keys=[reviewer_user_id])
+    organization: Mapped[Organization | None] = relationship()
+
+    @property
+    def is_pending(self):
+        return self.status == self.STATUS_PENDING
+
+    def __repr__(self):
+        return f"<OrganizationRequest {self.slug} {self.status}>"
+
+
 class Team(Model):
     __versioned__: dict = {}
     __tablename__ = "teams"

cabotage/server/user/forms.py

@@ -22,7 +22,7 @@
     ValidationError,
 )
 
-from cabotage.server.models.auth import Organization
+from cabotage.server.models.auth import Organization, OrganizationRequest
 from cabotage.server.models.projects import (
     Application,
     ApplicationEnvironment,
@@ -88,6 +88,45 @@ def validate_slug(form, field):
         return True
 
 
+class RequestOrganizationForm(FlaskForm):
+    name = StringField(
+        "Organization Name",
+        [InputRequired()],
+        description="Friendly and descriptive name for the organization.",
+    )
+    slug = StringField(
+        "Organization Slug",
+        [
+            InputRequired(),
+            Regexp("^[-a-z0-9]+$", message="Invalid Slug! Must match ^[-a-z0-9]+$"),
+        ],
+        description="URL-safe short name for the organization.",
+    )
+    note = TextAreaField(
+        "Note",
+        [Optional(), Length(max=2000)],
+        description="Optional context for the administrators reviewing this request.",
+    )
+
+    def validate_slug(form, field):
+        organization = Organization.query.filter_by(slug=field.data).first()
+        if organization is not None:
+            raise ValidationError("That organization slug is already in use.")
+        org_request = OrganizationRequest.query.filter_by(
+            slug=field.data,
+            status=OrganizationRequest.STATUS_PENDING,
+        ).first()
+        if org_request is not None:
+            raise ValidationError(
+                "That organization slug already has a pending request."
+            )
+        return True
+
+
+class ReviewOrganizationRequestForm(FlaskForm):
+    pass
+
+
 class CreateProjectForm(FlaskForm):
     organization_id = SelectField(
         "Organization",