Updated Strapi using offering instead of capability directly

Author: StaberindeZA

libs/free-access-program/src/lib/free-access-program.projector.spec.ts

@@ -203,8 +203,12 @@ describe('normalizeWebhookEntry', () => {
       id: 1,
       documentId: 'ent-1',
       internalName: 'VPN beta',
-      capabilities: [
-        { id: 1, slug: 'vpn-beta', services: [{ oauthClientId: 'cli' }] },
+      offerings: [
+        {
+          capabilities: [
+            { id: 1, slug: 'vpn-beta', services: [{ oauthClientId: 'cli' }] },
+          ],
+        },
       ],
       matchers: [
         {
@@ -232,19 +236,63 @@ describe('normalizeWebhookEntry', () => {
       ],
     });
   });
+
+  it('flattens capabilities across multiple offerings', () => {
+    const normalized = normalizeWebhookEntry({
+      id: 1,
+      documentId: 'ent-1',
+      internalName: 'VPN beta',
+      offerings: [
+        {
+          capabilities: [
+            { slug: 'vpn-beta', services: [{ oauthClientId: 'cli-a' }] },
+          ],
+        },
+        {
+          capabilities: [
+            { slug: 'relay-beta', services: [{ oauthClientId: 'cli-b' }] },
+          ],
+        },
+      ],
+      matchers: [],
+    });
+
+    expect(normalized.capabilities).toEqual([
+      { slug: 'vpn-beta', services: [{ oauthClientId: 'cli-a' }] },
+      { slug: 'relay-beta', services: [{ oauthClientId: 'cli-b' }] },
+    ]);
+  });
+
+  it('returns null capabilities when offerings is missing', () => {
+    const normalized = normalizeWebhookEntry({
+      id: 1,
+      documentId: 'ent-1',
+      internalName: 'VPN beta',
+      matchers: [
+        {
+          __component: 'matchers.email-list',
+          emails: { 'a@example.com': ['2026-12-31', 'd'] },
+        },
+      ],
+    });
+
+    expect(normalized.capabilities).toBeNull();
+  });
 });
 
 describe('normalizeGraphQLAccess', () => {
   it('keeps only `ComponentMatchersEmailList` matchers', () => {
     const normalized = normalizeGraphQLAccess({
-      __typename: 'Access',
       documentId: 'ent-1',
       internalName: 'VPN beta',
-      capabilities: [
+      offerings: [
         {
-          __typename: 'Capability',
-          slug: 'vpn-beta',
-          services: [{ __typename: 'Service', oauthClientId: 'cli' }],
+          capabilities: [
+            {
+              slug: 'vpn-beta',
+              services: [{ oauthClientId: 'cli' }],
+            },
+          ],
         },
       ],
       matchers: [
@@ -260,4 +308,40 @@ describe('normalizeGraphQLAccess', () => {
       { 'a@example.com': ['2026-12-31', 'd'] },
     ]);
   });
+
+  it('flattens capabilities across multiple offerings', () => {
+    const normalized = normalizeGraphQLAccess({
+      documentId: 'ent-1',
+      internalName: 'VPN beta',
+      offerings: [
+        {
+          capabilities: [
+            { slug: 'vpn-beta', services: [{ oauthClientId: 'cli-a' }] },
+          ],
+        },
+        {
+          capabilities: [
+            { slug: 'relay-beta', services: [{ oauthClientId: 'cli-b' }] },
+          ],
+        },
+      ],
+      matchers: [],
+    });
+
+    expect(normalized.capabilities).toEqual([
+      { slug: 'vpn-beta', services: [{ oauthClientId: 'cli-a' }] },
+      { slug: 'relay-beta', services: [{ oauthClientId: 'cli-b' }] },
+    ]);
+  });
+
+  it('returns null capabilities when the offerings link is empty', () => {
+    const normalized = normalizeGraphQLAccess({
+      documentId: 'ent-1',
+      internalName: 'VPN beta',
+      offerings: null,
+      matchers: [],
+    });
+
+    expect(normalized.capabilities).toBeNull();
+  });
 });

libs/free-access-program/src/lib/free-access-program.projector.ts

@@ -13,14 +13,25 @@ import type { StrapiAccessWebhookPayload } from './free-access-program.webhook.t
  * Structural subset of a Strapi `accesses` GraphQL row. Defined locally to
  * avoid a private import of the generated graphql.ts type from
  * `@fxa/shared/cms`; the live GraphQL response is structurally assignable.
+ *
+ * Capabilities are nested under `offerings` since the Strapi rename: the
+ * `access` content type no longer carries capabilities directly, and an
+ * access may link to multiple offerings.
  */
 export interface GraphQLAccessRow {
   documentId?: string | null;
   internalName?: string | null;
-  capabilities?: ReadonlyArray<{
-    slug?: string | null;
-    services?: ReadonlyArray<{ oauthClientId?: string | null } | null> | null;
-  } | null> | null;
+  offerings?: ReadonlyArray<
+    | {
+        capabilities?: ReadonlyArray<{
+          slug?: string | null;
+          services?: ReadonlyArray<
+            { oauthClientId?: string | null } | null
+          > | null;
+        } | null> | null;
+      }
+    | null
+  > | null;
   matchers?: ReadonlyArray<
     | {
         __typename?: string;
@@ -170,7 +181,7 @@ export function normalizeGraphQLAccess(
   return {
     documentId: access.documentId,
     internalName: access.internalName,
-    capabilities: access.capabilities,
+    capabilities: flattenOfferingCapabilities(access.offerings),
     emailLists,
   };
 }
@@ -191,11 +202,39 @@ export function normalizeWebhookEntry(
   return {
     documentId: entry.documentId,
     internalName: entry.internalName,
-    capabilities: entry.capabilities,
+    capabilities: flattenOfferingCapabilities(entry.offerings),
     emailLists,
   };
 }
 
+/**
+ * Strapi links each `access` to zero or more offerings, each of which has
+ * its own capabilities. The downstream projector treats capabilities as a
+ * flat list keyed by client id, so we concatenate them up-front and let
+ * `collectCapabilityMap` dedupe by slug.
+ */
+function flattenOfferingCapabilities(
+  offerings:
+    | ReadonlyArray<
+        | {
+            capabilities?: NormalizedAccess['capabilities'];
+          }
+        | null
+        | undefined
+      >
+    | null
+    | undefined
+): NormalizedAccess['capabilities'] {
+  if (!offerings) return null;
+  const flat: NonNullable<NormalizedAccess['capabilities']>[number][] = [];
+  for (const offering of offerings) {
+    for (const capability of offering?.capabilities ?? []) {
+      flat.push(capability);
+    }
+  }
+  return flat;
+}
+
 function collectCapabilityMap(
   capabilities: NonNullable<NormalizedAccess['capabilities']>
 ): ClientIdCapabilityMap {

libs/free-access-program/src/lib/free-access-program.reconciler.service.spec.ts

@@ -44,11 +44,16 @@ describe('FreeAccessProgramReconcilerService', () => {
     __typename: 'Access',
     documentId: 'ent-1',
     internalName: 'VPN beta',
-    capabilities: [
+    offerings: [
       {
-        __typename: 'Capability',
-        slug: 'vpn-beta',
-        services: [{ __typename: 'Service', oauthClientId: 'client-a' }],
+        __typename: 'Offering',
+        capabilities: [
+          {
+            __typename: 'Capability',
+            slug: 'vpn-beta',
+            services: [{ __typename: 'Service', oauthClientId: 'client-a' }],
+          },
+        ],
       },
     ],
     matchers: [
@@ -167,12 +172,17 @@ describe('FreeAccessProgramReconcilerService', () => {
       strapi.queryUncached.mockResolvedValue({
         accesses: [
           entitlement({
-            capabilities: [
+            offerings: [
               {
-                __typename: 'Capability',
-                slug: 'vpn-new',
-                services: [
-                  { __typename: 'Service', oauthClientId: 'client-a' },
+                __typename: 'Offering',
+                capabilities: [
+                  {
+                    __typename: 'Capability',
+                    slug: 'vpn-new',
+                    services: [
+                      { __typename: 'Service', oauthClientId: 'client-a' },
+                    ],
+                  },
                 ],
               },
             ],

libs/free-access-program/src/lib/free-access-program.webhook.types.ts

@@ -4,8 +4,10 @@
 
 /**
  * Webhook payload Strapi sends when an `access` entry is created /
- * updated / published / unpublished / deleted. The matchers and
- * capabilities are nested under `entry`.
+ * updated / published / unpublished / deleted. Capabilities live under the
+ * linked `offerings` (the `access` content type no longer carries them
+ * directly, and an access may link to multiple offerings); the matchers
+ * stay on `entry`.
  *
  * Component shapes inside the dynamic-zone `matchers` field use
  * `__component: '<category>.<name>'` (REST serialization), different from
@@ -23,12 +25,17 @@ export interface StrapiAccessWebhookPayload {
     internalName?: string;
     description?: string | null;
     publishedAt?: string | null;
-    capabilities?: Array<{
+    offerings?: Array<{
       id?: number;
-      slug?: string;
-      services?: Array<{ oauthClientId?: string } | null> | null;
+      documentId?: string;
+      capabilities?: Array<{
+        id?: number;
+        slug?: string;
+        services?: Array<{ oauthClientId?: string } | null> | null;
+        [k: string]: unknown;
+      }>;
       [k: string]: unknown;
-    }>;
+    } | null> | null;
     matchers?: Array<{
       __component?: string;
       id?: number;