Merge branch 'main' of github.com:adobe/spacecat-shared into SITES-37727

Author: tkotthakota-adobe

package-lock.json

@@ -1,3 +1,10 @@
+# [@adobe/spacecat-shared-data-access-v2.93.0](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v2.92.1...@adobe/spacecat-shared-data-access-v2.93.0) (2026-01-08)
+
+
+### Features
+
+* propagate traceId across workers for cross-worker tracing ([#1247](https://github.com/adobe/spacecat-shared/issues/1247)) ([f7d194d](https://github.com/adobe/spacecat-shared/commit/f7d194d2a8d23426c9dd66aae33f1118d226e827))
+
 # [@adobe/spacecat-shared-data-access-v2.92.1](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v2.92.0...@adobe/spacecat-shared-data-access-v2.92.1) (2026-01-07)
 
 

packages/spacecat-shared-data-access/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/spacecat-shared-data-access",
-  "version": "2.92.1",
+  "version": "2.93.0",
   "description": "Shared modules of the Spacecat Services - Data Access",
   "type": "module",
   "engines": {

packages/spacecat-shared-data-access/package.json

@@ -194,17 +194,27 @@ class Audit extends BaseModel {
        * @param context - The context object.
        * @returns {object} - The formatted payload for the scrape client.
        */
-      formatPayload: (stepResult, auditContext, context) => ({
-        urls: stepResult.urls.map((urlObj) => urlObj.url),
-        processingType: stepResult.processingType || 'default',
-        options: stepResult.options || {},
-        maxScrapeAge: isNumber(stepResult.maxScrapeAge) ? stepResult.maxScrapeAge : 24,
-        auditData: {
-          siteId: stepResult.siteId,
-          completionQueueUrl: stepResult.completionQueueUrl || context.env?.AUDIT_JOBS_QUEUE_URL,
-          auditContext,
-        },
-      }),
+      formatPayload: (stepResult, auditContext, context) => {
+        const payload = {
+          urls: stepResult.urls.map((urlObj) => urlObj.url),
+          processingType: stepResult.processingType || 'default',
+          options: stepResult.options || {},
+          maxScrapeAge: isNumber(stepResult.maxScrapeAge) ? stepResult.maxScrapeAge : 24,
+          auditData: {
+            siteId: stepResult.siteId,
+            completionQueueUrl: stepResult.completionQueueUrl || context.env?.AUDIT_JOBS_QUEUE_URL,
+            auditContext,
+          },
+        };
+
+        // Propagate traceId for cross-worker tracing continuity
+        // This allows the scrape client to maintain the same trace across multiple workers
+        if (context.traceId) {
+          payload.traceId = context.traceId;
+        }
+
+        return payload;
+      },
     },
   };
 

packages/spacecat-shared-data-access/src/models/audit/audit.model.js

@@ -348,5 +348,36 @@ describe('AuditModel', () => {
         },
       });
     });
+
+    it('formats scrape client payload with traceId when present in context', () => {
+      const stepResult = {
+        urls: [{ url: 'someUrl' }],
+        siteId: 'someSiteId',
+        options: { someOption: 'someValue' },
+        processingType: 'someProcessingType',
+      };
+      const context = {
+        env: {
+          AUDIT_JOBS_QUEUE_URL: 'audit-jobs-queue-url',
+        },
+        traceId: '1-5e8e8e8e-5e8e8e8e5e8e8e8e5e8e8e8e',
+      };
+      const auditContext = { some: 'context' };
+      const formattedPayload = auditStepDestinationConfigs[auditStepDestinations.SCRAPE_CLIENT]
+        .formatPayload(stepResult, auditContext, context);
+
+      expect(formattedPayload).to.deep.equal({
+        urls: ['someUrl'],
+        options: { someOption: 'someValue' },
+        processingType: 'someProcessingType',
+        maxScrapeAge: 24,
+        traceId: '1-5e8e8e8e-5e8e8e8e5e8e8e8e5e8e8e8e',
+        auditData: {
+          siteId: 'someSiteId',
+          completionQueueUrl: 'audit-jobs-queue-url',
+          auditContext: { some: 'context' },
+        },
+      });
+    });
   });
 });

packages/spacecat-shared-data-access/test/unit/models/audit/audit.model.test.js

@@ -1,3 +1,10 @@
+# [@adobe/spacecat-shared-ims-client-v1.11.8](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-ims-client-v1.11.7...@adobe/spacecat-shared-ims-client-v1.11.8) (2026-01-08)
+
+
+### Bug Fixes
+
+* API to get all orgs for a user profile ([#1254](https://github.com/adobe/spacecat-shared/issues/1254)) ([4a0401c](https://github.com/adobe/spacecat-shared/commit/4a0401c73e372272b7055463a412be6ad691b615))
+
 # [@adobe/spacecat-shared-ims-client-v1.11.7](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-ims-client-v1.11.6...@adobe/spacecat-shared-ims-client-v1.11.7) (2025-11-30)
 
 

packages/spacecat-shared-ims-client/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/spacecat-shared-ims-client",
-  "version": "1.11.7",
+  "version": "1.11.8",
   "description": "Shared modules of the Spacecat Services - IMS Client",
   "type": "module",
   "engines": {

packages/spacecat-shared-ims-client/package.json

@@ -27,6 +27,7 @@ import {
   IMS_VALIDATE_TOKEN_ENDPOINT,
   IMS_ADMIN_PROFILE_ENDPOINT,
   IMS_ACCOUNT_CLUSTER_ENDPOINT,
+  IMS_ADMIN_ORGANIZATIONS_ENDPOINT,
 } from '../utils.js';
 
 export default class ImsClient extends ImsBaseClient {
@@ -410,4 +411,39 @@ export default class ImsClient extends ImsBaseClient {
 
     return accountClusterResponse.json();
   }
+
+  /**
+   * Fetches list of organizations for a given IMS ID
+   * @param {string} imsId - The IMS ID of the user
+   * @returns {Promise<Object>} The user's profile data
+   * @throws {Error} If the request fails
+   */
+  async getImsAdminOrganizations(imsId) {
+    if (!hasText(imsId)) {
+      throw new Error('imsId param is required.');
+    }
+
+    const { guid, authSource } = extractGuidAndAuthSource(imsId);
+    const serviceToken = await this.getServiceAccessToken();
+
+    const formBody = `guid=${guid}&auth_src=${authSource}`;
+
+    const response = await fetch(
+      `https://${this.config.imsHost}${IMS_ADMIN_ORGANIZATIONS_ENDPOINT}`,
+      {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/x-www-form-urlencoded',
+          Authorization: `Bearer ${serviceToken.access_token}`,
+        },
+        body: formBody,
+      },
+    );
+
+    if (!response.ok) {
+      throw new Error(`IMS getImsAdminOrganizations request failed with status: ${response.status}`);
+    }
+
+    return response.json();
+  }
 }

packages/spacecat-shared-ims-client/src/clients/ims-client.js

@@ -24,6 +24,7 @@ export const IMS_PROFILE_ENDPOINT = '/ims/profile/v1';
 export const IMS_INVALIDATE_TOKEN_ENDPOINT = '/ims/invalidate_token/v2';
 export const IMS_ADMIN_PROFILE_ENDPOINT = '/ims/admin_profile/v3';
 export const IMS_ACCOUNT_CLUSTER_ENDPOINT = '/ims/account_cluster/v2';
+export const IMS_ADMIN_ORGANIZATIONS_ENDPOINT = '/ims/admin_organizations/v4';
 /**
  * Creates and populates a FormData object from key-value pairs.
  * @param {Object} fields - Object containing key-value pairs to append to FormData.

packages/spacecat-shared-ims-client/src/utils.js

@@ -525,6 +525,80 @@ describe('ImsClient', () => {
     });
   });
 
+  describe('getImsAdminOrganizations', () => {
+    let client;
+    const testImsId = '6E14161F62BEB2990A49401A@0b2414d95e6abf580a49403d';
+
+    beforeEach(() => {
+      client = ImsClient.createFrom(mockContext);
+    });
+
+    it('throws error when imsId is not provided', async () => {
+      await expect(client.getImsAdminOrganizations())
+        .to.be.rejectedWith('imsId param is required.');
+    });
+
+    it('successfully fetches admin organizations', async () => {
+      const mockAdminOrgs = [
+        {
+          orgRef: { ident: '1234567890ABCDEF12345678', authSrc: 'AdobeOrg' },
+          orgName: 'Example Org',
+          orgType: 'Enterprise',
+          countryCode: 'US',
+        },
+      ];
+
+      // Mock service token endpoint
+      mockImsTokenResponse();
+
+      // Mock admin organizations endpoint
+      nock(`https://${DUMMY_HOST}`)
+        .post('/ims/admin_organizations/v4')
+        .reply(200, mockAdminOrgs);
+
+      const result = await client.getImsAdminOrganizations(testImsId);
+      expect(result).to.deep.equal(mockAdminOrgs);
+    });
+
+    it('throws error when admin organizations request fails', async () => {
+      // Mock service token endpoint
+      mockImsTokenResponse();
+
+      // Mock failed admin organizations response
+      nock(`https://${DUMMY_HOST}`)
+        .post('/ims/admin_organizations/v4')
+        .reply(404);
+
+      await expect(client.getImsAdminOrganizations(testImsId))
+        .to.be.rejectedWith('IMS getImsAdminOrganizations request failed with status: 404');
+    });
+
+    it('reuses existing service token if available', async () => {
+      const mockAdminOrgs = [
+        {
+          orgRef: { ident: '1234567890ABCDEF12345678', authSrc: 'AdobeOrg' },
+          orgName: 'Example Org',
+        },
+      ];
+
+      // Set existing service token
+      client.serviceAccessToken = {
+        access_token: 'ZHVtbXktYWNjZXNzLXRva2Vu',
+        expires_in: 86400,
+        token_type: 'bearer',
+      };
+
+      // Mock only admin organizations endpoint (token endpoint should not be called)
+      nock(`https://${DUMMY_HOST}`)
+        .post('/ims/admin_organizations/v4')
+        .reply(200, mockAdminOrgs);
+
+      const result = await client.getImsAdminOrganizations(testImsId);
+      expect(result).to.deep.equal(mockAdminOrgs);
+      expect(nock.isDone()).to.be.true;
+    });
+  });
+
   describe('getAccountCluster', () => {
     let client;
     const testAccessToken = 'eyJhbGciOiJIUzI1NiJ9.eyJpZCI6IjEyMzQ1IiwidHlwZSI6ImFjY2Vzc190b2tlbiIsImNsaWVudF9pZCI6ImV4YW1wbGVfYXBwIiwidXNlcl9pZCI6Ijk4NzY1NDc4OTBBQkNERUYxMjM0NTY3OEBhYmNkZWYxMjM0NTY3ODkuZSIsImFzIjoiaW1zLW5hMSIsImFhX2lkIjoiMTIzNDU2Nzg5MEFCQ0RFRjEyMzQ1Njc4QGFkb2JlLmNvbSIsImNyZWF0ZWRfYXQiOiIxNzEwMjQ3MDAwMDAwIn0.MRDpxgxSHDj4DmA182hPnjMAnKkly-VUJ_bXpQ-J8EQ';