From 826cbdd64e194ff5cf2017b083a9d13367c11d65 Mon Sep 17 00:00:00 2001
From: martinst06 <mstoyanov@adobe.com>
Date: Thu, 8 Jan 2026 15:05:32 +0100
Subject: [PATCH] fix: replace url with baseurl validation for schema and other
 checks

---
 .../src/models/import-job/import-job.schema.js                | 4 ++--
 .../src/models/scrape-job/scrape-job.schema.js                | 4 ++--
 .../src/models/site-candidate/site-candidate.schema.js        | 4 ++--
 .../src/models/site/site.schema.js                            | 3 ++-
 packages/spacecat-shared-google-client/src/index.js           | 3 ++-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/spacecat-shared-data-access/src/models/import-job/import-job.schema.js b/packages/spacecat-shared-data-access/src/models/import-job/import-job.schema.js
index addc76852..e18156b3e 100755
--- a/packages/spacecat-shared-data-access/src/models/import-job/import-job.schema.js
+++ b/packages/spacecat-shared-data-access/src/models/import-job/import-job.schema.js
@@ -18,7 +18,7 @@ import {
   isNonEmptyObject,
   isNumber,
   isObject,
-  isValidUrl,
+  isValidBaseUrl,
 } from '@adobe/spacecat-shared-utils';
 
 import SchemaBuilder from '../base/schema.builder.js';
@@ -83,7 +83,7 @@ const schema = new SchemaBuilder(ImportJob, ImportJobCollection)
   .addAttribute('baseURL', {
     type: 'string',
     required: true,
-    validate: (value) => isValidUrl(value),
+    validate: (value) => isValidBaseUrl(value),
   })
   .addAttribute('duration', {
     type: 'number',
diff --git a/packages/spacecat-shared-data-access/src/models/scrape-job/scrape-job.schema.js b/packages/spacecat-shared-data-access/src/models/scrape-job/scrape-job.schema.js
index efcdbcf76..03c02a673 100755
--- a/packages/spacecat-shared-data-access/src/models/scrape-job/scrape-job.schema.js
+++ b/packages/spacecat-shared-data-access/src/models/scrape-job/scrape-job.schema.js
@@ -17,7 +17,7 @@ import {
   isIsoDate,
   isNumber,
   isObject,
-  isValidUrl,
+  isValidBaseUrl,
   isString,
 } from '@adobe/spacecat-shared-utils';
 
@@ -37,7 +37,7 @@ const schema = new SchemaBuilder(ScrapeJob, ScrapeJobCollection)
   .addAttribute('baseURL', {
     type: 'string',
     required: true,
-    validate: (value) => isValidUrl(value),
+    validate: (value) => isValidBaseUrl(value),
   })
   .addAttribute('processingType', {
     type: 'string',
diff --git a/packages/spacecat-shared-data-access/src/models/site-candidate/site-candidate.schema.js b/packages/spacecat-shared-data-access/src/models/site-candidate/site-candidate.schema.js
index 74a0eaf05..b303e7d16 100755
--- a/packages/spacecat-shared-data-access/src/models/site-candidate/site-candidate.schema.js
+++ b/packages/spacecat-shared-data-access/src/models/site-candidate/site-candidate.schema.js
@@ -12,7 +12,7 @@
 
 /* c8 ignore start */
 
-import { isObject, isValidUrl, isValidUUID } from '@adobe/spacecat-shared-utils';
+import { isObject, isValidBaseUrl, isValidUUID } from '@adobe/spacecat-shared-utils';
 
 import SchemaBuilder from '../base/schema.builder.js';
 import SiteCandidate from './site-candidate.model.js';
@@ -33,7 +33,7 @@ const schema = new SchemaBuilder(SiteCandidate, SiteCandidateCollection)
   .addAttribute('baseURL', {
     type: 'string',
     required: true,
-    validate: (value) => isValidUrl(value),
+    validate: (value) => isValidBaseUrl(value),
   })
   .addAttribute('hlxConfig', {
     type: 'any',
diff --git a/packages/spacecat-shared-data-access/src/models/site/site.schema.js b/packages/spacecat-shared-data-access/src/models/site/site.schema.js
index 70b61f2e0..d40832c07 100755
--- a/packages/spacecat-shared-data-access/src/models/site/site.schema.js
+++ b/packages/spacecat-shared-data-access/src/models/site/site.schema.js
@@ -17,6 +17,7 @@ import {
   isNonEmptyObject,
   isObject,
   isValidUrl,
+  isValidBaseUrl,
 } from '@adobe/spacecat-shared-utils';
 
 import { Config, DEFAULT_CONFIG, validateConfiguration } from './config.js';
@@ -51,7 +52,7 @@ const schema = new SchemaBuilder(Site, SiteCollection)
   .addAttribute('baseURL', {
     type: 'string',
     required: true,
-    validate: (value) => isValidUrl(value),
+    validate: (value) => isValidBaseUrl(value),
   })
   .addAttribute('name', {
     type: 'string',
diff --git a/packages/spacecat-shared-google-client/src/index.js b/packages/spacecat-shared-google-client/src/index.js
index bffde31db..c87b4d716 100644
--- a/packages/spacecat-shared-google-client/src/index.js
+++ b/packages/spacecat-shared-google-client/src/index.js
@@ -20,6 +20,7 @@ import {
   isInteger,
   isValidDate,
   isValidUrl,
+  isValidBaseUrl,
   resolveCustomerSecretsName,
 } from '@adobe/spacecat-shared-utils';
 import { fetch as httpFetch } from './utils.js';
@@ -61,7 +62,7 @@ export default class GoogleClient {
   }
 
   static async createFrom(context, baseURL) {
-    if (!isValidUrl(baseURL)) {
+    if (!isValidBaseUrl(baseURL)) {
       throw new Error('Error creating GoogleClient: Invalid base URL');
     }