Merge branch '10007-DOD' of https://github.com/flexion/ef-cms into 10…

…007-DOD-move-to-user-gateway
flexion · Mar 13, 2024 · 8704afd · 8704afd
2 parents 210eb7c + 62392e0
commit 8704afd
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 16 deletions.
diff --git a/cypress/helpers/dynamo/getDynamoCypress.ts b/cypress/helpers/dynamo/getDynamoCypress.ts
@@ -5,7 +5,7 @@ import { getCypressEnv } from '../env/cypressEnvironment';
 import type {
   DeleteRequest,
   PutRequest,
-} from '../../../web-api/src/persistence/dynamo/dynamoTypes';
+} from '@web-api/persistence/dynamo/dynamoTypes';
 
 let dynamoCache: DynamoDBClient;
 let documentCache: DynamoDBDocument;

diff --git a/cypress/tsconfig.json b/cypress/tsconfig.json
@@ -6,7 +6,12 @@
     "noEmit": true,
     "target": "es5",
     "lib": ["es5", "dom"],
-    "types": ["cypress", "node"]
+    "types": ["cypress", "node"],
+    "paths": {
+      "@web-api/*": [
+        "../web-api/src/*"
+      ],
+    }
   },
   "include": ["**/*.ts"]
 }
diff --git a/scripts/dynamo/set-maintenance-mode.ts b/scripts/dynamo/set-maintenance-mode.ts
@@ -7,16 +7,16 @@ import { InvokeCommand, LambdaClient } from '@aws-sdk/client-lambda';
 
 // # Arguments
 // #   - $1 - true to engage maintenance mode, false to disengage maintenance mode
-// #   - $2 - the environment to set the flag
 
 const args = process.argv.slice(2);
 const enableMaintenanceMode: boolean = args[0] === 'true';
-const env: string = args[1];
+
+const { ENV } = process.env;
 
 if (typeof enableMaintenanceMode !== 'boolean') {
   throw new Error('A value for enable maintenance mode is required.');
 }
-if (typeof env !== 'string') {
+if (typeof ENV !== 'string') {
   throw new Error('A value for env is required.');
 }
 
@@ -29,7 +29,7 @@ async function setMaintenanceMode() {
   });
   const currentColorRecord = await documentClient.get({
     Key: { pk: 'current-color', sk: 'current-color' },
-    TableName: `efcms-deploy-${env}`,
+    TableName: `efcms-deploy-${ENV}`,
   });
   const activeColor: 'blue' | 'green' | undefined =
     currentColorRecord?.Item?.current;
@@ -48,11 +48,11 @@ async function setMaintenanceMode() {
   });
 
   console.log(
-    `Setting Maintenance mode to ${enableMaintenanceMode} for ${env}`,
+    `Setting Maintenance mode to ${enableMaintenanceMode} for ${ENV}`,
   );
 
   const command = new InvokeCommand({
-    FunctionName: `send_maintenance_notifications_${env}_${activeColor}`,
+    FunctionName: `send_maintenance_notifications_${ENV}_${activeColor}`,
     InvocationType: 'RequestResponse',
     Payload: Buffer.from(
       JSON.stringify({

diff --git a/scripts/jest-scripts.config.ts b/scripts/jest-scripts.config.ts
@@ -6,17 +6,17 @@ const config: Config = {
   clearMocks: true,
   collectCoverage: true,
   collectCoverageFrom: [
-    '**/*.{js,ts}',
+    '!checkUntouchedFiles.ts',
     '!circleci/*.ts',
     '!circleci/judge/bulkImportJudgeUsers.ts',
-    '!checkUntouchedFiles.ts',
     '!compareTypescriptErrors.ts',
     '!coverage/**',
     '!download-all-case-documents.ts',
     '!dynamo/archive-outboxes.ts',
     '!dynamo/fix-race-condition-served-in-drafts.ts',
     '!dynamo/read-segment.ts',
     '!dynamo/set-local-migration-complete-marker.ts',
+    '!dynamo/set-maintenance-mode.ts',
     '!elasticsearch/create-temporary-indices.ts',
     '!elasticsearch/docket-entry-search.ts',
     '!elasticsearch/docket-inbox.ts',
@@ -29,14 +29,14 @@ const config: Config = {
     '!import-case-status-changes-from-csv.ts',
     '!irs-super-user.ts',
     '!jest-scripts.config.ts',
-    '!set-maintenance-mode-locally.ts',
-    '!judge/update-judge-titles.ts',
     '!judge/update-judge-isSeniorJudge.ts',
+    '!judge/update-judge-titles.ts',
     '!reports/**',
     '!run-once-scripts/**',
-    '!dynamo/set-maintenance-mode.ts',
+    '!set-maintenance-mode-locally.ts',
     '!upload-practitioner-application-packages.ts',
     '!user/**',
+    '**/*.{js,ts}',
   ],
   coverageDirectory: './coverage',
   coverageProvider: 'babel',

diff --git a/web-api/jest-unit.config.ts b/web-api/jest-unit.config.ts
@@ -11,11 +11,11 @@ const config: Config = {
     'src/**/*.{js,ts}',
     'workflow-terraform/migration/main/lambdas/migrations/*.{js,ts}',
     '!src/applicationContext.{js,ts}',
+    '!src/gateways/worker/workerLocal.ts',
+    '!src/getPersistenceGateway.{js,ts}',
     '!src/getUseCases.{js,ts}',
     '!src/getUseCaseHelpers.{js,ts}',
-    '!src/getPersistenceGateway.{js,ts}',
     '!src/getUserGateway.ts',
-    '!src/gateways/worker/workerLocal.ts',
     '!src/**/*Handlers.{js,ts}',
     '!src/**/*Lambda.{js,ts}',
     '!src/app.{js,ts}',

diff --git a/web-api/src/persistence/cognito/getCognito.ts b/web-api/src/persistence/cognito/getCognito.ts
@@ -21,7 +21,7 @@ export function getCognito() {
 
 export function getLocalCognito() {
   // KNOWN BUGS:
-  // - users is a FORCE_CHANGE_PASSWORD state will get a new password challenge when authenticating even if the wrong password is entered
+  // - users in a FORCE_CHANGE_PASSWORD state will get a new password challenge when authenticating even if the wrong password is entered
   // - respondToAuthChallenge does not associate tokens returned in authenticationResult on the user; cannot refresh app _immediately_ after changing password
 
   if (!cognitoClientCache) {