Merge branch 'main' into 279-stub-text-formatting

GSA-TTS · Aug 22, 2024 · 69839f6 · 69839f6
2 parents 7128447 + 7dd7dd8
commit 69839f6
Show file tree

Hide file tree

Showing 107 changed files with 1,730 additions and 582 deletions.
diff --git a/apps/cli/package.json b/apps/cli/package.json
@@ -6,7 +6,7 @@
   "license": "CC0",
   "main": "src/index.ts",
   "scripts": {
-    "build": "node ./build.js",
+    "build": "tsup src/* --format cjs",
     "cli": "node dist/index.js",
     "dev": "tsup src/* --watch",
     "test": "vitest run --coverage"

diff --git a/apps/server-doj/build.js b/apps/server-doj/build.js
@@ -0,0 +1,14 @@
+import esbuild from 'esbuild';
+
+esbuild
+  .build({
+    bundle: true,
+    entryPoints: ['./src/index.ts'],
+    format: 'esm',
+    minify: true,
+    outdir: './dist',
+    platform: 'node',
+    sourcemap: true,
+    target: 'esnext',
+  })
+  .catch(() => process.exit(1));
diff --git a/apps/server-doj/src/index.ts b/apps/server-doj/src/index.ts
@@ -1,8 +1,21 @@
 import { createCustomServer } from './server.js';
 
 const port = process.env.PORT || 4321;
-const app = await createCustomServer();
 
-app.listen(port, () => {
-  console.log(`Server running on http://localhost:${port}`);
-});
+const getCloudGovServerSecrets = () => {
+  if (process.env.VCAP_SERVICES === undefined) {
+    throw new Error('VCAP_SERVICES not found');
+  }
+  const services = JSON.parse(process.env.VCAP_SERVICES || '{}');
+  return {
+    //loginGovClientSecret: services['user-provided']?.credentials?.SECRET_LOGIN_GOV_PRIVATE_KEY,
+    dbUri: services['aws-rds'][0].credentials.uri as string,
+  };
+};
+
+const secrets = getCloudGovServerSecrets();
+createCustomServer({ dbUri: secrets?.dbUri }).then((server: any) =>
+  server.listen(port, () => {
+    console.log(`Server running on http://localhost:${port}`);
+  })
+);
diff --git a/apps/server-doj/src/server.ts b/apps/server-doj/src/server.ts
@@ -1,18 +1,15 @@
-import path, { dirname } from 'path';
-import { fileURLToPath } from 'url';
+import {
+  createDatabaseGateway,
+  createPostgresDatabaseContext,
+} from '@atj/database';
+import { createServer } from '@atj/server';
 
-const getDirname = () => dirname(fileURLToPath(import.meta.url));
-
-export const createCustomServer = async (): Promise<any> => {
-  const { createDevDatabaseContext, createDatabaseGateway } = await import(
-    '@atj/database'
-  );
-  const { createServer } = await import('@atj/server');
-
-  const dbCtx = await createDevDatabaseContext(
-    path.join(getDirname(), '../doj.db')
+export const createCustomServer = async (ctx: {
+  dbUri: string;
+}): Promise<any> => {
+  const db = createDatabaseGateway(
+    await createPostgresDatabaseContext(ctx.dbUri, true)
   );
-  const db = createDatabaseGateway(dbCtx);
 
   return createServer({
     title: 'DOJ Form Service',
@@ -23,16 +20,18 @@ export const createCustomServer = async (): Promise<any> => {
         'urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:tts-10x-atj-dev-server-doj',
       //clientSecret: '', // secrets.loginGovClientSecret,
     },
+    isUserAuthorized: async (email: string) => {
+      return [
+        // 10x team members
+        'daniel.naab@gsa.gov',
+        'jim.moffet@gsa.gov',
+        'ethan.gardner@gsa.gov',
+        'natasha.pierre-louis@gsa.gov',
+        'emily.lordahl@gsa.gov',
+        // DOJ test users
+        'deserene.h.worsley@usdoj.gov',
+        'jordan.pendergrass@usdoj.gov',
+      ].includes(email);
+    },
   });
 };
-
-/*
-const getServerSecrets = () => {
-  const services = JSON.parse(process.env.VCAP_SERVICES || '{}');
-  const loginClientSecret =
-    services['user-provided']?.credentials?.SECRET_LOGIN_GOV_PRIVATE_KEY;
-  return {
-    loginGovClientSecret: loginClientSecret,
-  };
-};
-*/
diff --git a/apps/server-doj/tests/integration.test.ts b/apps/server-doj/tests/integration.test.ts
@@ -1,16 +1,18 @@
 import request from 'supertest';
-import { beforeAll, describe, expect, test } from 'vitest';
+import { describe, expect, test } from 'vitest';
+import { describeDatabase } from '@atj/database/testing';
 
 import { createCustomServer } from '../src/server';
 
 describe('DOJ Form Service', () => {
-  let app: any;
-
-  beforeAll(async () => {
-    app = await createCustomServer();
+  test('avoid "No test suite found in file" error', async () => {
+    expect(true).toBe(true);
   });
+});
 
-  test('renders the home page', async () => {
+describeDatabase('DOJ Form Service', () => {
+  test('renders the home page', async ({ db }) => {
+    const app = await createCustomServer({ dbUri: db.ctx.connectionUri });
     const response = await request(app).get('/');
     expect(response.ok).toBe(true);
     expect(response.text).toMatch(/DOJ Form Service/);

diff --git a/apps/server-doj/tsconfig.json b/apps/server-doj/tsconfig.json
@@ -1,12 +1,11 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "module": "ESNext",
-    "emitDeclarationOnly": true,
+    "module": "CommonJS",
+    "moduleResolution": "NodeNext",
     "outDir": "./dist",
-    "target": "es2022"
+    "emitDeclarationOnly": true
   },
-  "include": ["./src/**/*"],
-  "exclude": ["./dist"],
+  "include": ["./src"],
   "references": []
 }
diff --git a/apps/server-doj/vitest.config.ts b/apps/server-doj/vitest.config.ts
@@ -0,0 +1,12 @@
+import { defineConfig } from 'vitest/config';
+import { getDatabaseTestContainerGlobalSetupPath } from '@atj/database';
+
+import sharedTestConfig from '../../vitest.shared';
+
+export default defineConfig({
+  ...sharedTestConfig,
+  test: {
+    ...sharedTestConfig.test,
+    globalSetup: [getDatabaseTestContainerGlobalSetupPath()],
+  },
+});
diff --git a/apps/server-kansas/src/index.ts b/apps/server-kansas/src/index.ts
@@ -1,8 +1,21 @@
-import { createCustomServer } from './server';
+import { createCustomServer } from './server.js';
 
 const port = process.env.PORT || 4321;
-const app = await createCustomServer();
 
-app.listen(port, () => {
-  console.log(`Server running on http://localhost:${port}`);
-});
+const getCloudGovServerSecrets = () => {
+  if (process.env.VCAP_SERVICES === undefined) {
+    throw new Error('VCAP_SERVICES not found');
+  }
+  const services = JSON.parse(process.env.VCAP_SERVICES || '{}');
+  return {
+    //loginGovClientSecret: services['user-provided']?.credentials?.SECRET_LOGIN_GOV_PRIVATE_KEY,
+    dbUri: services['aws-rds'][0].credentials.uri as string,
+  };
+};
+
+const secrets = getCloudGovServerSecrets();
+createCustomServer({ dbUri: secrets?.dbUri }).then((server: any) =>
+  server.listen(port, () => {
+    console.log(`Server running on http://localhost:${port}`);
+  })
+);
diff --git a/apps/server-kansas/src/server.ts b/apps/server-kansas/src/server.ts
@@ -1,38 +1,33 @@
-import path, { dirname } from 'path';
-import { fileURLToPath } from 'url';
+import {
+  createDatabaseGateway,
+  createPostgresDatabaseContext,
+} from '@atj/database';
+import { createServer } from '@atj/server';
 
-const getDirname = () => dirname(fileURLToPath(import.meta.url));
-
-export const createCustomServer = async (): Promise<any> => {
-  const { createDevDatabaseContext, createDatabaseGateway } = await import(
-    '@atj/database'
-  );
-  const { createServer } = await import('@atj/server');
-
-  const dbCtx = await createDevDatabaseContext(
-    path.join(getDirname(), '../doj.db')
+export const createCustomServer = async (ctx: {
+  dbUri: string;
+}): Promise<any> => {
+  const db = createDatabaseGateway(
+    await createPostgresDatabaseContext(ctx.dbUri, true)
   );
-  const db = createDatabaseGateway(dbCtx);
 
   return createServer({
-    title: 'KS Courts Form Service',
+    title: 'DOJ Form Service',
     db,
     loginGovOptions: {
       loginGovUrl: 'https://idp.int.identitysandbox.gov',
       clientId:
         'urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:tts-10x-atj-dev-server-doj',
       //clientSecret: '', // secrets.loginGovClientSecret,
     },
+    isUserAuthorized: async (email: string) => {
+      return [
+        'daniel.naab@gsa.gov',
+        'jim.moffet@gsa.gov',
+        'ethan.gardner@gsa.gov',
+        'natasha.pierre-louis@gsa.gov',
+        'emily.lordahl@gsa.gov',
+      ].includes(email);
+    },
   });
 };
-
-/*
-const getServerSecrets = () => {
-  const services = JSON.parse(process.env.VCAP_SERVICES || '{}');
-  const loginClientSecret =
-    services['user-provided']?.credentials?.SECRET_LOGIN_GOV_PRIVATE_KEY;
-  return {
-    loginGovClientSecret: loginClientSecret,
-  };
-};
-*/
diff --git a/apps/server-kansas/tests/integration.test.ts b/apps/server-kansas/tests/integration.test.ts
@@ -1,18 +1,20 @@
 import request from 'supertest';
-import { beforeAll, describe, expect, test } from 'vitest';
+import { describe, expect, test } from 'vitest';
+import { describeDatabase } from '@atj/database/testing';
 
 import { createCustomServer } from '../src/server';
 
-describe('Kansas State Courts Form Service', () => {
-  let app: any;
-
-  beforeAll(async () => {
-    app = await createCustomServer();
+describe('DOJ Form Service', () => {
+  test('avoid "No test suite found in file" error', async () => {
+    expect(true).toBe(true);
   });
+});
 
-  test('renders the home page', async () => {
+describeDatabase('Kansas State Courts Form Service', () => {
+  test('renders the home page', async ({ db }) => {
+    const app = await createCustomServer({ dbUri: db.ctx.connectionUri });
     const response = await request(app).get('/');
     expect(response.ok).toBe(true);
-    expect(response.text).toMatch(/KS Courts Form Service/);
+    expect(response.text).toMatch(/DOJ Form Service/);
   });
 });
diff --git a/infra/cdktf/src/lib/cloud.gov/node-astro.ts b/infra/cdktf/src/lib/cloud.gov/node-astro.ts
@@ -41,6 +41,34 @@ export class AstroService extends Construct {
         }
       );
 
+    const rds =
+      new cloudfoundry.dataCloudfoundryService.DataCloudfoundryService(
+        scope,
+        `${id}-data-aws-rds`,
+        {
+          name: 'aws-rds',
+        }
+      );
+
+    const dbInstance = new cloudfoundry.serviceInstance.ServiceInstance(
+      this,
+      `${id}-db`,
+      {
+        name: `${id}-db`,
+        servicePlan: rds.servicePlans.lookup('micro-psql'),
+        space: spaceId,
+        jsonParams: '{"version": "15"}',
+        lifecycle: {
+          preventDestroy: true,
+        },
+        timeouts: {
+          create: '60m',
+          update: '60m',
+          delete: '2h',
+        },
+      }
+    );
+
     new cloudfoundry.app.App(this, `${id}-app`, {
       name: `${id}-app`,
       space: spaceId,
@@ -55,6 +83,9 @@ export class AstroService extends Construct {
         },
       ],
       serviceBinding: [
+        {
+          serviceInstance: dbInstance.id,
+        },
         {
           serviceInstance: loginGovService.id,
         },

diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -14,6 +14,7 @@
   "dependencies": {
     "@atj/common": "workspace:^",
     "@atj/database": "workspace:*",
+    "@lucia-auth/adapter-postgresql": "^3.1.2",
     "@lucia-auth/adapter-sqlite": "^3.0.2",
     "arctic": "^1.9.2",
     "better-sqlite3": "^11.1.2",

diff --git a/packages/auth/src/context/dev.ts → packages/auth/src/context/base.ts b/packages/auth/src/context/dev.ts → packages/auth/src/context/base.ts
@@ -3,24 +3,30 @@ import { Cookie, Lucia } from 'lucia';
 import { type DatabaseGateway } from '@atj/database';
 
 import { type AuthContext, type UserSession } from '..';
-import { createTestLuciaAdapter } from '../lucia';
+import { createPostgresLuciaAdapter, createSqliteLuciaAdapter } from '../lucia';
 import { LoginGov } from '../provider';
 
-export class DevAuthContext implements AuthContext {
+export class BaseAuthContext implements AuthContext {
   private lucia?: Lucia;
 
   constructor(
     public db: DatabaseGateway,
     public provider: LoginGov,
     public getCookie: (name: string) => string | undefined,
     public setCookie: (cookie: Cookie) => void,
-    public setUserSession: (userSession: UserSession) => void
+    public setUserSession: (userSession: UserSession) => void,
+    public isUserAuthorized: (email: string) => Promise<boolean>
   ) {}
 
   async getLucia() {
-    const sqlite3Adapter = createTestLuciaAdapter(
-      await (this.db.getContext() as any).getSqlite3()
-    );
+    const sqlite3Adapter =
+      this.db.getContext().engine === 'sqlite'
+        ? createSqliteLuciaAdapter(
+            await (this.db.getContext() as any).getSqlite3()
+          )
+        : createPostgresLuciaAdapter(
+            await (this.db.getContext() as any).getPostgresPool()
+          );
     if (!this.lucia) {
       this.lucia = new Lucia(sqlite3Adapter, {
         sessionCookie: {