Users that have AAD login but are not CDP users

Should not see the proxy or buckets tabs. Loggin users that are onboarded to CDP should see these tabs, as should admin
DEFRA · Jan 16, 2025 · 6c098b2 · 6c098b2
1 parent e12777f
commit 6c098b2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/server/services/helpers/provide-tabs.js b/src/server/services/helpers/provide-tabs.js
@@ -7,6 +7,7 @@
 async function provideTabs(request, h) {
   const authedUser = await request.getUserSession()
   const isAdmin = authedUser?.isAdmin
+  const isTenant = authedUser?.isTenant
   const response = request.response
 
   if (response.variety === 'view') {
@@ -34,7 +35,7 @@ async function provideTabs(request, h) {
       }
     ]
 
-    if (authedUser) {
+    if (isAdmin || isTenant) {
       response.source.context.tabDetails.tabs.push({
         isActive: request.path.startsWith(`/services/${imageName}/buckets`),
         url: request.routeLookup('services/{serviceId}/buckets', {

diff --git a/src/server/services/helpers/provide-tabs.test.js b/src/server/services/helpers/provide-tabs.test.js
@@ -42,7 +42,8 @@ describe('#provideTabs', () => {
         .mockReturnValueOnce(`/services/${mockServiceName}/secrets`)
         .mockReturnValueOnce(`/services/${mockServiceName}/terminal`)
       mockUserSession.mockResolvedValue({
-        isAdmin: true
+        isAdmin: true,
+        isTenant: true
       })
     })
 
@@ -129,7 +130,8 @@ describe('#provideTabs', () => {
       mockUserIsServiceOwner.mockResolvedValue(true)
 
       mockUserSession.mockResolvedValue({
-        isAdmin: false
+        isAdmin: false,
+        isTenant: true
       })
       mockRouteLookup
         .mockReturnValueOnce(`/services/${mockServiceName}`)
@@ -222,7 +224,8 @@ describe('#provideTabs', () => {
       mockUserIsServiceOwner.mockResolvedValue(false)
 
       mockUserSession.mockResolvedValue({
-        isAdmin: false
+        isAdmin: false,
+        isTenant: true
       })
       mockRouteLookup
         .mockReturnValueOnce(`/services/${mockServiceName}`)