remove unneeded logging, pr cleanup

Enterprise-CMCS · Dec 13, 2024 · 8a3debe · 8a3debe
1 parent 4d16d78
commit 8a3debe
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 26 deletions.
diff --git a/services/admin/handlers/addPropertyToJWT.js → services/admin/handlers/addRolesToJWT.js b/services/admin/handlers/addPropertyToJWT.js → services/admin/handlers/addRolesToJWT.js
diff --git a/services/admin/handlers/batchUpdateCognitoUsers.js b/services/admin/handlers/batchUpdateCognitoUsers.js
@@ -19,7 +19,6 @@ async function updateUserAttribute(userPoolId, username, roles) {
 
 async function processCognitoUsers() {
   const userPoolId = process.env.USER_POOL_ID;
-//   const userPoolId = process.env.USER_POOL_ID | "us-east-1_B3uR9r4cC";
   console.log("user pool id: ", userPoolId)
   let paginationToken = null;
   let counter = 0;
@@ -33,15 +32,16 @@ async function processCognitoUsers() {
     };
 
     const listUsersResponse = await cognito.listUsers(params).promise();
-
+    console.log(listUsersResponse.Users.length + " users found")
+
     for (const user of listUsersResponse.Users) {
       const emailAttribute = user.Attributes.find(attr => attr.Name === 'email');
       if (emailAttribute) {
         const userEmail = emailAttribute.Value;
 
         try {
           const externalUser = await getUser(userEmail);
-          let roles = [];
+          let roles = [""];
           if (externalUser.roleList) {
            roles = externalUser.roleList.map(role => role.role);
            hasRolesCounter ++;

diff --git a/services/admin/serverless.yml b/services/admin/serverless.yml
@@ -62,8 +62,8 @@ functions:
     handler: ./handlers/batchUpdateCognitoUsers.main
     timeout: 360
 
-  addPropertyToJWT:
-    handler: ./handlers/addPropertyToJWT.handler
+  addRolesToJWT:
+    handler: ./handlers/addRolesToJWT.handler
     timeout: 360
 
   resetData:

diff --git a/services/ui-src/src/App.tsx b/services/ui-src/src/App.tsx
@@ -32,8 +32,7 @@ const DEFAULT_AUTH_STATE: Omit<
   userProfile: {},
   userRole: null,
   userStatus: null,
-  activeTerritories: null,
-  myUserList: []
+  activeTerritories: null
 };
 
 const  App = () => {

diff --git a/services/ui-src/src/Routes.tsx b/services/ui-src/src/Routes.tsx
@@ -148,21 +148,29 @@ const isAdminUser = ()=> {
     return false; 
   }
 
+  let userRoles;
   //authenticated users will have idToken in Local Storage
-  const idTokenKey: string[] = Object.keys(localStorage).filter((k) =>
-    k.includes(ID_TOKEN_KEY)
-  );
-  const idToken: string | null =
-  idTokenKey && localStorage.getItem(idTokenKey[0]);
-  if (!idToken) return false;
-  const decodedIdToken: any = jwt_decode(idToken);
-  let userRoles = decodedIdToken["custom:user_roles"];
+  try{
+    const idTokenKey: string[] = Object.keys(localStorage).filter((k) =>
+      k.includes(ID_TOKEN_KEY)
+    );
+    const idToken: string | null =
+    idTokenKey && localStorage.getItem(idTokenKey[0]);
+    if (!idToken) return false;
+    const decodedIdToken: any = jwt_decode(idToken);
+     userRoles = decodedIdToken["custom:user_roles"];
+  } catch (error) {
+    console.error("error decoding idToken", error);
+    return false; 
+  }
 
   const allowedRoles = [
     "cmsroleapprover",
     "systemadmin",
     "statesystemadmin",
-    "helpdesk"
+    "helpdesk",
+    "cmsreviewer",
+    // "defaultcmsuser" 
   ];
 
   // only passes admin check if roles from jwt one of the "allowed roles"

diff --git a/services/ui-src/src/containers/UserManagement.js b/services/ui-src/src/containers/UserManagement.js
@@ -70,8 +70,6 @@ const alertCodes = {
   revoked: RESPONSE_CODE.SUCCESS_USER_REVOKED,
 };
 
-
-
 /**
  * User Management "Dashboard"
  */
@@ -94,8 +92,6 @@ const UserManagement = () => {
       ].includes(userRole),
     [userRole]
   );
-
-
   const updateList = useCallback(() => {
     if (userStatus !== USER_STATUS.ACTIVE) return;
     UserDataApi.getMyUserList(userProfile.email)
@@ -104,7 +100,6 @@ const UserManagement = () => {
           if (userStatus !== USER_STATUS.PENDING) setAlertCode(ul);
           ul = [];
         }
-
         setUserList(ul);
       })
       .catch((error) => {
@@ -114,8 +109,6 @@ const UserManagement = () => {
   // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [userProfile.email, userStatus]);
 
-
-
   // Load the data from the backend.
   useEffect(() => {
     let mounted = true;

diff --git a/services/ui-src/src/containers/UserPage.js b/services/ui-src/src/containers/UserPage.js
@@ -2,7 +2,6 @@ import React, { useCallback, useEffect, useMemo, useState } from "react";
 import { useLocation, useParams, useHistory } from "react-router-dom";
 import { Button, Review } from "@cmsgov/design-system";
 
-
 import {
   APPROVING_USER_ROLE,
   RESPONSE_CODE,

diff --git a/services/ui-src/src/domain-types.ts b/services/ui-src/src/domain-types.ts
@@ -51,7 +51,6 @@ export type AppContextValue = {
   userRole: USER_ROLE | null;
   userStatus: USER_STATUS | null;
   activeTerritories: string[] | null;
-  myUserList: string[] | null;
   setUserInfo: (isDeveloper?: boolean) => Promise<void>;
   updatePhoneNumber: (phoneNumber: string) => Promise<void>;
   confirmAction: (

diff --git a/services/ui-src/src/libs/testDataAppContext.js b/services/ui-src/src/libs/testDataAppContext.js
@@ -10,7 +10,6 @@ export const stateSubmitterInitialAuthState = {
   setUserInfo: () => Promise.resolve(),
   updatePhoneNumber: () => Promise.resolve(),
   confirmAction: () => Promise.resolve(),
-  myUserList: [],
   userProfile: {
     cmsRoles: "onemac-state-user",
     email: "[email protected]",