Skip to content

fix: Correctly match IdInteractionRoutes without trailing slash #2005

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joachimvh merged 1 commit into from
Feb 27, 2025
Merged

fix: Correctly match IdInteractionRoutes without trailing slash #2005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/identity/interaction/routing/IdInteractionRoute.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@ export class IdInteractionRoute<TBase extends string, TId extends string> implem
private readonly base: InteractionRoute<TBase>;
private readonly idName: TId;
private readonly ensureSlash: boolean;
private readonly matchRegex: RegExp;

public constructor(base: InteractionRoute<TBase>, idName: TId, ensureSlash = true) {
this.base = base;
this.idName = idName;
this.ensureSlash = ensureSlash;
this.matchRegex = ensureSlash ? /(.*\/)([^/]+)\/$/u : /(.*\/)([^/]+)$/u;
}

public getPath(parameters?: Record<TBase | TId, string>): string {
Expand All @@ -27,7 +29,7 @@ export class IdInteractionRoute<TBase extends string, TId extends string> implem
}

public matchPath(path: string): Record<TBase | TId, string> | undefined {
const match = /(.*\/)([^/]+)\/$/u.exec(path);
const match = this.matchRegex.exec(path);

if (!match) {
return;
Expand Down
5 changes: 5 additions & 0 deletions test/unit/identity/interaction/routing/IdInteractionRoute.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ describe('An IdInteractionRoute', (): void => {
expect(route.matchPath('http://example.com/1234/')).toEqual({ base: 'base', id: '1234' });
});

it('can match paths without trailing slash if ensureSlash is false.', async(): Promise<void> => {
route = new IdInteractionRoute<'base', 'id'>(base, idName, false);
expect(route.matchPath('http://example.com/1234')).toEqual({ base: 'base', id: '1234' });
});

it('returns undefined if there is no match.', async(): Promise<void> => {
expect(route.matchPath('http://example.com/1234')).toBeUndefined();
});
Expand Down
Loading