Docker compose dependencies (stack-auth#20)

N2D4 · web-flow · commit 406ad69ebb28 · 2024-05-04T15:42:41.000+02:00
diff --git a/.github/workflows/e2e-api-tests.yaml b/.github/workflows/e2e-api-tests.yaml
@@ -2,35 +2,13 @@ name: Runs E2E API Tests
 
 on:
   push:
-    branches: [main, dev]
-  pull_request:
-    branches: [main, dev]
+    branches:
+      - '*'
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
-    env:
-      SERVER_BASE_URL: http://localhost:8101
-      PROJECT_CLIENT_ID: ${{ secrets.PROJECT_CLIENT_ID }}
-      PROJECT_CLIENT_KEY: ${{ secrets.PROJECT_CLIENT_KEY }}
-
-      NEXT_PUBLIC_STACK_URL: http://localhost:8101
-      NEXT_PUBLIC_STACK_PROJECT_ID: ${{ secrets.PROJECT_CLIENT_ID }}
-      NEXT_PUBLIC_STACK_PUBLISHABLE_CLIENT_KEY: ${{ secrets.PROJECT_CLIENT_KEY }}
-      STACK_SECRET_SERVER_KEY: test
-      SERVER_SECRET: 23-wuNpik0gIW4mruTz25rbIvhuuvZFrLOLtL7J4tyo
-
-      EMAIL_HOST: 0.0.0.0
-      EMAIL_PORT: 2500
-      EMAIL_SECURE: false
-      EMAIL_USERNAME: test
-      EMAIL_PASSWORD: none
-      EMAIL_SENDER: noreply@test.com
-
-      DATABASE_CONNECTION_STRING: ${{ secrets.DATABASE_CONNECTION_STRING }}
-      DIRECT_DATABASE_CONNECTION_STRING: ${{ secrets.DATABASE_CONNECTION_STRING }}
-
     strategy:
       matrix:
         node-version: [20.x]
@@ -45,9 +23,47 @@ jobs:
         uses: pnpm/action-setup@v3
         with:
             version: 8
+            
+      - name: Create .env.local file for stack-server
+        run: |
+          cat > packages/stack-server/.env.local <<EOF
+          NEXT_PUBLIC_STACK_URL=http://localhost:8101
+          NEXT_PUBLIC_STACK_PROJECT_ID=internal
+          NEXT_PUBLIC_STACK_PUBLISHABLE_CLIENT_KEY=internal-project-client-api-key
+          STACK_SECRET_SERVER_KEY=internal-project-server-api-key
+          SERVER_SECRET=23-wuNpik0gIW4mruTz25rbIvhuuvZFrLOLtL7J4tyo
+
+          EMAIL_HOST=0.0.0.0
+          EMAIL_PORT=2500
+          EMAIL_SECURE=false
+          EMAIL_USERNAME=some-username
+          EMAIL_PASSWORD=some-password
+          EMAIL_SENDER=noreply@example.com
+    
+          DATABASE_CONNECTION_STRING=postgres://postgres:password@localhost:5432/stackframe
+          DIRECT_DATABASE_CONNECTION_STRING=postgres://postgres:password@localhost:5432/stackframe
+          EOF
+          
       - name: Install dependencies
         run: pnpm install
-      - name: Build
+
+      - name: Start Docker Compose
+        run: docker-compose -f dependencies.compose.yaml up -d
+      - name: Initialize database
+        run: pnpm run prisma:server -- migrate reset --force
+
+      - name: Build stack-server
         run: pnpm build:server
-      - name: Start server & run tests
-        run: pnpm -C packages/stack-server start & npx wait-on@7.2.0 http://localhost:8101 && pnpm -C apps/e2e test:ci
+  
+
+      - name: Start stack-server in background
+        run: pnpm -C packages/stack-server start &
+      - name: Wait for stack-server to start
+        run: npx wait-on@7.2.0 http://localhost:8101
+
+      - name: Run tests
+        run: pnpm -C apps/e2e test:ci
+        env:
+          SERVER_BASE_URL: http://localhost:8101
+          INTERNAL_PROJECT_ID: internal
+          INTERNAL_PROJECT_CLIENT_KEY: internal-project-client-api-key
diff --git a/apps/e2e/.env b/apps/e2e/.env
@@ -1,3 +1,3 @@
-PROJECT_CLIENT_ID=internal
-PROJECT_CLIENT_KEY=client_key
-SERVER_BASE_URL=http://localhost:8101
+INTERNAL_PROJECT_ID=
+INTERNAL_PROJECT_CLIENT_KEY=
+SERVER_BASE_URL=http://localhost:8101
diff --git a/apps/e2e/tests/helpers.ts b/apps/e2e/tests/helpers.ts
@@ -7,5 +7,5 @@ function getEnvVar(name: string): string {
 }
 
 export const BASE_URL = getEnvVar("SERVER_BASE_URL")
-export const PROJECT_ID = getEnvVar("PROJECT_CLIENT_ID")
-export const PROJECT_CLIENT_KEY = getEnvVar("PROJECT_CLIENT_KEY")
+export const INTERNAL_PROJECT_ID = getEnvVar("INTERNAL_PROJECT_ID")
+export const INTERNAL_PROJECT_CLIENT_KEY = getEnvVar("INTERNAL_PROJECT_CLIENT_KEY")
diff --git a/apps/e2e/tests/stack-server/internal-project.test.ts b/apps/e2e/tests/stack-server/internal-project.test.ts
@@ -1,10 +1,10 @@
 import { describe, expect, test } from "vitest";
 import request from "supertest";
-import { BASE_URL, PROJECT_CLIENT_KEY, PROJECT_ID } from "./helpers";
+import { BASE_URL, INTERNAL_PROJECT_CLIENT_KEY, INTERNAL_PROJECT_ID } from "../helpers";
 
 const AUTH_HEADER = {
-  "x-stack-project-id": PROJECT_ID,
-  "x-stack-publishable-client-key": PROJECT_CLIENT_KEY,
+  "x-stack-project-id": INTERNAL_PROJECT_ID,
+  "x-stack-publishable-client-key": INTERNAL_PROJECT_CLIENT_KEY,
 };
 
 const JSON_HEADER = {
@@ -36,7 +36,7 @@ async function signInWithEmailPassword(email: string, password: string) {
   return { email, password, response };
 }
 
-describe("Basic", () => {
+describe("Various internal project tests", () => {
   test("Main Page", async () => {
     const response = await request(BASE_URL).get("/");
     expect(response.status).toBe(307);
@@ -71,4 +71,4 @@ describe("Basic", () => {
     expect(response2.status).toBe(200);
     expect(response2.body.primaryEmail).toBe(email)
   });
-});
+});
diff --git a/dependencies.compose.yaml b/dependencies.compose.yaml
@@ -0,0 +1,24 @@
+services:
+  db:
+    image: postgres:latest
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: password
+      POSTGRES_DB: stackframe
+    ports:
+      - 5432:5432
+    volumes:
+      - postgres-data:/var/lib/postgresql/data
+  inbucket:
+    image: inbucket/inbucket:latest
+    ports:
+      - 2500:2500
+      - 9000:9000
+      - 1100:1100
+    volumes:
+      - inbucket-data:/data
+
+volumes:
+  postgres-data:
+  inbucket-data:
+
diff --git a/packages/stack-server/package.json b/packages/stack-server/package.json
@@ -25,7 +25,7 @@
     "todo-sh-error-blocker": "( echo && echo ========================================= && echo There are TODO\\ ASAPs in your code, please && echo review them with '`npm run todo`'. && echo && echo Press ENTER or wait 10s to continue. && echo ========================================= && echo && bash -c 'read -t 10'; exit 1 ) 1>&2"
   },
   "prisma": {
-    "seed": "npm run with-env -- ts-node prisma/seed.ts"
+    "seed": "npm run with-env -- tsx prisma/seed.ts"
   },
   "dependencies": {
     "@emotion/react": "^11.11.3",
@@ -77,6 +77,6 @@
     "@types/react": "^18.2.66",
     "@types/react-dom": "^18",
     "prisma": "^5.9.1",
-    "ts-node": "^10.9.2"
+    "tsx": "^4.7.2"
   }
 }
diff --git a/packages/stack-server/prisma/seed.ts b/packages/stack-server/prisma/seed.ts
@@ -1,4 +1,4 @@
-const { PrismaClient } = require('@prisma/client');  // must use require due to ts-node shenanigans
+import { PrismaClient } from '@prisma/client';
 const prisma = new PrismaClient();
 
 
@@ -37,11 +37,11 @@ async function seed() {
         create: {
           allowLocalhost: true,
           oauthProviderConfigs: {
-            create: ['github', 'facebook', 'google', 'microsoft'].map((id) => ({
+            create: (['github', 'facebook', 'google', 'microsoft'] as const).map((id) => ({
               id,
               proxiedOAuthConfig: {
                 create: {                
-                  type: id.toUpperCase(),
+                  type: id.toUpperCase() as any,
                 }
               },
               projectUserOAuthAccounts: {
diff --git a/packages/stack-server/sentry.client.config.ts b/packages/stack-server/sentry.client.config.ts
@@ -11,9 +11,9 @@ Sentry.init({
   tracesSampleRate: 1,
 
   // Setting this option to true will print useful information to the console while you're setting up Sentry.
-  debug: process.env.NODE_ENV === "development",
+  debug: false,
 
-  enabled: process.env.NODE_ENV !== "development" && process.env.NODE_ENV !== "test",
+  enabled: process.env.NODE_ENV !== "development" && !process.env.CI,
 
   replaysOnErrorSampleRate: 1.0,
 
diff --git a/packages/stack-server/sentry.edge.config.ts b/packages/stack-server/sentry.edge.config.ts
@@ -12,7 +12,7 @@ Sentry.init({
   tracesSampleRate: 1,
 
   // Setting this option to true will print useful information to the console while you're setting up Sentry.
-  debug: process.env.NODE_ENV === "development",
+  debug: false,
 
-  enabled: process.env.NODE_ENV !== "development" && process.env.NODE_ENV !== "test",
+  enabled: process.env.NODE_ENV !== "development" && !process.env.CI,
 });
diff --git a/packages/stack-server/sentry.server.config.ts b/packages/stack-server/sentry.server.config.ts
@@ -11,7 +11,7 @@ Sentry.init({
   tracesSampleRate: 1,
 
   // Setting this option to true will print useful information to the console while you're setting up Sentry.
-  debug: process.env.NODE_ENV === "development",
+  debug: false,
 
-  enabled: process.env.NODE_ENV !== "development" && process.env.NODE_ENV !== "test",
+  enabled: process.env.NODE_ENV !== "development" && !process.env.CI,
 });
diff --git a/packages/stack-server/src/app/api/v1/projects/[projectId]/route.tsx b/packages/stack-server/src/app/api/v1/projects/[projectId]/route.tsx
@@ -2,7 +2,7 @@ import { NextRequest, NextResponse } from "next/server";
 import * as yup from "yup";
 import { StatusError } from "@stackframe/stack-shared/dist/utils/errors";
 import { deprecatedParseRequest, deprecatedSmartRouteHandler } from "@/lib/route-handlers";
-import { checkApiKeySet, publishableClientKeyHeaderSchema, superSecretAdminKeyHeaderSchema } from "@/lib/api-keys";
+import { checkApiKeySet, publishableClientKeyHeaderSchema, secretServerKeyHeaderSchema, superSecretAdminKeyHeaderSchema } from "@/lib/api-keys";
 import { getProject, isProjectAdmin, updateProject } from "@/lib/projects";
 import { ClientProjectJson, SharedProvider, StandardProvider, sharedProviders, standardProviders } from "@stackframe/stack-shared/dist/interface/clientInterface";
 import { ProjectUpdateOptions } from "@stackframe/stack-shared/dist/interface/adminInterface";
diff --git a/packages/stack-server/src/stack.tsx b/packages/stack-server/src/stack.tsx
@@ -2,6 +2,10 @@ import './polyfills';
 
 import { StackServerApp } from '@stackframe/stack';
 
+if (process.env.NEXT_PUBLIC_STACK_PROJECT_ID !== "internal") {
+  throw new Error("This project is not configured correctly. stack-server must always use the internal project.");
+}
+
 export const stackServerApp = new StackServerApp({
   tokenStore: "nextjs-cookie",
   urls: {
diff --git a/packages/stack-shared/src/utils/promises.tsx b/packages/stack-shared/src/utils/promises.tsx
@@ -1,3 +1,4 @@
+import { KnownError } from "..";
 import { StackAssertionError, captureError } from "./errors";
 import { Result } from "./results";
 import { generateUuid } from "./uuids";
diff --git a/packages/stack/package.json b/packages/stack/package.json
@@ -66,6 +66,7 @@
     "@types/color": "^3.0.6",
     "@types/js-cookie": "^3.0.6",
     "@types/react": "^18.2.66",
-    "esbuild": "^0.20.2"
+    "esbuild": "^0.20.2",
+    "tsup": "^8.0.2"
   }
 }
diff --git a/packages/stack/tsup.config.ts b/packages/stack/tsup.config.ts
@@ -28,7 +28,6 @@ const config: Options = {
         });
 
         build.onResolve({ filter: /^.*$/m }, async (args) => {
-          console.log('onResolve', args);
           if (args.kind === "entry-point" || customNoExternal.has(args.path)) {
             return undefined;
           }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@ function getEnvVar(name: string): string {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`export const BASE_URL = getEnvVar("SERVER_BASE_URL")`
`10`		`-export const PROJECT_ID = getEnvVar("PROJECT_CLIENT_ID")`
`11`		`-export const PROJECT_CLIENT_KEY = getEnvVar("PROJECT_CLIENT_KEY")`
	`10`	`+export const INTERNAL_PROJECT_ID = getEnvVar("INTERNAL_PROJECT_ID")`
	`11`	`+export const INTERNAL_PROJECT_CLIENT_KEY = getEnvVar("INTERNAL_PROJECT_CLIENT_KEY")`