Fix amplify erroring when attempting to login (#139842)

Enterprise-CMCS · Nov 25, 2024 · fbc2985 · fbc2985
1 parent 21ebf38
commit fbc2985
Show file tree

Hide file tree

Showing 6 changed files with 309 additions and 323 deletions.
diff --git a/services/app-api/handlers/uploads/tests/delete.test.ts b/services/app-api/handlers/uploads/tests/delete.test.ts
@@ -41,7 +41,6 @@ describe("Test Delete Upload Handler", () => {
   test("Should Call S3 delete when entry exists", async () => {
     const event: APIGatewayProxyEvent = {
       ...testEvent,
-      body: `{"fileId": "uniqueIdString"}`,
       pathParameters: { year: "2022", state: "AL", fileId: "uniqueIdString" },
     };
 

diff --git a/services/app-api/serverless.yml b/services/app-api/serverless.yml
@@ -204,7 +204,7 @@ functions:
     handler: handlers/uploads/delete.deleteUpload
     events:
       - http:
-          path: uploads/{year}/{state}
+          path: uploads/{year}/{state}/{fileId}
           method: delete
           cors: true
           authorizer: aws_iam

diff --git a/services/ui-src/package.json b/services/ui-src/package.json
@@ -3,7 +3,6 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@aws-amplify/rtn-web-browser": "^1.0.28",
     "@cmsgov/design-system": "^3.8.0",
     "@fortawesome/fontawesome-svg-core": "^6.6.0",
     "@fortawesome/free-solid-svg-icons": "^6.6.0",
@@ -16,7 +15,7 @@
     "@testing-library/user-event": "^14.5.1",
     "@vitejs/plugin-react": "^4.2.1",
     "aws-amplify": "^6.6.4",
-    "date-fns": "^3.6.0",
+    "date-fns": "^4.1.0",
     "font-awesome": "^4.7.0",
     "jsonpath": "^1.1.1",
     "launchdarkly-react-client-sdk": "^3.6.0",

diff --git a/services/ui-src/src/index.jsx b/services/ui-src/src/index.jsx
@@ -7,6 +7,7 @@ import store from "./store/storeIndex";
 import BrowserIssue from "./components/layout/BrowserIssue";
 import App from "./App";
 import { Amplify } from "aws-amplify";
+import "aws-amplify/auth/enable-oauth-listener";
 import config from "./config";
 import { asyncWithLDProvider } from "launchdarkly-react-client-sdk";
 
@@ -18,9 +19,10 @@ const isEdge = !isIE && !!window.StyleMedia;
 
 Amplify.configure({
   Storage: {
-    region: config.s3.REGION,
-    bucket: config.s3.BUCKET,
-    identityPoolId: config.cognito.IDENTITY_POOL_ID,
+    S3: {
+      region: config.s3.REGION,
+      bucket: config.s3.BUCKET,
+    },
   },
   API: {
     REST: {
@@ -32,8 +34,6 @@ Amplify.configure({
   },
   Auth: {
     Cognito: {
-      mandatorySignIn: true,
-      region: config.cognito.REGION,
       userPoolId: config.cognito.USER_POOL_ID,
       identityPoolId: config.cognito.IDENTITY_POOL_ID,
       userPoolClientId: config.cognito.APP_CLIENT_ID,
@@ -42,12 +42,7 @@ Amplify.configure({
           domain: config.cognito.APP_CLIENT_DOMAIN,
           redirectSignIn: [config.cognito.REDIRECT_SIGNIN],
           redirectSignOut: [config.cognito.REDIRECT_SIGNOUT],
-          scopes: [
-            "email",
-            "openid",
-            "profile",
-            "aws.cognito.signin.user.admin",
-          ],
+          scopes: ["email", "openid", "profile"],
           responseType: "code",
         },
       },

diff --git a/services/ui-src/src/store/saveMiddleware.js b/services/ui-src/src/store/saveMiddleware.js
@@ -52,9 +52,7 @@ const saveMiddleware = (store) => {
         opts.body = store.getState().formData;
         // get the state and year from basic state info section
         const { stateId, year } = opts.body[0];
-
         await apiLib.put(`/save_report/${year}/${stateId}`, opts);
-
         /*
          * If the save is successful, we can clear out the list of pending
          * saves, because they have been persisted on the server.