From aea27a1fa87444d844abbdca70f9d65d6d297e7e Mon Sep 17 00:00:00 2001
From: Thang Vu <hi@thvu.dev>
Date: Sun, 16 Jul 2023 22:32:55 +0700
Subject: [PATCH] fix: remove unused TS types

---
 packages/next-auth/src/core/lib/email/getUserFromEmail.ts | 1 +
 packages/next-auth/src/core/lib/email/signin.ts           | 3 ++-
 packages/next-auth/src/core/routes/callback.ts            | 1 -
 packages/next-auth/src/core/routes/session.ts             | 4 ++--
 packages/next-auth/src/core/routes/signin.ts              | 1 -
 packages/next-auth/src/core/routes/signout.ts             | 4 ++--
 packages/next-auth/src/core/types.ts                      | 5 +----
 7 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/packages/next-auth/src/core/lib/email/getUserFromEmail.ts b/packages/next-auth/src/core/lib/email/getUserFromEmail.ts
index 2119c28c56..d4e8b79f82 100644
--- a/packages/next-auth/src/core/lib/email/getUserFromEmail.ts
+++ b/packages/next-auth/src/core/lib/email/getUserFromEmail.ts
@@ -12,6 +12,7 @@ export default async function getAdapterUserFromEmail({
   email: string
   adapter: InternalOptions<"email">["adapter"]
 }): Promise<AdapterUser> {
+  // @ts-expect-error -- adapter is checked to be defined in `init`
   const { getUserByEmail } = adapter
   const adapterUser = email ? await getUserByEmail(email) : null
   if (adapterUser) return adapterUser
diff --git a/packages/next-auth/src/core/lib/email/signin.ts b/packages/next-auth/src/core/lib/email/signin.ts
index fa4ba15143..f672af6cf5 100644
--- a/packages/next-auth/src/core/lib/email/signin.ts
+++ b/packages/next-auth/src/core/lib/email/signin.ts
@@ -36,7 +36,8 @@ export default async function email(
       theme,
     }),
     // Save in database
-    adapter.createVerificationToken({
+    // @ts-expect-error -- adapter is checked to be defined in `init`
+    adapter.createVerificationToken?.({
       identifier,
       token: hashToken(token, options),
       expires,
diff --git a/packages/next-auth/src/core/routes/callback.ts b/packages/next-auth/src/core/routes/callback.ts
index 8de6a749e1..5105864f9b 100644
--- a/packages/next-auth/src/core/routes/callback.ts
+++ b/packages/next-auth/src/core/routes/callback.ts
@@ -220,7 +220,6 @@ export default async function callback(params: {
 
       const profile = await getAdapterUserFromEmail({
         email: identifier,
-        // @ts-expect-error -- Verified in `assertConfig`. adapter: Adapter<true>
         adapter,
       })
 
diff --git a/packages/next-auth/src/core/routes/session.ts b/packages/next-auth/src/core/routes/session.ts
index d88a12cbbd..ff1dc8e8e6 100644
--- a/packages/next-auth/src/core/routes/session.ts
+++ b/packages/next-auth/src/core/routes/session.ts
@@ -1,6 +1,5 @@
 import { fromDate } from "../lib/utils"
 
-import type { Adapter } from "../../adapters"
 import type { InternalOptions } from "../types"
 import type { ResponseInternal } from ".."
 import type { Session } from "../.."
@@ -98,8 +97,9 @@ export default async function session(
     }
   } else {
     try {
+      // @ts-expect-error -- adapter is checked to be defined in `init`
       const { getSessionAndUser, deleteSession, updateSession } =
-        adapter as Adapter
+        adapter
       let userAndSession = await getSessionAndUser(sessionToken)
 
       // If session has expired, clean up the database
diff --git a/packages/next-auth/src/core/routes/signin.ts b/packages/next-auth/src/core/routes/signin.ts
index 201f279101..4908c89034 100644
--- a/packages/next-auth/src/core/routes/signin.ts
+++ b/packages/next-auth/src/core/routes/signin.ts
@@ -57,7 +57,6 @@ export default async function signin(params: {
 
     const user = await getAdapterUserFromEmail({
       email,
-      // @ts-expect-error -- Verified in `assertConfig`. adapter: Adapter<true>
       adapter: options.adapter,
     })
 
diff --git a/packages/next-auth/src/core/routes/signout.ts b/packages/next-auth/src/core/routes/signout.ts
index 5078d53fb5..47321344d6 100644
--- a/packages/next-auth/src/core/routes/signout.ts
+++ b/packages/next-auth/src/core/routes/signout.ts
@@ -1,4 +1,3 @@
-import type { Adapter } from "../../adapters"
 import type { InternalOptions } from "../types"
 import type { ResponseInternal } from ".."
 import type { SessionStore } from "../lib/cookie"
@@ -28,7 +27,8 @@ export default async function signout(params: {
     }
   } else {
     try {
-      const session = await (adapter as Adapter).deleteSession(sessionToken)
+      // @ts-expect-error -- adapter is checked to be defined in `init`
+      const session = await adapter.deleteSession(sessionToken)
       // Dispatch signout event
       // @ts-expect-error
       await events.signOut?.({ session })
diff --git a/packages/next-auth/src/core/types.ts b/packages/next-auth/src/core/types.ts
index b98b144b34..4c33e63761 100644
--- a/packages/next-auth/src/core/types.ts
+++ b/packages/next-auth/src/core/types.ts
@@ -583,7 +583,6 @@ export type AuthAction =
 /** @internal */
 export interface InternalOptions<
   TProviderType = ProviderType,
-  WithVerificationToken = TProviderType extends "email" ? true : false
 > {
   providers: InternalProvider[]
   /**
@@ -603,9 +602,7 @@ export interface InternalOptions<
   pages: Partial<PagesOptions>
   jwt: JWTOptions
   events: Partial<EventCallbacks>
-  adapter: WithVerificationToken extends true
-    ? Adapter<WithVerificationToken>
-    : Adapter<WithVerificationToken> | undefined
+  adapter?: Adapter
   callbacks: CallbacksOptions
   cookies: CookiesOptions
   callbackUrl: string