chore: internal entity removal (#1467)

juspay · Sep 26, 2024 · 4c94b8d · 4c94b8d
1 parent 59b390a
commit 4c94b8d
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 41 deletions.
diff --git a/src/entryPoints/AuthModule/UserInfo/UserInfoTypes.res b/src/entryPoints/AuthModule/UserInfo/UserInfoTypes.res
@@ -1,4 +1,4 @@
-type entity = [#Internal | #Organization | #Merchant | #Profile]
+type entity = [#Organization | #Merchant | #Profile]
 type userInfo = {
   email: string,
   isTwoFactorAuthSetup: bool,

diff --git a/src/entryPoints/AuthModule/UserInfo/UserInfoUtils.res b/src/entryPoints/AuthModule/UserInfo/UserInfoUtils.res
@@ -17,7 +17,6 @@ let defaultValueOfUserInfo = {
 
 let entityMapper = entity => {
   switch entity->String.toLowerCase {
-  | "internal" => #Internal
   | "organization" => #Organization
   | "merchant" => #Merchant
   | "profile" => #Profile
@@ -27,9 +26,7 @@ let entityMapper = entity => {
 
 let transactionEntityMapper = entity => {
   switch entity->String.toLowerCase {
-  | "internal"
-  | "merchant" =>
-    #Merchant
+  | "merchant" => #Merchant
   | "profile" => #Profile
   | _ => #Merchant
   }
@@ -38,7 +35,7 @@ let transactionEntityMapper = entity => {
 let analyticsEntityMapper = entity => {
   switch entity->String.toLowerCase {
   | "organization" => #Organization
-  | "merchant" | "internal" => #Merchant
+  | "merchant" => #Merchant
   | "profile" => #Profile
   | _ => #Merchant
   }
@@ -61,7 +58,7 @@ let itemMapper = dict => {
   name: dict->getString("name", defaultValueOfUserInfo.name),
   orgId: dict->getString("org_id", defaultValueOfUserInfo.orgId),
   recoveryCodesLeft: dict->getOptionInt("recovery_codes_left"),
-  roleId: dict->getString("role_id", defaultValueOfUserInfo.email),
+  roleId: dict->getString("role_id", defaultValueOfUserInfo.roleId),
   verificationDaysLeft: dict->getOptionInt("verification_days_left"),
   profileId: dict->getString("profile_id", ""),
   userEntity: dict->getString("entity_type", "")->entityMapper,

diff --git a/src/entryPoints/HyperSwitchApp.res b/src/entryPoints/HyperSwitchApp.res
@@ -25,9 +25,10 @@ let make = () => {
   let featureFlagDetails = featureFlagAtom->Recoil.useRecoilValueFromAtom
   let (userPermissionJson, setuserPermissionJson) = Recoil.useRecoilState(userPermissionAtom)
   let getEnumDetails = EnumVariantHook.useFetchEnumDetails()
-  let {userInfo: {orgId, merchantId, profileId}, checkUserEntity} = React.useContext(
+  let {userInfo: {orgId, merchantId, profileId, roleId}, checkUserEntity} = React.useContext(
     UserInfoProvider.defaultContext,
   )
+  let isInternalUser = roleId->HyperSwitchUtils.checkIsInternalUser
   let modeText = featureFlagDetails.isLiveMode ? "Live Mode" : "Test Mode"
   let modeStyles = featureFlagDetails.isLiveMode
     ? "bg-hyperswitch_green_trans border-hyperswitch_green_trans text-hyperswitch_green"
@@ -151,12 +152,10 @@ let make = () => {
                       <Navbar
                         headerActions={<div className="relative flex items-center gap-4 my-2 ">
                           <GlobalSearchBar />
-                          <RenderIf condition={checkUserEntity([#Internal])}>
+                          <RenderIf condition={isInternalUser}>
                             <SwitchMerchantForInternal />
                           </RenderIf>
-                          <RenderIf condition={!checkUserEntity([#Internal])}>
-                            <ProfileSwitch />
-                          </RenderIf>
+                          <ProfileSwitch />
                           <div
                             className={`px-4 py-2 rounded whitespace-nowrap text-fs-13 ${modeStyles} font-semibold`}>
                             {modeText->React.string}
@@ -264,8 +263,7 @@ let make = () => {
                           </AccessControl>
                         | list{"developer-system-metrics"} =>
                           <AccessControl
-                            isEnabled={checkUserEntity([#Internal]) &&
-                            featureFlagDetails.systemMetrics}
+                            isEnabled={isInternalUser && featureFlagDetails.systemMetrics}
                             permission=userPermissionJson.analyticsView>
                             <FilterContext key="SystemMetrics" index="SystemMetrics">
                               <SystemMetricsAnalytics />

diff --git a/src/entryPoints/SidebarValues.res b/src/entryPoints/SidebarValues.res
@@ -516,8 +516,14 @@ let paymentSettings = () => {
   })
 }
 
-let developers = (isDevelopersEnabled, systemMetrics, ~permissionJson, ~checkUserEntity) => {
-  let isInternalUser = checkUserEntity([#Internal])
+let developers = (
+  isDevelopersEnabled,
+  systemMetrics,
+  ~permissionJson,
+  ~checkUserEntity,
+  ~roleId,
+) => {
+  let isInternalUser = roleId->HyperSwitchUtils.checkIsInternalUser
   let isProfileUser = checkUserEntity([#Profile])
   let apiKeys = apiKeys(permissionJson)
   let paymentSettings = paymentSettings()
@@ -625,7 +631,9 @@ let reconAndSettlement = (recon, isReconEnabled, checkUserEntity) => {
 let useGetSidebarValues = (~isReconEnabled: bool) => {
   let featureFlagDetails = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
   let permissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
-  let {userInfo: {userEntity}, checkUserEntity} = React.useContext(UserInfoProvider.defaultContext)
+  let {userInfo: {userEntity, roleId}, checkUserEntity} = React.useContext(
+    UserInfoProvider.defaultContext,
+  )
   let {
     frm,
     payOut,
@@ -670,7 +678,7 @@ let useGetSidebarValues = (~isReconEnabled: bool) => {
     ),
     default->workflow(isSurchargeEnabled, ~permissionJson, ~isPayoutEnabled=payOut, ~userEntity),
     recon->reconAndSettlement(isReconEnabled, checkUserEntity),
-    default->developers(systemMetrics, ~permissionJson, ~checkUserEntity),
+    default->developers(systemMetrics, ~permissionJson, ~checkUserEntity, ~roleId),
     settings(~isConfigurePmtsEnabled=configurePmts, ~permissionJson, ~complianceCertificate),
   ]
 

diff --git a/src/screens/APIUtils/APIUtils.res b/src/screens/APIUtils/APIUtils.res
@@ -55,8 +55,7 @@ let useGetURL = () => {
           switch userEntity {
           | #Organization
           | #Merchant
-          | #Profile
-          | #Internal =>
+          | #Profile =>
             `account/${merchantId}/profile/connectors`
           }
         }
@@ -226,8 +225,7 @@ let useGetURL = () => {
           switch userEntity {
           | #Organization
           | #Merchant
-          | #Profile
-          | #Internal => `routing/list/profile`
+          | #Profile => `routing/list/profile`
           }
         }
       | Post =>
@@ -249,7 +247,6 @@ let useGetURL = () => {
           | #Organization => `analytics/v2/org/metrics/${domain}`
           | #Merchant => `analytics/v2/merchant/metrics/${domain}`
           | #Profile => `analytics/v2/profile/metrics/${domain}`
-          | _ => `analytics/v2/merchant/metrics/${domain}`
           }
 
         | _ => ""
@@ -274,7 +271,6 @@ let useGetURL = () => {
           | #Organization => `analytics/v1/org/${domain}/info`
           | #Merchant => `analytics/v1/merchant/${domain}/info`
           | #Profile => `analytics/v1/profile/${domain}/info`
-          | _ => `analytics/v1/merchant/${domain}/info`
           }
 
         | _ => ""
@@ -286,7 +282,6 @@ let useGetURL = () => {
           | #Organization => `analytics/v1/org/metrics/${domain}`
           | #Merchant => `analytics/v1/merchant/metrics/${domain}`
           | #Profile => `analytics/v1/profile/metrics/${domain}`
-          | _ => `analytics/v1/merchant/metrics/${domain}`
           }
 
         | _ => ""
@@ -302,7 +297,6 @@ let useGetURL = () => {
           | #Organization => `analytics/v1/org/filters/${domain}`
           | #Merchant => `analytics/v1/merchant/filters/${domain}`
           | #Profile => `analytics/v1/profile/filters/${domain}`
-          | _ => `analytics/v1/merchant/filters/${domain}`
           }
 
         | _ => ""
@@ -331,8 +325,7 @@ let useGetURL = () => {
           switch userEntity {
           | #Organization
           | #Merchant
-          | #Profile
-          | #Internal => `routing/payouts/list/profile`
+          | #Profile => `routing/payouts/list/profile`
           }
         }
 
@@ -365,23 +358,20 @@ let useGetURL = () => {
       | #Organization => `analytics/v1/org/report/payments`
       | #Merchant => `analytics/v1/merchant/report/payments`
       | #Profile => `analytics/v1/profile/report/payments`
-      | _ => `analytics/v1/merchant/report/payments`
       }
 
     | REFUND_REPORT =>
       switch transactionEntity {
       | #Organization => `analytics/v1/org/report/refunds`
       | #Merchant => `analytics/v1/merchant/report/refunds`
       | #Profile => `analytics/v1/profile/report/refunds`
-      | _ => `analytics/v1/merchant/report/refunds`
       }
 
     | DISPUTE_REPORT =>
       switch transactionEntity {
       | #Organization => `analytics/v1/org/report/dispute`
       | #Merchant => `analytics/v1/merchant/report/dispute`
       | #Profile => `analytics/v1/profile/report/dispute`
-      | _ => `analytics/v1/merchant/report/dispute`
       }
 
     /* EVENT LOGS */
@@ -429,8 +419,7 @@ let useGetURL = () => {
         switch userEntity {
         | #Organization
         | #Merchant
-        | #Profile
-        | #Internal =>
+        | #Profile =>
           `account/${merchantId}/profile`
         }
       | Post =>

diff --git a/src/screens/Sidebar/Sidebar.res b/src/screens/Sidebar/Sidebar.res
@@ -457,7 +457,8 @@ let make = (
   let isMobileView = MatchMedia.useMobileChecker()
   let sideBarRef = React.useRef(Nullable.null)
   let {email} = useCommonAuthInfo()->Option.getOr(defaultAuthInfo)
-  let {checkUserEntity} = React.useContext(UserInfoProvider.defaultContext)
+  let {userInfo: {roleId}} = React.useContext(UserInfoProvider.defaultContext)
+  let isInternalUser = roleId->HyperSwitchUtils.checkIsInternalUser
   let (openItem, setOpenItem) = React.useState(_ => "")
   let {isSidebarExpanded, setIsSidebarExpanded} = React.useContext(SidebarProvider.defaultContext)
 
@@ -551,7 +552,7 @@ let make = (
             </div>
           </RenderIf>
         </div>
-        <RenderIf condition={!checkUserEntity([#Internal])}>
+        <RenderIf condition={!isInternalUser}>
           <SidebarSwitch isSidebarExpanded />
         </RenderIf>
         <div

diff --git a/src/screens/UserManagement/UserRevamp/NewUserInvitationForm.res b/src/screens/UserManagement/UserRevamp/NewUserInvitationForm.res
@@ -74,7 +74,6 @@ module NoteComponent = {
       `You can only invite people for ${merchantId} here. To invite users to another merchant, please switch the merchant.`
     | #Profile =>
       `You can only invite people for ${profileId} here. To invite users to another profile, please switch the profile.`
-    | _ => ""
     }
 
     <div className="flex gap-2 items-start justify-start">

diff --git a/src/screens/UserManagement/UserRevamp/UserManagementHelper.res b/src/screens/UserManagement/UserRevamp/UserManagementHelper.res
@@ -10,7 +10,6 @@ module OrganisationSelection = {
 
     let disableSelect = switch userEntity {
     | #Organization | #Merchant | #Profile => true
-    | _ => false
     }
 
     let handleOnChange = async (event, input: ReactFinalForm.fieldRenderPropsInput) => {
@@ -62,8 +61,7 @@ module MerchantSelection = {
 
     let disableSelect = switch userEntity {
     | #Merchant | #Profile => true
-    | #Organization
-    | _ => false
+    | #Organization => false
     }
 
     let handleOnChange = async (event, input: ReactFinalForm.fieldRenderPropsInput) => {
@@ -118,8 +116,7 @@ module ProfileSelection = {
     let disableSelect = switch userEntity {
     | #Profile => true
     | #Organization
-    | #Merchant
-    | _ => false
+    | #Merchant => false
     }
 
     let handleOnChange = async (event, input: ReactFinalForm.fieldRenderPropsInput) => {

diff --git a/src/screens/UserManagement/UserRevamp/UserManagementTypes.res b/src/screens/UserManagement/UserRevamp/UserManagementTypes.res
@@ -1,5 +1,7 @@
 type userManagementTypes = UsersTab | RolesTab
 
+type internalUserType = InternalViewOnly | InternalAdmin | NonInternal
+
 type permissionType =
   | OperationsView
   | OperationsManage

diff --git a/src/screens/UserManagement/UserRevamp/UserManagementUtils.res b/src/screens/UserManagement/UserRevamp/UserManagementUtils.res
@@ -174,3 +174,12 @@ let getUserManagementViewValues = (~checkUserEntity) => {
     [default]
   }
 }
+
+let stringToVariantMapper = roleId => {
+  open UserManagementTypes
+  switch roleId {
+  | "internal_view_only" => InternalViewOnly
+  | "internal_admin" => InternalAdmin
+  | _ => NonInternal
+  }
+}
diff --git a/src/utils/HyperSwitchUtils.res b/src/utils/HyperSwitchUtils.res
@@ -39,3 +39,9 @@ let delay = ms =>
   Promise.make((resolve, _) => {
     let _ = setTimeout(() => resolve(), ms)
   })
+
+let checkIsInternalUser = roleId => {
+  open UserManagementUtils
+  roleId->stringToVariantMapper == InternalViewOnly ||
+    roleId->stringToVariantMapper == InternalAdmin
+}