@axa-fr/oidc-client-service-worker 7.9.3-alpha.1132 → 7.9.3

package/src/utils/__tests__/domains.spec.ts

@@ -1,7 +1,7 @@
-import { describe, expect, it } from 'vitest';
+import { beforeEach, describe, expect, it } from 'vitest';
 
 import { openidWellknownUrlEndWith } from '../../constants';
-import { checkDomain, getCurrentDatabaseDomain, normalizeUrl } from '..';
+import { checkDomain, getCurrentDatabaseDomain } from '..';
 import { Database, Tokens, TrustedDomains } from './../../types';
 
 describe('domains', () => {
@@ -30,28 +30,32 @@ describe('domains', () => {
 		});
 	});
 	describe('getCurrentDatabaseDomain', () => {
-		const db: Database = {
-			default: {
-				configurationName: 'config',
-				tokens: {} as Tokens,
-				status: 'NOT_CONNECTED',
-				state: null,
-				codeVerifier: null,
-				nonce: null,
-				oidcServerConfiguration: {
-					authorizationEndpoint: 'https://demo.duendesoftware.com/connect/authorize',
-					issuer: 'https://demo.duendesoftware.com',
-					revocationEndpoint: 'https://demo.duendesoftware.com/connect/revocation',
-					tokenEndpoint: 'https://demo.duendesoftware.com/connect/token',
-					userInfoEndpoint: 'https://demo.duendesoftware.com/connect/userinfo',
+		let db: Database;
+
+		beforeEach(() => {
+			db = {
+				default: {
+					configurationName: 'config',
+					tokens: {} as Tokens,
+					status: 'NOT_CONNECTED',
+					state: null,
+					codeVerifier: null,
+					nonce: null,
+					oidcServerConfiguration: {
+						authorizationEndpoint: 'https://demo.duendesoftware.com/connect/authorize',
+						issuer: 'https://demo.duendesoftware.com',
+						revocationEndpoint: 'https://demo.duendesoftware.com/connect/revocation',
+						tokenEndpoint: 'https://demo.duendesoftware.com/connect/token',
+						userInfoEndpoint: 'https://demo.duendesoftware.com/connect/userinfo',
+					},
+					hideAccessToken: true,
+					convertAllRequestsToCorsExceptNavigate: false,
+					setAccessTokenToNavigateRequests: true,
+					demonstratingProofOfPossessionNonce: null,
+					demonstratingProofOfPossessionJwkJson: null,
 				},
-				hideAccessToken: true,
-				convertAllRequestsToCorsExceptNavigate: false,
-				setAccessTokenToNavigateRequests: true,
-				demonstratingProofOfPossessionNonce: null,
-				demonstratingProofOfPossessionJwkJson: null,
-			},
-		};
+			};
+		});
 
 		it('will return null when url ends with openidWellknownUrlEndWith', () => {
 			const trustedDomains: TrustedDomains = {
@@ -69,15 +73,18 @@ describe('domains', () => {
 			expect(getCurrentDatabaseDomain(db, url, trustedDomains)).toBeNull();
 		});
 
-		it('will return null when url is the token endpoint only differs by default port', () => {
+		it('will return null when url is the token endpoint oidc config token endpoint has a default port', () => {
 			const trustedDomains: TrustedDomains = {
 				default: ['https://demo.duendesoftware.com', 'https://kdhttps.auth0.com'],
 			};
-			const url = 'https://demo.duendesoftware.com:443/connect/token';
+			db['default'].oidcServerConfiguration!.tokenEndpoint =
+				'https://demo.duendesoftware.com:443/connect/token';
+
+			const url = 'https://demo.duendesoftware.com/connect/token';
 			expect(getCurrentDatabaseDomain(db, url, trustedDomains)).toBeNull();
 		});
 
-		it('will return null when url is the token endpoint', () => {
+		it('will return null when url is the revocation endpoint', () => {
 			const trustedDomains: TrustedDomains = {
 				default: ['https://demo.duendesoftware.com', 'https://kdhttps.auth0.com'],
 			};
@@ -117,39 +124,4 @@ describe('domains', () => {
 			expect(getCurrentDatabaseDomain(db, 'https://domain/test', trustedDomains)).toBeNull();
 		});
 	});
-	it('normalizes urls', () => {
-		expect(normalizeUrl('foo.com')).toBe('https://foo.com');
-		expect(normalizeUrl('foo.com ')).toBe('https://foo.com');
-		expect(normalizeUrl('foo.com.')).toBe('https://foo.com');
-		expect(normalizeUrl('foo.com')).toBe('https://foo.com');
-		expect(normalizeUrl('HTTP://foo.com')).toBe('http://foo.com');
-		expect(normalizeUrl('//foo.com')).toBe('https://foo.com');
-		expect(normalizeUrl('http://foo.com')).toBe('http://foo.com');
-		expect(normalizeUrl('http://foo.com:80')).toBe('http://foo.com');
-		expect(normalizeUrl('https://foo.com:443')).toBe('https://foo.com');
-		expect(normalizeUrl('http://foo.com/foo/')).toBe('http://foo.com/foo');
-		expect(normalizeUrl('foo.com/?foo=bar baz')).toBe('https://foo.com/?foo=bar+baz');
-		expect(normalizeUrl('https://foo.com/https://bar.com')).toBe('https://foo.com/https://bar.com');
-		expect(normalizeUrl('https://foo.com/https://bar.com/foo//bar')).toBe(
-			'https://foo.com/https://bar.com/foo/bar',
-		);
-		expect(normalizeUrl('https://foo.com/http://bar.com')).toBe('https://foo.com/http://bar.com');
-		expect(normalizeUrl('https://foo.com/http://bar.com/foo//bar')).toBe(
-			'https://foo.com/http://bar.com/foo/bar',
-		);
-		expect(normalizeUrl('http://foo.com/%7Efoo/')).toBe('http://foo.com/~foo');
-		expect(normalizeUrl('https://foo.com/%FAIL%/07/94/ca/55.jpg')).toBe(
-			'https://foo.com/%FAIL%/07/94/ca/55.jpg',
-		);
-		expect(normalizeUrl('http://foo.com/?')).toBe('http://foo.com');
-		expect(normalizeUrl('êxample.com')).toBe('https://xn--xample-hva.com');
-		expect(normalizeUrl('http://foo.com/?b=bar&a=foo')).toBe('http://foo.com/?a=foo&b=bar');
-		expect(normalizeUrl('http://foo.com/?foo=bar*|<>:"')).toBe(
-			'http://foo.com/?foo=bar*|%3C%3E:%22',
-		);
-		expect(normalizeUrl('http://foo.com:5000')).toBe('http://foo.com:5000');
-		expect(normalizeUrl('http://foo.com/foo#bar')).toBe('http://foo.com/foo#bar');
-		expect(normalizeUrl('http://foo.com/foo/bar/../baz')).toBe('http://foo.com/foo/baz');
-		expect(normalizeUrl('http://foo.com/foo/bar/./baz')).toBe('http://foo.com/foo/bar/baz');
-	});
 });

package/src/utils/__tests__/normalizeUrl.spec.ts

@@ -0,0 +1,28 @@
+import { describe, expect, it } from 'vitest';
+
+import { normalizeUrl } from '../normalizeUrl';
+
+describe('normalizeUrl', () => {
+	it('keeps urls the same', () => {
+		expect(normalizeUrl('http://foo.com/')).toBe('http://foo.com/');
+		expect(normalizeUrl('https://foo.com/')).toBe('https://foo.com/');
+	});
+	it('adds slashes', () => {
+		expect(normalizeUrl('http://foo.com')).toBe('http://foo.com/');
+	});
+	it('removes port numbers', () => {
+		expect(normalizeUrl('http://foo.com:80/')).toBe('http://foo.com/');
+		expect(normalizeUrl('https://foo.com:443/')).toBe('https://foo.com/');
+	});
+	it('removed port numbers and adds slashes', () => {
+		expect(normalizeUrl('http://foo.com:80')).toBe('http://foo.com/');
+		expect(normalizeUrl('https://foo.com:443')).toBe('https://foo.com/');
+	});
+	it('lowercases urls', () => {
+		expect(normalizeUrl('http://FOO.com/')).toBe('http://foo.com/');
+	});
+
+	it('keeps invalid urls', () => {
+		expect(normalizeUrl('foo')).toBe('foo');
+	});
+});

package/src/utils/domains.ts

@@ -1,5 +1,6 @@
 import { acceptAnyDomainToken, openidWellknownUrlEndWith, scriptFilename } from '../constants';
 import { Database, Domain, DomainDetails, OidcConfig, TrustedDomains } from '../types';
+import { normalizeUrl } from './normalizeUrl';
 
 export function checkDomain(domains: Domain[], endpoint: string) {
 	if (!endpoint) {
@@ -52,13 +53,13 @@ export const getCurrentDatabaseDomain = (
 
 		if (
 			oidcServerConfiguration.tokenEndpoint &&
-			normalizeUrl(url) === normalizeUrl(oidcServerConfiguration.tokenEndpoint)
+			url === normalizeUrl(oidcServerConfiguration.tokenEndpoint)
 		) {
 			continue;
 		}
 		if (
 			oidcServerConfiguration.revocationEndpoint &&
-			normalizeUrl(url) === normalizeUrl(oidcServerConfiguration.revocationEndpoint)
+			url === normalizeUrl(oidcServerConfiguration.revocationEndpoint)
 		) {
 			continue;
 		}
@@ -96,87 +97,3 @@ export const getCurrentDatabaseDomain = (
 	}
 	return null;
 };
-
-export function normalizeUrl(url: string) {
-	url = url.trim();
-
-	const hasRelativeProtocol = url.startsWith('//');
-	const isRelativeUrl = !hasRelativeProtocol && /^\.*\//.test(url);
-
-	// Prepend protocol
-	if (!isRelativeUrl) {
-		url = url.replace(/^(?!(?:\w+:)?\/\/)|^\/\//, 'https:');
-	}
-
-	const urlObject = new URL(url);
-
-	// Remove duplicate slashes if not preceded by a protocol
-	// NOTE: This could be implemented using a single negative lookbehind
-	// regex, but we avoid that to maintain compatibility with older js engines
-	// which do not have support for that feature.
-	if (urlObject.pathname) {
-		// Split the string by occurrences of this protocol regex, and perform
-		// duplicate-slash replacement on the strings between those occurrences
-		// (if any).
-		const protocolRegex = /\b[a-z][a-z\d+\-.]{1,50}:\/\//g;
-
-		let lastIndex = 0;
-		let result = '';
-		for (;;) {
-			const match = protocolRegex.exec(urlObject.pathname);
-			if (!match) {
-				break;
-			}
-
-			const protocol = match[0];
-			const protocolAtIndex = match.index;
-			const intermediate = urlObject.pathname.slice(lastIndex, protocolAtIndex);
-
-			result += intermediate.replace(/\/{2,}/g, '/');
-			result += protocol;
-			lastIndex = protocolAtIndex + protocol.length;
-		}
-
-		const remnant = urlObject.pathname.slice(lastIndex, urlObject.pathname.length);
-		result += remnant.replace(/\/{2,}/g, '/');
-
-		urlObject.pathname = result;
-	}
-
-	// Decode URI octets
-	if (urlObject.pathname) {
-		try {
-			urlObject.pathname = decodeURI(urlObject.pathname);
-		} catch {
-			/* empty */
-		}
-	}
-
-	if (urlObject.hostname) {
-		// Remove trailing dot
-		urlObject.hostname = urlObject.hostname.replace(/\.$/, '');
-	}
-
-	// Sort query parameters
-	urlObject.searchParams.sort();
-
-	// Calling `.sort()` encodes the search parameters, so we need to decode them again.
-	try {
-		urlObject.search = decodeURIComponent(urlObject.search);
-	} catch {
-		/* empty */
-	}
-
-	// Remove trailing slash
-	urlObject.pathname = urlObject.pathname.replace(/\/$/, '');
-
-	// Take advantage of many of the Node `url` normalizations
-	url = urlObject.toString();
-
-	// Remove ending `/` unless removeSingleSlash is false
-	if (urlObject.hash === '') {
-		url = url.replace(/\/$/, '');
-	}
-
-	return url;
-}

package/src/utils/index.ts

@@ -1,4 +1,5 @@
 export * from './domains';
+export * from './normalizeUrl';
 export * from './serializeHeaders';
 export * from './sleep';
 export * from './strings';

package/src/utils/normalizeUrl.ts

@@ -0,0 +1,9 @@
+export function normalizeUrl(url: string) {
+	try {
+		return new URL(url).toString();
+	} catch (error) {
+		console.error(`Failed to normalize url: ${url}`);
+		return url;
+	}
+}
+

package/src/version.ts

@@ -1 +1 @@
-export default '7.9.3-alpha.1132';
+export default '7.9.3';