refactor: Use new UI5_MCP_SERVER_ALLOWED_DOMAINS variable

Author: dimovpetar

src/tools/create_integration_card/create_integration_card.ts

@@ -7,7 +7,7 @@ import ejs from "ejs";
 import {getLogger} from "@ui5/logger";
 import {Destination, SupportedCardType} from "./schema.js";
 import semver from "semver";
-import {getAllowedOdataV4Domains, isValidUrl} from "../../utils/URLHelper.js";
+import {getAllowedDomains, isValidUrl} from "../../utils/URLHelper.js";
 
 const log = getLogger("tools:create_integration_card:create_integration_card");
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
@@ -43,7 +43,7 @@ export async function createIntegrationCard({
 	}
 
 	if (destinations?.length) {
-		const allowedDomains = getAllowedOdataV4Domains();
+		const allowedDomains = getAllowedDomains();
 
 		for (const destination of destinations) {
 			if (!isValidUrl(destination.defaultUrl, allowedDomains)) {

src/utils/URLHelper.ts

@@ -71,12 +71,13 @@ export function isValidUrl(
 	return true;
 };
 
-export function getAllowedOdataV4Domains() {
-	if ("UI5_MCP_SERVER_ALLOWED_ODATA_DOMAINS" in process.env) {
-		const inputDomainList = process.env.UI5_MCP_SERVER_ALLOWED_ODATA_DOMAINS;
+export function getAllowedDomains() {
+	if ("UI5_MCP_SERVER_ALLOWED_DOMAINS" in process.env || "UI5_MCP_SERVER_ALLOWED_ODATA_DOMAINS" in process.env) {
+		const inputDomainList = process.env.UI5_MCP_SERVER_ALLOWED_DOMAINS ??
+			process.env.UI5_MCP_SERVER_ALLOWED_ODATA_DOMAINS;
 		if (!inputDomainList?.trim()) {
 			// Empty list allows all domains
-			log.verbose("Empty value for UI5_MCP_SERVER_ALLOWED_ODATA_DOMAINS, allowing all domains");
+			log.verbose("Empty value for UI5_MCP_SERVER_ALLOWED_DOMAINS, allowing all domains");
 			return [];
 		}
 		// Use the environment variable if set
@@ -88,7 +89,7 @@ export function getAllowedOdataV4Domains() {
 				new URL(`https://${domain}`);
 			} catch (err) {
 				throw new InvalidInputError(
-					`Invalid domain '${domain}' in UI5_MCP_SERVER_ALLOWED_ODATA_DOMAINS: ` +
+					`Invalid domain '${domain}' in UI5_MCP_SERVER_ALLOWED_DOMAINS: ` +
 					(err instanceof Error ? err.message : String(err))
 				);
 			}

test/lib/tools/create_integration_card/create_integration_card.ts

@@ -3,7 +3,7 @@ import esmock from "esmock";
 import sinonGlobal from "sinon";
 import {InvalidInputError} from "../../../../src/utils.js";
 import path from "node:path";
-import {isValidUrl as realIsValidUrl, getAllowedOdataV4Domains} from "../../../../src/utils/URLHelper.js";
+import {isValidUrl as realIsValidUrl, getAllowedDomains} from "../../../../src/utils/URLHelper.js";
 
 // Define test context type
 const test = anyTest as TestFn<{
@@ -93,7 +93,7 @@ test.beforeEach(async (t) => {
 			},
 			"../../../../src/utils/URLHelper.js": {
 				isValidUrl: t.context.isValidUrlStub,
-				getAllowedOdataV4Domains,
+				getAllowedDomains,
 			},
 		}
 	);
@@ -243,10 +243,9 @@ test.serial("Destinations: Throws error when there is not allowed domain", async
 			defaultUrl: "https://invalid-domain.com/api/v1/",
 		},
 	];
-	const currentAllowedDomains = process.env.UI5_MCP_SERVER_ALLOWED_ODATA_DOMAINS;
 	const allowedDomains = ["allowed-domain.com"];
 
-	process.env.UI5_MCP_SERVER_ALLOWED_ODATA_DOMAINS = "allowed-domain.com";
+	process.env.UI5_MCP_SERVER_ALLOWED_DOMAINS = "allowed-domain.com";
 
 	await t.throwsAsync(async () => {
 		await createIntegrationCard({
@@ -270,9 +269,6 @@ test.serial("Destinations: Throws error when there is not allowed domain", async
 		[destinations[0].defaultUrl, allowedDomains],
 		"isValidUrl should be called with the destination URL and allowed domains"
 	);
-
-	// Restore original allowed domains after test
-	process.env.UI5_MCP_SERVER_ALLOWED_ODATA_DOMAINS = currentAllowedDomains;
 });
 
 test.serial("Destinations: Successfully generates card template with allowed destination domain", async (t) => {
@@ -284,8 +280,7 @@ test.serial("Destinations: Successfully generates card template with allowed des
 			defaultUrl: "https://allowed-domain.com/api/v1/",
 		},
 	];
-	const currentAllowedDomains = process.env.UI5_MCP_SERVER_ALLOWED_ODATA_DOMAINS;
-	process.env.UI5_MCP_SERVER_ALLOWED_ODATA_DOMAINS = "allowed-domain.com";
+	process.env.UI5_MCP_SERVER_ALLOWED_DOMAINS = "allowed-domain.com";
 
 	await t.notThrowsAsync(async () => {
 		await createIntegrationCard({
@@ -303,7 +298,4 @@ test.serial("Destinations: Successfully generates card template with allowed des
 		[destinations[0].defaultUrl, ["allowed-domain.com"]],
 		"isValidUrl should be called with the destination URL and allowed domains"
 	);
-
-	// Restore original allowed domains after test
-	process.env.UI5_MCP_SERVER_ALLOWED_ODATA_DOMAINS = currentAllowedDomains;
 });