Amplify sidevert

services/ui-src/package.json

@@ -14,10 +14,9 @@
     "@testing-library/react": "^9.5.0",
     "@testing-library/user-event": "^14.5.1",
     "@vitejs/plugin-react": "^4.2.1",
-    "aws-amplify": "^6.6.4",
+    "aws-amplify": "^5.3.4",
     "date-fns": "^4.1.0",
     "font-awesome": "^4.7.0",
-    "js-cookie": "^3.0.5",
     "jsonpath": "^1.1.1",
     "launchdarkly-react-client-sdk": "^3.6.0",
     "mathjs": "^13.2.1",

services/ui-src/src/actions/certify.js

@@ -1,4 +1,3 @@
-import requestOptions from "../hooks/authHooks/requestOptions";
 import { REPORT_STATUS } from "../types";
 import { apiLib } from "../util/apiLib";
 
@@ -19,10 +18,11 @@ export const certifyAndSubmit = () => async (dispatch, getState) => {
   dispatch({ type: CERTIFY_AND_SUBMIT });
 
   try {
-    const opts = await requestOptions();
-    opts.body = {
-      status: REPORT_STATUS.certified,
-      username: username,
+    const opts = {
+      body: {
+        status: REPORT_STATUS.certified,
+        username: username,
+      },
     };
 
     await apiLib.post(`/state_status/${year}/${state}`, opts);

services/ui-src/src/actions/download.js

@@ -1,4 +1,3 @@
-import requestOptions from "../hooks/authHooks/requestOptions";
 import { apiLib } from "../util/apiLib";
 
 export const GET_TEMPLATE = "GET_TEMPLATE";
@@ -8,8 +7,7 @@ export const GET_TEMPLATE_FAILURE = "GET_TEMPLATE_FAILURE";
 export const getFiscalYearTemplate = (year) => async (dispatch) => {
   dispatch({ type: GET_TEMPLATE, data: "" });
   try {
-    const opts = await requestOptions();
-    const data = await apiLib.get(`/fiscalYearTemplate/${year}`, opts);
+    const data = await apiLib.get(`/fiscalYearTemplate/${year}`);
 
     dispatch({
       type: GET_TEMPLATE_SUCCESS,

services/ui-src/src/actions/initial.js

@@ -1,5 +1,4 @@
 /* eslint-disable no-underscore-dangle, no-console */
-import requestOptions from "../hooks/authHooks/requestOptions";
 import { getProgramData, getStateData, getUserData } from "../store/stateUser";
 import { apiLib } from "../util/apiLib";
 
@@ -14,8 +13,7 @@ export const LOAD_LASTYEAR_SECTIONS = "LOAD_LASTYEAR_SECTIONS";
 export const getAllStatesData = () => {
   return async (dispatch) => {
     try {
-      const opts = await requestOptions();
-      const data = await apiLib.get(`/state`, opts);
+      const data = await apiLib.get(`/state`);
 
       dispatch({ type: GET_ALL_STATES_DATA, data });
     } catch (err) {
@@ -26,8 +24,7 @@ export const getAllStatesData = () => {
 };
 
 export const getAllStateStatuses = () => async (dispatch) => {
-  const opts = await requestOptions();
-  const results = await apiLib.get(`/state_status`, opts);
+  const results = await apiLib.get(`/state_status`);
   const data = results.Items;
 
   const payload = data
@@ -71,8 +68,7 @@ export const getAllStateStatuses = () => async (dispatch) => {
 export const getStateAllStatuses =
   (selectedYears = [], selectedStates = [], selectedStatus = []) =>
   async (dispatch) => {
-    const opts = await requestOptions();
-    const results = await apiLib.get(`/state_status`, opts);
+    const results = await apiLib.get(`/state_status`);
     const data = results.Items;
     let yearFilter = () => {};
     let stateFilter = () => {};
@@ -122,16 +118,12 @@ export const getStateAllStatuses =
 
 export const loadSections = ({ stateCode, selectedYear }) => {
   return async (dispatch) => {
-    const opts = await requestOptions();
-    const data = await apiLib.get(
-      `/section/${selectedYear}/${stateCode}`,
-      opts
-    );
+    const data = await apiLib.get(`/section/${selectedYear}/${stateCode}`);
 
     const lastYear = parseInt(selectedYear) - 1;
     let lastYearData = undefined;
     const priorData = await apiLib
-      .get(`/section/${lastYear}/${stateCode}`, opts)
+      .get(`/section/${lastYear}/${stateCode}`)
       .catch((err) => {
         console.log("--- ERROR PRIOR YEAR SECTIONS ---");
         console.log(err);
@@ -152,10 +144,8 @@ export const loadSections = ({ stateCode, selectedYear }) => {
 
 export const loadEnrollmentCounts = ({ stateCode, selectedYear }) => {
   return async (dispatch) => {
-    const opts = await requestOptions();
     const data = await apiLib.get(
-      `/enrollment_counts/${selectedYear}/${stateCode}`,
-      opts
+      `/enrollment_counts/${selectedYear}/${stateCode}`
     );
 
     dispatch({ type: SET_ENROLLMENT_COUNTS, data });

services/ui-src/src/actions/uncertify.js

@@ -1,4 +1,3 @@
-import requestOptions from "../hooks/authHooks/requestOptions";
 import { REPORT_STATUS } from "../types";
 import { apiLib } from "../util/apiLib";
 
@@ -16,12 +15,13 @@ export const uncertifyReport =
 
     dispatch({ type: UNCERTIFY });
     try {
-      const opts = await requestOptions();
-      opts.body = {
-        status: REPORT_STATUS.in_progress,
-        username: username,
-        year: reportYear,
-        state: state,
+      const opts = {
+        body: {
+          status: REPORT_STATUS.in_progress,
+          username: username,
+          year: reportYear,
+          state: state,
+        },
       };
 
       await apiLib.post(`/state_status/${year}/${state}`, opts);

services/ui-src/src/components/layout/FormTemplates.jsx

@@ -1,4 +1,3 @@
-import requestOptions from "../../hooks/authHooks/requestOptions";
 import React, { useState } from "react";
 import "react-data-table-component-extensions/dist/index.css";
 import { Button } from "@cmsgov/design-system";
@@ -15,7 +14,9 @@ const FormTemplates = () => {
     setInprogress(true);
 
     try {
-      const opts = await requestOptions({ year: selectedYear });
+      const opts = {
+        body: { year: selectedYear },
+      };
       await apiLib.post("/formTemplates", opts);
       window.alert("Request Completed");
       history.push("/");

services/ui-src/src/components/layout/FormTemplates.test.jsx

@@ -2,12 +2,18 @@ import React from "react";
 import { shallow } from "enzyme";
 import FormTemplates from "./FormTemplates";
 import { act, render, fireEvent } from "@testing-library/react";
-
-const mockAmplifyApi = require("aws-amplify/api");
+import { apiLib } from "../../util/apiLib";
 
 jest.mock("../../hooks/authHooks");
 window.alert = jest.fn();
 
+const mockPost = jest.fn();
+jest.mock("aws-amplify", () => ({
+  API: {
+    post: () => mockPost(),
+  },
+}));
+
 const mockHistoryPush = jest.fn();
 jest.mock("react-router-dom", () => ({
   ...jest.requireActual("react-router-dom"),
@@ -27,7 +33,7 @@ describe("FormTemplates Component", () => {
   });
 
   it("fires the generate forms event on button click, then navigates", async () => {
-    const apiSpy = jest.spyOn(mockAmplifyApi, "post");
+    const apiSpy = jest.spyOn(apiLib, "post");
     const { getByTestId } = render(formTemplate);
     const generateButton = getByTestId("generate-forms-button");
     await act(async () => {

services/ui-src/src/components/sections/Print.jsx

@@ -11,7 +11,6 @@ import Section from "../layout/Section";
 // utils
 import statesArray from "../utils/statesArray";
 import { loadEnrollmentCounts, loadSections } from "../../actions/initial";
-import requestOptions from "../../hooks/authHooks/requestOptions";
 import { apiLib } from "../../util/apiLib";
 
 /**
@@ -83,9 +82,10 @@ const Print = () => {
       .replaceAll("\u2014", "-");
 
     const base64String = btoa(unescape(encodeURIComponent(htmlString)));
-    const opts = await requestOptions();
-    opts.body = {
-      encodedHtml: base64String,
+    const opts = {
+      body: {
+        encodedHtml: base64String,
+      },
     };
 
     const res = await apiLib.post("/print_pdf", opts);

services/ui-src/src/components/sections/login/LocalLogins.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { useHistory } from "react-router-dom";
-import { signIn } from "aws-amplify/auth";
 import { useFormFields } from "../../../hooks/useFormFields";
+import { loginUser } from "../../../util/apiLib";
 
 const LocalLogin = () => {
   const history = useHistory();
@@ -12,8 +12,8 @@ const LocalLogin = () => {
   async function handleLogin(event) {
     event.preventDefault();
     try {
-      await signIn({ username: fields.email, password: fields.password });
-      history.push(`/`);
+      await loginUser(fields.email, fields.password);
+      history.push("/");
     } catch (error) {
       console.log("Error while logging in.", error); // eslint-disable-line no-console
     }

services/ui-src/src/components/sections/login/LocalLogins.test.jsx

@@ -3,10 +3,10 @@ import { shallow } from "enzyme";
 import { act, render, fireEvent } from "@testing-library/react";
 import { LocalLogins } from "./LocalLogins";
 
-const mockPost = jest.fn();
 const localLogins = <LocalLogins />;
-jest.mock("aws-amplify/auth", () => ({
-  signIn: (credentials) => mockPost(credentials),
+const mockLoginUser = jest.fn();
+jest.mock("../../../util/apiLib", () => ({
+  loginUser: (username, password) => mockLoginUser(username, password),
 }));
 const mockHistoryPush = jest.fn();
 jest.mock("react-router-dom", () => ({
@@ -36,10 +36,10 @@ describe("LocalLogin component", () => {
     await act(async () => {
       fireEvent.click(generateButton);
     });
-    expect(mockPost).toHaveBeenCalledWith({
-      username: "[email protected]",
-      password: "superS3cure", // pragma: allowlist secret
-    });
+    expect(mockLoginUser).toHaveBeenCalledWith(
+      "[email protected]",
+      "superS3cure" // pragma: allowlist secret
+    );
     expect(mockHistoryPush).toHaveBeenCalledWith("/");
   });
 });

services/ui-src/src/hooks/authHooks/authLifecycle.js

@@ -1,7 +1,7 @@
-import { fetchAuthSession, signOut } from "aws-amplify/auth";
-import { Hub } from "aws-amplify/utils";
+import { Hub } from "aws-amplify";
 import { add } from "date-fns";
 import { setAuthTimeout } from "../../store/stateUser";
+import { logoutUser, refreshSession } from "../../util/apiLib";
 
 /*
  * After the token expires, refresh tokens will be used in the allotted idle window.
@@ -28,7 +28,7 @@ class AuthManager {
     const isExpired = expiration && new Date(expiration).valueOf() < Date.now();
     if (isExpired) {
       localStorage.removeItem("mdctcarts_session_exp");
-      signOut().then(() => {
+      logoutUser().then(() => {
         window.location.href = "/";
       });
     }
@@ -57,7 +57,7 @@ class AuthManager {
    * Manual refresh of credentials paired with an instant timer clear
    */
   async refreshCredentials() {
-    await fetchAuthSession({ forceRefresh: true }); // Force a token refresh
+    await refreshSession();
     this.setTimer();
   }
 
@@ -76,7 +76,7 @@ class AuthManager {
         this.promptTimeout(exp);
         this.timeoutForceId = setTimeout(() => {
           localStorage.removeItem("mdctcarts_session_exp");
-          signOut();
+          logoutUser();
         }, IDLE_WINDOW - PROMPT_AT);
       },
       PROMPT_AT,

services/ui-src/src/hooks/authHooks/index.js

@@ -1,4 +1,3 @@
 export * from "./useUser";
 export * from "./userProvider";
-export * from "./requestOptions";
 export * from "./authLifecycle";