@defra/lis-infra-ui-services 0.17.0 → 0.18.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra/lis-infra-ui-services",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "UI-Services shared definitions for the livestock taxonomy topology.",
   "main": "src/index.js",
   "repository": {

package/src/nunjucks/build-navigation.js

@@ -14,7 +14,7 @@ export function buildPrimaryNavigation({ request, basePath = '' }) {
     href: '/profile',
     current: request?.path === '/profile' && !currentSpecies?.id
   }
-  const permittedSpecies = request?.app?.authorizedSpecies
+  const permittedSpecies = request?.auth?.credentials?.authorizedSpecies
 
   if (!Array.isArray(permittedSpecies) || permittedSpecies.length === 0) {
     return []

package/src/nunjucks/build-navigation.test.js

@@ -7,11 +7,13 @@ test('buildPrimaryNavigation renders species already authorized by the host', ()
   const navigation = buildPrimaryNavigation({
     request: {
       path: '/',
-      app: {
-        authorizedSpecies: [
-          { id: 'cattle', label: 'Cattle' },
-          { id: 'sheep', label: 'Sheep' }
-        ]
+      auth: {
+        credentials: {
+          authorizedSpecies: [
+            { id: 'cattle', label: 'Cattle' },
+            { id: 'sheep', label: 'Sheep' }
+          ]
+        }
       }
     }
   })
@@ -34,8 +36,10 @@ test('buildPrimaryNavigation marks the profile item as current on the profile ro
   const navigation = buildPrimaryNavigation({
     request: {
       path: '/profile',
-      app: {
-        authorizedSpecies: [{ id: 'cattle', label: 'Cattle' }]
+      auth: {
+        credentials: {
+          authorizedSpecies: [{ id: 'cattle', label: 'Cattle' }]
+        }
       }
     }
   })
@@ -43,3 +47,16 @@ test('buildPrimaryNavigation marks the profile item as current on the profile ro
   assert.equal(navigation.at(-1)?.text, 'Profile')
   assert.equal(navigation.at(-1)?.current, true)
 })
+
+test('buildPrimaryNavigation ignores the legacy request.app.authorizedSpecies', () => {
+  const navigation = buildPrimaryNavigation({
+    request: {
+      path: '/',
+      app: {
+        authorizedSpecies: [{ id: 'cattle', label: 'Cattle' }]
+      }
+    }
+  })
+
+  assert.deepEqual(navigation, [])
+})

package/src/nunjucks/context.js

@@ -46,7 +46,7 @@ export function createNunjucksContextBuilder({
       serviceUrl: '/',
       breadcrumbs: [],
       navigation: buildNavigation(request),
-      isSignedIn: Boolean(request?.app?.hubAuth),
+      isSignedIn: Boolean(request?.auth?.credentials?.user),
       logoutUrl: '/signout',
       getAssetPath(asset) {
         const viteAssetPath = viteManifest?.[asset]?.file

package/src/nunjucks/context.test.js

@@ -165,3 +165,45 @@ test('createNunjucksContextBuilder always sets serviceUrl to the hub root even w
   assert.equal(context.assetPath, '/cattle/register/public/assets')
   assert.deepEqual(loggerMessages, [])
 })
+
+function createSignedInContextBuilder() {
+  return createNunjucksContextBuilder({
+    config: createConfig(),
+    buildNavigation: () => [],
+    getRequestBasePath: () => '',
+    logger: { error: () => undefined },
+    readFileSync: () => '{}'
+  })
+}
+
+test('createNunjucksContextBuilder marks the user signed in from the auth credentials', () => {
+  const context = createSignedInContextBuilder()({
+    headers: {},
+    path: '/',
+    auth: { credentials: { user: { sub: 'user-1' } } },
+    app: {}
+  })
+
+  assert.equal(context.isSignedIn, true)
+})
+
+test('createNunjucksContextBuilder ignores the legacy request.app.hubAuth', () => {
+  const context = createSignedInContextBuilder()({
+    headers: {},
+    path: '/',
+    app: { hubAuth: { sub: 'user-1' } }
+  })
+
+  assert.equal(context.isSignedIn, false)
+})
+
+test('createNunjucksContextBuilder marks the user signed out without credentials', () => {
+  const context = createSignedInContextBuilder()({
+    headers: {},
+    path: '/',
+    auth: { credentials: null },
+    app: {}
+  })
+
+  assert.equal(context.isSignedIn, false)
+})