Revert "MWPW-187769: bulk publisher guardrails" (#5479)

Revert "MWPW-187769: bulk publisher guardrails (#5421)"

This reverts commit fbdd057.

Author: sanrai

libs/blocks/caas/utils.js

@@ -192,29 +192,6 @@ export function getPageLocale(currentPath, locales = pageLocales) {
   return '';
 }
 
-let configJson = null;
-
-const cacheByBase = new Map();
-
-export async function getLingoSiteMappingConfig(fqdn = 'www.adobe.com', baseUrl = 'https://www.adobe.com') {
-  const normalized = baseUrl.replace(/\/$/, '');
-  const cacheKey = `${normalized}::${fqdn}`;
-  if (!cacheByBase.has(normalized)) {
-    const url = `${normalized}/federal/assets/data/lingo-site-mapping.json?${encodeURIComponent(cacheKey)}`;
-    const promise = fetch(url)
-      .then((response) => {
-        if (!response.ok) throw new Error(`HTTP ${response.status}`);
-        return response.json();
-      })
-      .catch((e) => {
-        cacheByBase.delete(normalized);
-        throw e;
-      });
-    cacheByBase.set(normalized, promise);
-  }
-  return cacheByBase.get(normalized);
-}
-
 export const isValidUuid = (id) => /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/.test(id);
 
 export const loadStrings = async (
@@ -569,9 +546,11 @@ const isLocaleInRegionalSites = (regionalSites, locStr) => {
     .includes(locStr);
 };
 
-export async function getIsLingoLocale(origin, country, language, fqdn = 'www.adobe.com') {
+async function getIsLingoLocale(origin, country, language, fqdn = 'www.adobe.com') {
   if (origin === 'news') return true;
-  if (!configJson) configJson = await getLingoSiteMappingConfig(fqdn);
+  const response = await fetch(`https://www.adobe.com/federal/assets/data/lingo-site-mapping.json?${fqdn}`);
+  if (!response.ok) throw new Error(`HTTP ${response.status}`);
+  const configJson = await response.json();
 
   let siteId;
   let isKnownLingoSiteLocale = false;
@@ -624,16 +603,13 @@ async function getLangFirstParam(origin, country, language) {
   return true;
 }
 
-async function getLingoSiteLocale(origin, path, fqdn = 'www.adobe.com', fromBulkPublisher = false) {
+async function getLingoSiteLocale(origin, path, fqdn = 'www.adobe.com') {
   const host = origin.toLowerCase();
-  let lingoSiteMapping;
-  // only provide fallback values if not from the bulk publisher
-  if (!fromBulkPublisher) {
-    lingoSiteMapping = {
-      country: 'xx',
-      language: 'en',
-    };
-  }
+  let lingoSiteMapping = {
+    country: 'xx',
+    language: 'en',
+  };
+
   // Extract pathname from URL if path includes domain
   let pathname = path;
   if (path.includes('://') || !path.startsWith('/')) {
@@ -653,7 +629,9 @@ async function getLingoSiteLocale(origin, path, fqdn = 'www.adobe.com', fromBulk
 
   try {
     let siteId;
-    if (!configJson) configJson = await getLingoSiteMappingConfig(fqdn);
+    const response = await fetch(`https://www.adobe.com/federal/assets/data/lingo-site-mapping.json?${fqdn}`);
+    if (!response.ok) throw new Error(`HTTP ${response.status}`);
+    const configJson = await response.json();
 
     const siteQueryIndexMap = configJson['site-query-index-map']?.data ?? [];
     const siteLocalesData = configJson['site-locales']?.data ?? [];
@@ -708,31 +686,18 @@ async function getLingoSiteLocale(origin, path, fqdn = 'www.adobe.com', fromBulk
   return lingoSiteMapping;
 }
 
-export const getLanguageFirstCountryAndLang = async (
-  path,
-  origin,
-  fqdn,
-  fromBulkPublisher = false,
-) => {
+export const getLanguageFirstCountryAndLang = async (path, origin, fqdn) => {
   const localeArr = path.split('/');
-  let langStr;
-  let countryStr;
-  // only provide fallback values if not from the bulk publisher
-  if (!fromBulkPublisher) {
-    langStr = 'en';
-    countryStr = 'xx';
-  }
+  let langStr = 'en';
+  let countryStr = 'xx';
   if (origin.toLowerCase() === 'news') {
     langStr = LANGS[localeArr[1]] ?? LANGS[''] ?? 'en';
     countryStr = LOCALES[localeArr[2]] ?? 'xx';
     if (typeof countryStr === 'object') {
       countryStr = countryStr.ietf?.split('-')[1] ?? 'xx';
     }
   } else {
-    const mapping = await getLingoSiteLocale(origin, path, fqdn, fromBulkPublisher);
-    if (!mapping) {
-      throw new Error('Failed to get lingo site locale for bulk publisher');
-    }
+    const mapping = await getLingoSiteLocale(origin, path, fqdn);
     countryStr = LOCALES[mapping.country.toLowerCase()] ?? 'xx';
     if (typeof countryStr === 'object') {
       countryStr = countryStr.ietf?.split('-')[1] ?? 'xx';

test/blocks/caas/utils.test.js

@@ -13,25 +13,6 @@ import {
   getGrayboxExperienceId,
 } from '../../../libs/blocks/caas/utils.js';
 
-// Mock lingo-site-mapping.json for test runner
-(function patchFetchForLingoMapping() {
-  const orig = window.fetch;
-  const defaultLingoMock = () => Promise.resolve({
-    ok: true,
-    json: () => Promise.resolve({
-      'site-query-index-map': { data: [] },
-      'site-locales': { data: [] },
-    }),
-  });
-  window.fetch = function patchedFetch(resource, options) {
-    const url = typeof resource === 'string' ? resource : (resource?.url ?? resource?.href ?? '');
-    if (url.includes('lingo-site-mapping.json')) {
-      return defaultLingoMock();
-    }
-    return orig.call(window, resource, options);
-  };
-}());
-
 describe('utils.js export sanity', () => {
   it('getLingoActive() is callable and returns a boolean', async () => {
     const val = await getLingoActive();

tools/send-to-caas/send-utils.js

@@ -5,7 +5,6 @@ import {
   getPageLocale,
   getGrayboxExperienceId,
   getLanguageFirstCountryAndLang,
-  getIsLingoLocale,
 } from '../../libs/blocks/caas/utils.js';
 
 const CAAS_TAG_URL = 'https://www.adobe.com/chimera-api/tags';
@@ -306,15 +305,7 @@ const getBulkPublishLangAttr = async (options) => {
       options.prodUrl,
       options.repo,
       options.host,
-      true,
     );
-    if (!country || !lang) {
-      throw new Error('Failed to get lang-first locales for bulk publisher');
-    }
-    const isLingoLocale = await getIsLingoLocale(options.repo, country, lang);
-    if (!isLingoLocale) {
-      throw new Error(`This page is not a valid language-first case for repo: ${options.repo}, country: ${country}, language: ${lang}`);
-    }
     return `${lang}-${country}`;
   }
   if (!getLocale) {
@@ -328,22 +319,6 @@ const getBulkPublishLangAttr = async (options) => {
 };
 
 const getCountryAndLang = async (options, origin) => {
-  let langAttr;
-  /* c8 ignore next */
-  if (window.location.pathname.includes('/tools/send-to-caas/bulkpublisher')) {
-    const langStr = window.location.pathname.includes('/tools/send-to-caas/bulkpublisher')
-      ? await getBulkPublishLangAttr(options)
-      : (LOCALES[window.location.pathname.split('/')[1]] || LOCALES['']).ietf;
-    langAttr = langStr?.toLowerCase().split('-') || [];
-    // do not use the fallback values if the language first is enabled
-    if (options.languageFirst) {
-      const [lang, country] = langAttr;
-      return {
-        country,
-        lang,
-      };
-    }
-  }
   const langFirst = lingoActive();
   if (langFirst) {
     return getLanguageFirstCountryAndLang(
@@ -352,6 +327,12 @@ const getCountryAndLang = async (options, origin) => {
       window.location.hostname,
     );
   }
+  /* c8 ignore next */
+  const langStr = window.location.pathname.includes('/tools/send-to-caas/bulkpublisher')
+    ? await getBulkPublishLangAttr(options)
+    : (LOCALES[window.location.pathname.split('/')[1]] || LOCALES['']).ietf;
+  const langAttr = langStr?.toLowerCase().split('-') || [];
+
   const [lang = 'en', country = 'us'] = langAttr;
   return {
     country,
@@ -409,14 +390,6 @@ function localizeCtaUrl(val) {
   return val;
 }
 
-const makeCountryLangResolver = (key) => async (s, options) => {
-  if (s) return s;
-  const fgColor = options.floodgatecolor || getMetadata('floodgatecolor');
-  const origin = getOrigin(fgColor);
-  const result = await getCountryAndLang(options, origin);
-  return result[key];
-};
-
 /** card metadata props - either a func that computes the value or
  * 0 to use the string as is
  * funcs that return an object with { error: string } will report the error
@@ -442,7 +415,13 @@ const props = {
   cardimagealttext: (s) => s || getCardImageAltText(),
   contentid: (_, options) => getUuid(options.prodUrl),
   contenttype: (s) => s || getMetaContent('property', 'og:type') || getConfig().contentType,
-  country: makeCountryLangResolver('country'),
+  country: async (s, options) => {
+    if (s) return s;
+    const fgColor = options.floodgatecolor || getMetadata('floodgatecolor');
+    const origin = getOrigin(fgColor);
+    const { country } = await getCountryAndLang(options, origin);
+    return country;
+  },
   created: (s) => {
     if (s) {
       return getDateProp(s, `Invalid Created Date: ${s}`);
@@ -480,7 +459,13 @@ const props = {
   eventend: (s) => getDateProp(s, `Invalid Event End Date: ${s}`),
   eventstart: (s) => getDateProp(s, `Invalid Event Start Date: ${s}`),
   floodgatecolor: (s, options) => s || options.floodgatecolor || getMetadata('floodgatecolor') || 'default',
-  lang: makeCountryLangResolver('lang'),
+  lang: async (s, options) => {
+    if (s) return s;
+    const fgColor = options.floodgatecolor || getMetadata('floodgatecolor');
+    const origin = getOrigin(fgColor);
+    const { lang } = await getCountryAndLang(options, origin);
+    return lang;
+  },
   modified: (s) => {
     const { doc, lastModified } = getConfig();
     return s