fix up role logic.. user helper could probably go for some refactoring

src/packages/shared-types/user.ts

@@ -23,14 +23,11 @@ export const CMS_ROLES = [
   UserRoles.HELPDESK,
 ];
 
-export const CMS_WRITE_ROLES = [
-  UserRoles.CMS_READ_ONLY,
-  UserRoles.CMS_REVIEWER,
-];
+export const CMS_WRITE_ROLES = [UserRoles.CMS_REVIEWER];
 
 export const CMS_READ_ONLY_ROLES = [
   UserRoles.CMS_READ_ONLY,
-  UserRoles.CMS_REVIEWER,
+  UserRoles.HELPDESK,
 ];
 
 export const STATE_ROLES = [UserRoles.STATE_SUBMITTER];

src/packages/shared-utils/index.ts

@@ -1,4 +1,3 @@
-export * from "./is-cms-user";
-export * from "./is-cms-write-user";
+export * from "./user-helper";
 export * from "./s3-url-parser";
 export * from "./rai-helper"

src/packages/shared-utils/user-helper.ts

@@ -0,0 +1,46 @@
+import { CMS_ROLES, CMS_WRITE_ROLES, CMS_READ_ONLY_ROLES, CognitoUserAttributes, STATE_ROLES } from "../shared-types";
+
+export const isCmsUser = (user: CognitoUserAttributes) => {
+  const userRoles = user["custom:cms-roles"];
+
+  for (const cmsRole of CMS_ROLES) {
+    if (userRoles.includes(cmsRole)) {
+      return true;
+    }
+  }
+  return false;
+};
+
+export const isCmsWriteUser = (user: CognitoUserAttributes) => {
+  const userRoles = user["custom:cms-roles"];
+
+  for (const role of CMS_WRITE_ROLES) {
+    if (userRoles.includes(role)) {
+      return true;
+    }
+  }
+  return false;
+};
+
+export const isCmsReadonlyUser = (user: CognitoUserAttributes) => {
+  const userRoles = user["custom:cms-roles"];
+
+  for (const role of CMS_READ_ONLY_ROLES) {
+    if (userRoles.includes(role)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+export const isStateUser = (user: CognitoUserAttributes) => {
+  const userRoles = user["custom:cms-roles"];
+
+  for (const role of STATE_ROLES) {
+    if (userRoles.includes(role)) {
+      return true;
+    }
+  }
+  return false;
+
+}

src/services/api/handlers/getPackageActions.ts

@@ -1,6 +1,11 @@
 import { APIGatewayEvent } from "aws-lambda";
 import { Action, CognitoUserAttributes, ItemResult } from "shared-types";
-import { isCmsUser, getActiveRai, isCmsWriteUser } from "shared-utils";
+import {
+  isCmsUser,
+  getActiveRai,
+  isCmsWriteUser,
+  isStateUser,
+} from "shared-utils";
 import { getPackage } from "../libs/package/getPackage";
 import {
   getAuthDetails,
@@ -47,7 +52,7 @@ export const packageActionsForResult = (
         actions.push(Action.DISABLE_RAI_WITHDRAW);
       }
     }
-  } else {
+  } else if (isStateUser(user)) {
     switch (result._source.seatoolStatus) {
       case SEATOOL_STATUS.PENDING_RAI:
         if (activeRai) {