fix(ts): wrap adapter option in ReturnType (#1887)

* fix(ts): wrap adapter option in ReturnType

* test(ts): fix adapter tests

src/providers/42.js

@@ -0,0 +1,20 @@
+export default function FortyTwo(options) {
+  return {
+    id: '42-school',
+    name: '42 School',
+    type: 'oauth',
+    version: '2.0',
+    params: { grant_type: 'authorization_code' },
+    accessTokenUrl: 'https://api.intra.42.fr/oauth/token',
+    authorizationUrl:
+      'https://api.intra.42.fr/oauth/authorize?response_type=code',
+    profileUrl: 'https://api.intra.42.fr/v2/me',
+    profile: (profile) => ({
+      id: profile.id,
+      email: profile.email,
+      image: profile.image_url,
+      name: profile.usual_full_name,
+    }),
+    ...options,
+  }
+}

types/adapters.d.ts

@@ -49,9 +49,15 @@ export interface AdapterInstance<U = User, P = Profile, S = Session> {
   ): Promise<void>
   createSession(user: U): Promise<S>
   getSession(sessionToken: string): Promise<S | null>
-  updateSession(session: S, force?: boolean): Promise<S>
+  updateSession(session: S, force?: boolean): Promise<S | null>
   deleteSession(sessionToken: string): Promise<void>
-  createVerificationRequest?: SendVerificationRequest
+  createVerificationRequest?(
+    identifier: string,
+    url: string,
+    token: string,
+    secret: string,
+    provider: EmailConfig & { maxAge: number; from: string }
+  ): Promise<void>
   getVerificationRequest?(
     identifier: string,
     verificationToken: string,
@@ -118,7 +124,7 @@ export type Adapter<
   P = Profile,
   S = Session
 > = (
-  config: C,
+  config?: C,
   options?: O
 ) => {
   getAdapter(appOptions: AppOptions): Promise<AdapterInstance<U, P, S>>

types/index.d.ts

@@ -127,7 +127,7 @@ export interface NextAuthOptions {
    * [Default adapter](https://next-auth.js.org/schemas/adapters#typeorm-adapter) |
    * [Community adapters](https://github.com/nextauthjs/adapters)
    */
-  adapter?: Adapter
+  adapter?: ReturnType<Adapter>
   /**
    * Set debug to true to enable debug messages for authentication and database operations.
    * * **Default value**: `false`

types/providers.d.ts

@@ -67,6 +67,7 @@ export type OAuthProviderType =
   | "EVEOnline"
   | "Facebook"
   | "FACEIT"
+  | "FortyTwo"
   | "Foursquare"
   | "FusionAuth"
   | "GitHub"
@@ -132,13 +133,13 @@ export interface EmailConfigServerOptions {
   }
 }
 
-export type SendVerificationRequest = (
-  identifier: string,
-  url: string,
-  baseUrl: string,
-  token: string,
+export type SendVerificationRequest = (params: {
+  identifier: string
+  url: string
+  baseUrl: string
+  token: string
   provider: EmailConfig
-) => Awaitable<void>
+}) => Awaitable<void>
 
 export interface EmailConfig extends CommonProviderOptions {
   type: "email"

types/tests/server.test.ts

@@ -65,7 +65,7 @@ const exampleVerificationRequest = {
   expires: new Date(),
 }
 
-const adapter: Adapter = () => {
+const MyAdapter: Adapter = () => {
   return {
     async getAdapter(appOptions: AppOptions) {
       return {
@@ -190,7 +190,7 @@ const allConfig: NextAuthTypes.NextAuthOptions = {
       return undefined
     },
   },
-  adapter,
+  adapter: MyAdapter(),
   useSecureCookies: true,
   cookies: {
     sessionToken: {

www/docs/configuration/providers.md

@@ -76,7 +76,7 @@ As an example of what this looks like, this is the provider object returned for
   profileUrl: "https://www.googleapis.com/oauth2/v1/userinfo?alt=json",
   async profile(profile, tokens) {
     // You can use the tokens, in case you want to fetch more profile information
-    // For example several OAuth provider does not return e-mail by default.
+    // For example several OAuth providers do not return email by default.
     // Depending on your provider, will have tokens like `access_token`, `id_token` and or `refresh_token`
     return {
       id: profile.id,
@@ -131,7 +131,7 @@ providers: [
 |   requestTokenUrl   |               Endpoint to retrieve a request token               |            `string`             |    No    |
 | authorizationParams |    Additional params to be sent to the authorization endpoint    |            `object`             |    No    |
 |     profileUrl      |             Endpoint to retrieve the user's profile              |            `string`             |    No    |
-|       profile       |       An callback returning an object with the user's info       |            `object`             |    No    |
+|       profile       |        A callback returning an object with the user's info       |            `object`             |    No    |
 |       idToken       |   Set to `true` for services that use ID Tokens (e.g. OpenID)    |            `boolean`            |    No    |
 |       headers       |      Any headers that should be sent to the OAuth provider       |            `object`             |    No    |
 |     protection      | Additional security for OAuth login flows (defaults to `state`)  |`[pkce]`,`[state]`,`[pkce,state]`|    No    |
@@ -233,4 +233,4 @@ If you think your custom provider might be useful to others, we encourage you to
 
 That's it! 🎉 Others will be able to discover this provider much more easily now!
 
-You can look at the existing built-in providers for inspiration.
+You can look at the existing built-in providers for inspiration.

www/docs/providers/42.md

@@ -0,0 +1,26 @@
+---
+id: 42-school
+title: 42 School
+---
+
+## Documentation
+
+https://api.intra.42.fr/apidoc/guides/web_application_flow
+
+## Configuration
+
+https://profile.intra.42.fr/oauth/applications/new
+
+## Example
+
+```js
+import Providers from `next-auth/providers`
+...
+providers: [
+  Providers.FortyTwo({
+    clientId: process.env.FORTY_TWO_CLIENT_ID,
+    clientSecret: process.env.FORTY_TWO_CLIENT_SECRET
+  })
+]
+...
+```