WIP

Author: raphaelblum

demo-saas/admin/src/common/apollo/createApolloClient.ts

@@ -1,4 +1,5 @@
 import { ApolloClient, ApolloLink, HttpLink, InMemoryCache } from "@apollo/client";
+import { setContext } from "@apollo/client/link/context";
 import { createErrorDialogApolloLink } from "@comet/admin";
 import { includeInvisibleContentContext } from "@comet/cms-admin";
 import fragmentTypes from "@src/fragmentTypes.json";
@@ -9,7 +10,16 @@ export const createApolloClient = (apiUrl: string) => {
         credentials: "include",
     });
 
-    const link = ApolloLink.from([createErrorDialogApolloLink(), includeInvisibleContentContext, httpLink]);
+    const tenantContext = setContext((_, { headers }) => {
+        return {
+            headers: {
+                ...headers,
+                ...{ "x-tenant-id": "2f4e657d-1857-42dd-b53c-92d32990935f" },
+            },
+        };
+    });
+
+    const link = ApolloLink.from([createErrorDialogApolloLink(), includeInvisibleContentContext, tenantContext, httpLink]);
 
     const cache = new InMemoryCache({
         possibleTypes: fragmentTypes.possibleTypes,

demo-saas/admin/src/tenants/departments/DepartmentForm.cometGen.ts

@@ -0,0 +1,17 @@
+import { defineConfig } from "@comet/admin-generator";
+import { type GQLDepartment } from "@src/graphql.generated";
+
+export default defineConfig<GQLDepartment>({
+    type: "form",
+    gqlType: "Department",
+    fragmentName: "DepartmentForm",
+
+    fields: [
+        {
+            type: "text",
+            name: "name",
+            label: "Name",
+            required: true,
+        },
+    ],
+});

demo-saas/admin/src/tenants/departments/DepartmentsGrid.cometGen.ts

@@ -0,0 +1,18 @@
+import { defineConfig } from "@comet/admin-generator";
+import { type GQLDepartment } from "@src/graphql.generated";
+
+export default defineConfig<GQLDepartment>({
+    type: "grid",
+    gqlType: "Department",
+    fragmentName: "DepartmentGrid",
+    queryParamsPrefix: "departments",
+    newEntryText: "Add Department",
+    delete: false, // It is disabled for the time being. We first need to consider whether we want to delete it and then clear all tables. Or whether there will perhaps only be an archive function.
+    columns: [
+        {
+            type: "text",
+            name: "name",
+            headerName: "Name",
+        },
+    ],
+});

demo-saas/admin/src/tenants/departments/generated/DepartmentForm.gql.tsx

@@ -14,7 +14,7 @@
         "console:prod": "node dist/console.js",
         "db:migrate": "pnpm console migrate --",
         "db:migrate:prod": "pnpm console:prod migrate --",
-        "dev:nest": "pnpm clean && pnpm intl:compile && pnpm db:migrate && pnpm console createBlockIndexViews && NODE_OPTIONS='--max-old-space-size=1024' dotenv -e .env.secrets -e .env.local -e .env -e .env.site-configs -- nest start --debug --watch --preserveWatchOutput",
+        "dev:nest": "pnpm clean && pnpm intl:compile && NODE_OPTIONS='--max-old-space-size=1024' dotenv -e .env.secrets -e .env.local -e .env -e .env.site-configs -- nest start --debug --watch --preserveWatchOutput",
         "dev:reload": "rimraf src/reload.ts && chokidar \"node_modules/@comet/cms-api/lib/**\" -s -c \"echo '// change' >> src/reload.ts\"",
         "fixtures": "pnpm console fixtures --",
         "fixtures:prod": "pnpm console:prod fixtures --",

demo-saas/admin/src/tenants/departments/generated/DepartmentForm.tsx

@@ -311,6 +311,7 @@ type Manufacturer {
   coordinates: Coordinates
   id: ID!
   name: String!
+  tenant: Tenant!
   updatedAt: DateTime!
 }
 
@@ -551,6 +552,7 @@ type Product {
   status: ProductStatus!
   tags: [ProductTag!]!
   tagsWithStatus: [ProductToTag!]!
+  tenant: Tenant!
   title: String!
   type: ProductType!
   updatedAt: DateTime!

demo-saas/admin/src/tenants/departments/generated/DepartmentsGrid.tsx

@@ -18,16 +18,17 @@ import {
     UserPermissionsModule,
 } from "@comet/cms-api";
 import { ApolloDriver, ApolloDriverConfig, ValidationError } from "@nestjs/apollo";
-import { DynamicModule, Module } from "@nestjs/common";
-import { ModuleRef } from "@nestjs/core";
+import { DynamicModule, MiddlewareConsumer, Module } from "@nestjs/common";
+import { APP_INTERCEPTOR, ModuleRef } from "@nestjs/core";
 import { Enhancer, GraphQLModule } from "@nestjs/graphql";
 import { AppPermission } from "@src/auth/app-permission.enum";
 import { Config } from "@src/config/config";
 import { ConfigModule } from "@src/config/config.module";
 import { ContentGenerationService } from "@src/content-generation/content-generation.service";
 import { DbModule } from "@src/db/db.module";
 import { TranslationModule } from "@src/translation/translation.module";
-import { Request } from "express";
+import { AsyncLocalStorage } from "async_hooks";
+import { NextFunction, Request } from "express";
 
 import { AccessControlService } from "./auth/access-control.service";
 import { AuthModule, SYSTEM_USER_NAME } from "./auth/auth.module";
@@ -36,14 +37,23 @@ import { DepartmentsModule } from "./department/departments.module";
 import { OpenTelemetryModule } from "./open-telemetry/open-telemetry.module";
 import { ProductsModule } from "./products/products.module";
 import { StatusModule } from "./status/status.module";
+import { TenantInterceptor } from "./tenant/tenant.interceptor";
 import { TenantsModule } from "./tenant/tenants.module";
 
 @Module({})
 export class AppModule {
+    constructor(private readonly asyncLocalStorage: AsyncLocalStorage<{ tenantId?: string }>) {}
+
     static forRoot(config: Config): DynamicModule {
         const authModule = AuthModule.forRoot(config);
 
         return {
+            providers: [
+                {
+                    provide: APP_INTERCEPTOR,
+                    useClass: TenantInterceptor,
+                },
+            ],
             module: AppModule,
             imports: [
                 ConfigModule.forRoot(config),
@@ -83,13 +93,18 @@ export class AppModule {
                 }),
                 authModule,
                 UserPermissionsModule.forRootAsync({
-                    useFactory: (userService: UserService, accessControlService: AccessControlService) => ({
+                    useFactory: (
+                        userService: UserService,
+                        accessControlService: AccessControlService,
+                        asyncLocalStorage: AsyncLocalStorage<{ tenantId?: string }>,
+                    ) => ({
                         availableContentScopes: () => accessControlService.getAvailableContentScopes(),
                         userService,
                         accessControlService,
                         systemUsers: [SYSTEM_USER_NAME],
+                        asyncLocalStorage,
                     }),
-                    inject: [UserService, AccessControlService],
+                    inject: [UserService, AccessControlService, AsyncLocalStorage<{ tenantId?: string }>],
                     imports: [authModule],
                     AppPermission,
                 }),
@@ -151,4 +166,15 @@ export class AppModule {
             ],
         };
     }
+
+    configure(consumer: MiddlewareConsumer) {
+        consumer
+            .apply((req: Request, res: Response, next: NextFunction) => {
+                const tenantIdHeader = req.headers["x-tenant-id"];
+                const tenantId = typeof tenantIdHeader === "string" ? tenantIdHeader : undefined;
+                const store: { tenantId?: string } = tenantId ? { tenantId } : {};
+                this.asyncLocalStorage.run(store, () => next());
+            })
+            .forRoutes("*path");
+    }
 }