launchbase 1.1.2 → 1.1.3

package/template/prisma/schema.prisma

@@ -13,29 +13,179 @@ enum Role {
   MEMBER
 }
 
+// ============================================
+// Core Multi-Tenant Models
+// ============================================
+
 model User {
-  id             String           @id @default(cuid())
-  email          String           @unique
-  passwordHash   String?
-  name           String?
-  image          String?
-  emailVerified  DateTime?
+  id              String              @id @default(cuid())
+  email           String              @unique
+  name            String?
+  image           String?
+  passwordHash    String?
+  emailVerified   DateTime?
   twoFactorSecret String?
-  twoFactorEnabled Boolean        @default(false)
-  oauthProvider  String?          // google, github, etc.
-  oauthId        String?          // OAuth provider user ID
-  createdAt      DateTime         @default(now())
-  memberships    Membership[]
-  refreshTokens  RefreshToken[]
-  verificationTokens VerificationToken[]
+  twoFactorEnabled Boolean             @default(false)
+  oauthProvider   String?             // google, github, etc.
+  oauthId         String?             // OAuth provider user ID
+  createdAt       DateTime            @default(now())
+  updatedAt       DateTime            @updatedAt
+
+  // Relations
+  ownedOrganizations  Organization[]
+  memberships         OrganizationMember[]
+  refreshTokens       RefreshToken[]
+  verificationTokens  VerificationToken[]
   passwordResetTokens PasswordResetToken[]
-  oauthAccounts  OAuthAccount[]
-  files          File[]
+  oauthAccounts       OAuthAccount[]
+  files               File[]
 
   @@index([email])
   @@index([oauthProvider, oauthId])
 }
 
+model Organization {
+  id                    String              @id @default(cuid())
+  name                  String
+  slug                  String              @unique
+  ownerId               String
+  plan                  String              @default("free")
+  stripeCustomerId      String?
+  stripeSubscriptionId  String?
+  createdAt             DateTime            @default(now())
+  updatedAt             DateTime            @updatedAt
+
+  // Relations
+  owner                 User                @relation(fields: [ownerId], references: [id], onDelete: Cascade)
+  members               OrganizationMember[]
+  projects              Project[]
+  invitations           Invitation[]
+
+  @@index([slug])
+  @@index([ownerId])
+}
+
+model OrganizationMember {
+  id              String        @id @default(cuid())
+  organizationId  String
+  userId          String
+  role            Role
+  createdAt       DateTime      @default(now())
+
+  // Relations
+  organization    Organization  @relation(fields: [organizationId], references: [id], onDelete: Cascade)
+  user            User          @relation(fields: [userId], references: [id], onDelete: Cascade)
+
+  @@unique([organizationId, userId])
+  @@index([organizationId])
+  @@index([userId])
+}
+
+model Project {
+  id              String        @id @default(cuid())
+  organizationId  String
+  name            String
+  slug            String
+  createdAt       DateTime      @default(now())
+  updatedAt       DateTime      @updatedAt
+
+  // Relations
+  organization    Organization  @relation(fields: [organizationId], references: [id], onDelete: Cascade)
+  edgeFunctions   EdgeFunction[]
+  vectorCollections VectorCollection[]
+  deployments     Deployment[]
+  dbCollections   DBCollection[]
+
+  @@unique([organizationId, slug])
+  @@index([organizationId])
+  @@index([slug])
+}
+
+// ============================================
+// Project-Scoped Resources
+// ============================================
+
+model EdgeFunction {
+  id              String            @id @default(cuid())
+  projectId       String
+  name            String
+  slug            String
+  runtime         String            @default("nodejs18")
+  sourceCode      String
+  environment     Json?
+  triggers        Json?
+  status          String            @default("draft")
+  deployedAt      DateTime?
+  deploymentUrl   String?
+  createdAt       DateTime          @default(now())
+  updatedAt       DateTime          @updatedAt
+  logs            EdgeFunctionLog[]
+
+  // Relations
+  project         Project           @relation(fields: [projectId], references: [id], onDelete: Cascade)
+
+  @@unique([projectId, slug])
+  @@index([projectId])
+  @@index([status])
+}
+
+model EdgeFunctionLog {
+  id            String      @id @default(cuid())
+  functionId    String
+  status        String
+  duration      Int
+  input         Json?
+  output        Json?
+  error         String?
+  triggeredBy   String?
+  createdAt     DateTime    @default(now())
+
+  // Relations
+  function      EdgeFunction @relation(fields: [functionId], references: [id], onDelete: Cascade)
+
+  @@index([functionId])
+  @@index([createdAt])
+}
+
+model VectorCollection {
+  id              String    @id @default(cuid())
+  projectId       String
+  name            String
+  provider        String    @default("local")
+  dimension       Int       @default(1536)
+  embeddingModel  String    @default("text-embedding-3-small")
+  createdAt       DateTime  @default(now())
+  updatedAt       DateTime  @updatedAt
+
+  // Relations
+  project         Project   @relation(fields: [projectId], references: [id], onDelete: Cascade)
+
+  @@unique([projectId, name])
+  @@index([projectId])
+}
+
+model Deployment {
+  id              String    @id @default(cuid())
+  projectId       String
+  status          String    @default("pending")
+  version         String?
+  deployedAt      DateTime?
+  platform        String?
+  url             String?
+  logs            Json?
+  createdAt       DateTime  @default(now())
+
+  // Relations
+  project         Project   @relation(fields: [projectId], references: [id], onDelete: Cascade)
+
+  @@index([projectId])
+  @@index([status])
+}
+
+// ============================================
+// Auth & Session Models
+// ============================================
+
 model VerificationToken {
   id        String   @id @default(cuid())
   userId    String
@@ -60,76 +210,59 @@ model PasswordResetToken {
   @@index([token])
 }
 
-model Invitation {
+model RefreshToken {
   id        String   @id @default(cuid())
-  email     String
-  orgId     String
-  role      Role
-  token     String   @unique
+  userId    String
+  tokenHash String
+  revokedAt DateTime?
   expiresAt DateTime
   createdAt DateTime @default(now())
-  acceptedAt DateTime?
-
-  org Organization @relation(fields: [orgId], references: [id], onDelete: Cascade)
-
-  @@unique([email, orgId])
-  @@index([token])
-}
-
-model Organization {
-  id          String       @id @default(cuid())
-  name        String
-  plan        String       @default("free")
-  stripeCustomerId    String?
-  stripeSubscriptionId String?
-  createdAt   DateTime     @default(now())
-  memberships Membership[]
-  projects    Project[]
-  invitations Invitation[]
-}
-
-model Membership {
-  id        String        @id @default(cuid())
-  userId    String
-  orgId     String
-  role      Role
-  createdAt DateTime      @default(now())
 
   user User @relation(fields: [userId], references: [id], onDelete: Cascade)
-  org  Organization @relation(fields: [orgId], references: [id], onDelete: Cascade)
 
-  @@unique([userId, orgId])
-  @@index([orgId])
+  @@index([userId])
 }
 
-model Project {
-  id        String       @id @default(cuid())
-  orgId     String
-  name      String
-  createdAt DateTime     @default(now())
+model Invitation {
+  id          String   @id @default(cuid())
+  email       String
+  orgId       String
+  role        Role
+  token       String   @unique
+  expiresAt   DateTime
+  createdAt   DateTime @default(now())
+  acceptedAt  DateTime?
 
   org Organization @relation(fields: [orgId], references: [id], onDelete: Cascade)
 
-  @@index([orgId])
+  @@unique([email, orgId])
+  @@index([token])
 }
 
-model RefreshToken {
-  id        String   @id @default(cuid())
-  userId    String
-  tokenHash String
-  revokedAt DateTime?
-  expiresAt DateTime
-  createdAt DateTime @default(now())
+model OAuthAccount {
+  id           String   @id @default(cuid())
+  userId       String
+  provider     String
+  providerId   String
+  accessToken  String?
+  refreshToken String?
+  createdAt    DateTime @default(now())
 
   user User @relation(fields: [userId], references: [id], onDelete: Cascade)
 
+  @@unique([provider, providerId])
   @@index([userId])
 }
 
+// ============================================
+// Other Models
+// ============================================
+
 model AuditLog {
   id        String   @id @default(cuid())
   orgId     String?
   userId    String?
+  projectId String?
   action    String
   entity    String?
   entityId  String?
@@ -140,101 +273,31 @@ model AuditLog {
 
   @@index([orgId])
   @@index([userId])
+  @@index([projectId])
   @@index([action])
   @@index([createdAt])
 }
 
-model OAuthAccount {
+model File {
   id           String   @id @default(cuid())
   userId       String
-  provider     String
-  providerId   String
-  accessToken  String?
-  refreshToken String?
-  createdAt    DateTime @default(now())
-
-  user User @relation(fields: [userId], references: [id], onDelete: Cascade)
-
-  @@unique([provider, providerId])
-  @@index([userId])
-}
-
-model File {
-  id          String   @id @default(cuid())
-  userId      String
-  orgId       String?
-  filename    String
+  orgId        String?
+  projectId    String?
+  filename     String
   originalName String
-  mimeType    String
-  size        Int
-  url         String
-  provider    String   @default("local")
-  createdAt   DateTime @default(now())
+  mimeType     String
+  size         Int
+  url          String
+  provider     String   @default("local")
+  createdAt    DateTime @default(now())
 
   user User @relation(fields: [userId], references: [id], onDelete: Cascade)
 
   @@index([userId])
   @@index([orgId])
+  @@index([projectId])
 }
 
-// Edge Functions
-model EdgeFunction {
-  id            String   @id @default(cuid())
-  name          String
-  description   String?
-  code          String
-  runtime       String   @default("nodejs18")
-  timeout       Int      @default(30000)
-  memory        Int      @default(128)
-  environment   Json?
-  triggers      Json?
-  status        String   @default("draft")
-  deployedAt    DateTime?
-  deploymentUrl String?
-  deploymentId  String?
-  organizationId String
-  createdBy     String
-  createdAt     DateTime @default(now())
-  updatedAt     DateTime @updatedAt
-  logs          EdgeFunctionLog[]
-
-  @@unique([organizationId, name])
-  @@index([organizationId])
-  @@index([status])
-}
-
-model EdgeFunctionLog {
-  id           String   @id @default(cuid())
-  functionId   String
-  status       String
-  duration     Int
-  input        Json?
-  output       Json?
-  error        String?
-  triggeredBy  String?
-  createdAt    DateTime @default(now())
-
-  function EdgeFunction @relation(fields: [functionId], references: [id], onDelete: Cascade)
-
-  @@index([functionId])
-  @@index([createdAt])
-}
-
-// Vector Embeddings
-model VectorCollection {
-  id             String   @id @default(cuid())
-  name           String
-  description    String?
-  dimension      Int      @default(1536)
-  embeddingModel String   @default("text-embedding-3-small")
-  organizationId String
-  createdAt      DateTime @default(now())
-
-  @@unique([organizationId, name])
-  @@index([organizationId])
-}
-
-// Frontend Scanner Results
 model ScannedProject {
   id             String   @id @default(cuid())
   userId         String
@@ -253,18 +316,19 @@ model ScannedProject {
   @@index([status])
 }
 
-// NoSQL Database Collections
 model DBCollection {
-  id            String   @id @default(cuid())
+  id            String       @id @default(cuid())
   projectId     String
   name          String
   description   String?
   schema        Json?
   indexes       Json?
-  createdAt     DateTime @default(now())
-  updatedAt     DateTime @updatedAt
+  createdAt     DateTime     @default(now())
+  updatedAt     DateTime     @updatedAt
   documents     DBDocument[]
 
+  project Project @relation(fields: [projectId], references: [id], onDelete: Cascade)
+
   @@unique([projectId, name])
   @@index([projectId])
 }

package/template/sdk/README.md

@@ -59,8 +59,7 @@ const { orgs } = await client.orgs.list();
 
 // Create organization
 const org = await client.orgs.create({
-  name: 'My Company',
-  slug: 'my-company'
+  name: 'My Company'
 });
 
 // Get organization

package/template/sdk/index.ts

@@ -18,7 +18,6 @@ export interface User {
 export interface Organization {
   id: string;
   name: string;
-  slug: string;
   plan: string;
   stripeCustomerId?: string;
   createdAt: Date;
@@ -27,7 +26,6 @@ export interface Organization {
 export interface Project {
   id: string;
   name: string;
-  description?: string;
   orgId: string;
   createdAt: Date;
 }
@@ -229,7 +227,7 @@ export class LaunchBaseClient {
     return res.data;
   }
 
-  async createProject(data: { name: string; description?: string }): Promise<Project> {
+  async createProject(data: { name: string }): Promise<Project> {
     const res = await this.client.post('/api/projects', data);
     return res.data;
   }

package/template/src/modules/audit/audit.interceptor.ts

@@ -34,7 +34,7 @@ export class AuditInterceptor implements NestInterceptor {
     return next.handle().pipe(
       tap({
         next: (result) => {
-          const entityId = result?.id ?? result?.project?.id ?? result?.org?.id ?? result?.membership?.id;
+          const entityId = result?.id ?? result?.project?.id ?? result?.org?.id ?? result?.organizationMember?.id;
 
           this.audit.log({
             orgId: tenant?.orgId,

package/template/src/modules/auth/auth.service.ts

@@ -65,6 +65,9 @@ export class AuthService {
 
     const passwordHash = await this.hashPassword(dto.password);
 
+    // Generate slug from org name
+    const slug = dto.orgName.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-|-$/g, '');
+
     const user = await this.prisma.user.create({
       data: {
         email: dto.email,
@@ -75,14 +78,16 @@ export class AuthService {
     // Create first org for the user
     const org = await this.prisma.organization.create({
       data: {
-        name: dto.orgName
+        name: dto.orgName,
+        slug,
+        ownerId: user.id
       }
     });
 
-    await this.prisma.membership.create({
+    await this.prisma.organizationMember.create({
       data: {
         userId: user.id,
-        orgId: org.id,
+        organizationId: org.id,
         role: Role.OWNER
       }
     });
@@ -91,7 +96,7 @@ export class AuthService {
 
     return {
       user: { id: user.id, email: user.email },
-      org: { id: org.id, name: org.name },
+      org: { id: org.id, name: org.name, slug: org.slug },
       ...tokens
     };
   }
@@ -99,7 +104,7 @@ export class AuthService {
   async login(dto: LoginDto) {
     const user = await this.prisma.user.findUnique({ 
       where: { email: dto.email },
-      include: { memberships: { include: { org: true } } }
+      include: { organizationMemberships: { include: { organization: true } } }
     });
     if (!user || !user.passwordHash) throw new UnauthorizedException('Invalid credentials');
 
@@ -109,11 +114,11 @@ export class AuthService {
     const tokens = await this.issueTokens({ id: user.id, email: user.email });
 
     // Get first org for the user
-    const firstMembership = user.memberships[0];
+    const firstMembership = user.organizationMemberships[0];
 
     return {
       user: { id: user.id, email: user.email },
-      org: firstMembership ? { id: firstMembership.org.id, name: firstMembership.org.name } : null,
+      org: firstMembership ? { id: firstMembership.organization.id, name: firstMembership.organization.name, slug: firstMembership.organization.slug } : null,
       ...tokens
     };
   }

package/template/src/modules/billing/billing.service.ts

@@ -196,7 +196,7 @@ export class BillingService {
     }
 
     if (type === 'members') {
-      const count = await this.prisma.membership.count({ where: { orgId } });
+      const count = await this.prisma.organizationMember.count({ where: { organizationId: orgId } });
       return count < limits.members;
     }
 

package/template/src/modules/common/filters/all-exceptions.filter.ts

@@ -22,17 +22,27 @@ export class AllExceptionsFilter implements ExceptionFilter {
         ? exception.getStatus()
         : HttpStatus.INTERNAL_SERVER_ERROR;
 
-    const message =
-      exception instanceof HttpException
-        ? exception.getResponse()
-        : 'Internal server error';
+    let errorMessage: string;
+    if (exception instanceof HttpException) {
+      const response = exception.getResponse();
+      if (typeof response === 'string') {
+        errorMessage = response;
+      } else if (typeof response === 'object' && response !== null && 'message' in response) {
+        const msg = (response as any).message;
+        errorMessage = Array.isArray(msg) ? msg[0] : String(msg);
+      } else {
+        errorMessage = 'An error occurred';
+      }
+    } else {
+      errorMessage = 'Internal server error';
+    }
 
     const errorResponse = {
       statusCode: status,
       timestamp: new Date().toISOString(),
       path: request.url,
       method: request.method,
-      message: typeof message === 'object' ? message : { message },
+      message: errorMessage,
     };
 
     // Log the error

package/template/src/modules/common/project.guard.ts

@@ -0,0 +1,52 @@
+import { CanActivate, ExecutionContext, ForbiddenException, Injectable } from '@nestjs/common';
+import { PrismaService } from '../prisma/prisma.service';
+
+@Injectable()
+export class ProjectGuard implements CanActivate {
+  constructor(private readonly prisma: PrismaService) {}
+
+  async canActivate(context: ExecutionContext): Promise<boolean> {
+    const req = context.switchToHttp().getRequest();
+    const user = req.user as { userId?: string } | undefined;
+    const tenant = req.tenant as { orgId?: string; role?: string } | undefined;
+    
+    // Get project identifier from params or headers
+    const projectSlug = req.params?.projectSlug || req.headers['x-project-slug'] as string | undefined;
+    const projectId = req.params?.projectId || req.headers['x-project-id'] as string | undefined;
+
+    if (!user?.userId) throw new ForbiddenException('Missing auth context');
+    if (!tenant?.orgId) throw new ForbiddenException('Missing tenant context - ensure TenantGuard runs first');
+
+    // Find project by slug or ID
+    let project;
+    if (projectId) {
+      project = await this.prisma.project.findUnique({
+        where: { id: projectId }
+      });
+    } else if (projectSlug) {
+      project = await this.prisma.project.findFirst({
+        where: {
+          slug: projectSlug,
+          organizationId: tenant.orgId
+        }
+      });
+    }
+
+    if (!project) throw new ForbiddenException('Project not found');
+    
+    // Verify project belongs to the organization
+    if (project.organizationId !== tenant.orgId) {
+      throw new ForbiddenException('Project does not belong to this organization');
+    }
+
+    // Attach project to request for use in controllers
+    req.project = {
+      id: project.id,
+      slug: project.slug,
+      name: project.name,
+      organizationId: project.organizationId
+    };
+
+    return true;
+  }
+}

package/template/src/modules/common/tenant.guard.ts

@@ -13,11 +13,11 @@ export class TenantGuard implements CanActivate {
     if (!user?.userId) throw new ForbiddenException('Missing auth context');
     if (!orgId) throw new ForbiddenException('Missing x-org-id header');
 
-    const membership = await this.prisma.membership.findUnique({
+    const membership = await this.prisma.organizationMember.findUnique({
       where: {
-        userId_orgId: {
+        organizationId_userId: {
           userId: user.userId,
-          orgId
+          organizationId: orgId
         }
       }
     });