fix(core): support trailingSlash in providerAndAccountId parsing (#…

…10752)
nextauthjs · Apr 29, 2024 · 46f9582 · 46f9582
1 parent 42ecf79
commit 46f9582
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/packages/core/src/lib/utils/web.ts b/packages/core/src/lib/utils/web.ts
@@ -123,9 +123,9 @@ export function parseActionAndProviderId(
 
   if (a === null) throw new UnknownAction(`Cannot parse action at ${pathname}`)
 
-  const [_, actionAndProviderId] = a
+  const actionAndProviderId = a.at(-1)!
 
-  const b = actionAndProviderId.replace(/^\//, "").split("/")
+  const b = actionAndProviderId.replace(/^\//, "").split("/").filter(Boolean)
 
   if (b.length !== 1 && b.length !== 2)
     throw new UnknownAction(`Cannot parse action at ${pathname}`)

diff --git a/packages/core/test/url-parsing.test.ts b/packages/core/test/url-parsing.test.ts
@@ -30,6 +30,12 @@ describe("parse the action and provider id", () => {
       error: "Cannot parse action at /api/auth/signinn/github",
       basePath: "/api/auth",
     },
+    {
+      path: "/api/auth/signin/github/",
+      action: "signin",
+      providerId: "github",
+      basePath: "/api/auth",
+    },
     {
       path: "/api/auth/signin/github",
       action: "signin",
@@ -46,6 +52,18 @@ describe("parse the action and provider id", () => {
       error: "Cannot parse action at /api/auth/signin/api/auth/signin/github",
       basePath: "/api/auth",
     },
+    {
+      path: "/auth/signin/auth0/",
+      action: "signin",
+      providerId: "auth0",
+      basePath: "/auth",
+    },
+    {
+      path: "/auth/signin/auth0///",
+      action: "signin",
+      providerId: "auth0",
+      basePath: "/auth",
+    },
     {
       path: "/auth/signin/auth0",
       action: "signin",