Merge branch 'main' into feat/llmo-5180-url-inspector-semrush-bp

Author: claudiaboldis

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.568.1](https://github.com/adobe/spacecat-api-service/compare/v1.568.0...v1.568.1) (2026-06-11)
+
+
+### Bug Fixes
+
+* update plg onboarding existing delivery type ([#2526](https://github.com/adobe/spacecat-api-service/issues/2526)) ([b1b90ac](https://github.com/adobe/spacecat-api-service/commit/b1b90ac6143403cafe480f1a4096b4992bd6cfc9))
+
 # [1.568.0](https://github.com/adobe/spacecat-api-service/compare/v1.567.0...v1.568.0) (2026-06-11)
 
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/spacecat-api-service",
-  "version": "1.568.0",
+  "version": "1.568.1",
   "description": "SpaceCat API Service",
   "main": "src/index.js",
   "type": "module",

package.json

@@ -200,6 +200,7 @@ async function resolveImsEmailsForPlgRecords(records, context) {
 const PLG_REJECTION_MESSAGES = {
   'internal-org': { emoji: ':no_entry:', label: 'Rejected — Internal Org' },
   'paid-customer': { emoji: ':no_entry:', label: 'Rejected — Paid Customer' },
+  'frescopa-domain': { emoji: ':no_entry:', label: 'Rejected — Frescopa Domain' },
 };
 
 async function postPlgRejectionNotification(domain, imsOrgId, reason, context, org) {
@@ -291,6 +292,11 @@ function PlgOnboardingController(ctx) {
       return badRequest('Invalid domain: must be a valid hostname or hostname/path (e.g. nba.com or nba.com/kings)');
     }
 
+    if (domain.toLowerCase().includes('frescopa')) {
+      await postPlgRejectionNotification(domain, imsOrgId, 'frescopa-domain', context);
+      return badRequest('PLG onboarding is not available for frescopa domains');
+    }
+
     try {
       const { Organization, Entitlement } = context.dataAccess;
       const existingOrg = await Organization.findByImsOrgId(imsOrgId);

src/controllers/plg/plg-onboarding.js

@@ -637,6 +637,43 @@ export async function performAsoPlgOnboarding({
     onboarding.setSiteId(site.getId());
     steps.siteResolved = true;
 
+    // Step 5a: Alert when detected delivery type differs from the stored one.
+    // Skip for newly created sites — delivery type was just set from findDeliveryType in Step 5.
+    // We alert instead of auto-correcting because findDeliveryType is not 100% reliable.
+    if (!presetDeliveryType && !steps.siteCreated) {
+      const existingDeliveryType = site.getDeliveryType();
+      let detectedDeliveryType;
+      try {
+        detectedDeliveryType = await findDeliveryType(baseURL);
+      } catch (e) {
+        log.warn(`Failed to detect delivery type for ${baseURL}: ${e.message}`);
+      }
+      if (
+        detectedDeliveryType
+        && detectedDeliveryType !== SiteModel.DELIVERY_TYPES.OTHER
+        && detectedDeliveryType !== existingDeliveryType
+      ) {
+        log.warn(`Delivery type mismatch for site ${site.getId()} (${baseURL}): stored=${existingDeliveryType} detected=${detectedDeliveryType}`);
+        const channelId = env.SLACK_PLG_ONBOARDING_CHANNEL_ID;
+        const token = env.SLACK_BOT_TOKEN;
+        /* c8 ignore next */
+        if (channelId && token) {
+          const message = ':warning: *PLG Onboarding — Delivery Type Mismatch*\n\n'
+            + `• *Site ID:* \`${site.getId()}\`\n`
+            + `• *Domain:* \`${baseURL}\`\n`
+            + `• *Org ID:* \`${organizationId}\`\n`
+            + `• *Org:* ${organization.getName()} (\`${imsOrgId}\`)\n`
+            + `• *Stored delivery type:* \`${existingDeliveryType}\`\n`
+            + `• *Detected delivery type:* \`${detectedDeliveryType}\``;
+          try {
+            await context.postSlackMessage(channelId, message, token);
+          } catch (err) {
+            log.error(`Failed to post delivery type mismatch alert: ${err.message}`);
+          }
+        }
+      }
+    }
+
     // Step 5b: Resolve canonical URL early so the RUM lookup uses the correct hostname
     const siteConfig = site.getConfig();
     const currentFetchConfig = siteConfig.getFetchConfig() || {};