fix: Fixed useless "&" char on createEmailRedirectionLink function (#363

) * fix: Fixed useless & on createEmailRedirectionLink function * chore: add changeset --------- Co-authored-by: Szilárd Dóró <[email protected]>
nhost · Jun 19, 2023 · 1706c37 · 1706c37
1 parent 7a07b50
commit 1706c37
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 6 deletions.
diff --git a/.changeset/bright-ways-hug.md b/.changeset/bright-ways-hug.md
@@ -0,0 +1,5 @@
+---
+'hasura-auth': patch
+---
+
+fix(redirect): generate valid redirection links
diff --git a/src/utils/redirect.ts b/src/utils/redirect.ts
@@ -17,9 +17,10 @@ export const createEmailRedirectionLink = (
   type: EmailType,
   ticket: string,
   redirectTo: string
-) =>
-  `${
-    ENV.AUTH_SERVER_URL
-  }/verify?&ticket=${ticket}&type=${type}&redirectTo=${encodeURIComponent(
-    redirectTo
-  )}`;
+): string => {
+  const url = new URL(`${ENV.AUTH_SERVER_URL}/verify`)
+  url.searchParams.set('ticket', ticket)
+  url.searchParams.set('type', type)
+  url.searchParams.set('redirectTo', redirectTo)
+  return url.toString()
+};
diff --git a/test/utils/redirect.test.ts b/test/utils/redirect.test.ts
@@ -0,0 +1,16 @@
+import { createEmailRedirectionLink } from '@/utils';
+import { EmailType, EMAIL_TYPES } from '@/types';
+import { v4 as uuidv4 } from 'uuid';
+import { ENV } from '@/utils';
+
+describe('utils', () => {
+  it('should create email redirection link', () => {
+    const ticket = `${EMAIL_TYPES.PASSWORD_RESET}:${uuidv4()}`;
+    const type: EmailType = EMAIL_TYPES.PASSWORD_RESET;
+    const redirectTo = "https://hasura.io/";
+
+    const url = createEmailRedirectionLink(type, ticket, redirectTo);
+
+    expect(url).toBe(`${ENV.AUTH_SERVER_URL}/verify?ticket=${encodeURIComponent(ticket)}&type=${encodeURIComponent(type)}&redirectTo=${encodeURIComponent(redirectTo)}`);
+  });
+});