merge: fix conflicts from conflicts

nextauthjs · ThangHuuVu · Jun 8, 2025 · Sep 26, 2024 · Sep 26, 2024 · Sep 26, 2024
commit fd4690b8f4f9cdcb1c67f814d8aedb2722914057
@@ -99,7 +99,7 @@ The SurrealDB adapter does not handle connections automatically, so you will hav
 
 ### Authorization
 
-#### Using WS:
+#### Websocket Method:
 
 With this configuration, we can use the websocket endpoint. Thus, the `AUTH_SURREAL_URL` should begin with `ws` or `wss`.
 

diff --git a/docs/pages/guides/extending-the-session.mdx b/docs/pages/guides/extending-the-session.mdx
@@ -12,16 +12,12 @@ This is `name`, `email`, and `image`.
 
 A common use case is to add the user's id to the session. Below it is shown how to do this based on the session strategy you are using.
 
-<Callout type="info">
-  By default, the `id` property does not exist on `token` or `session`. See the [TypeScript](https://authjs.dev/getting-started/typescript) on how to add it.
-</Callout>
-
 ## With JWT
 
 To have access to the user id, add the following to your Auth.js configuration:
 
 ```ts filename="auth.ts"
-  //  By default, the `id` property does not exist on `token` or `session`. See the [TypeScript](https://authjs.dev/getting-started/typescript) on how to add it.
+  providers,
   callbacks: {
     jwt({ token, user }) {
       if (user) { // User is available during sign-in
@@ -48,7 +44,7 @@ Calls to `auth()` or `useSession()` will now have access to the user's id.
 If you are using a database session strategy, you can add the user's id to the session by modifying the `session` callback:
 
 ```ts filename="auth.ts"
-  //  By default, the `id` property does not exist on `session`. See the [TypeScript](https://authjs.dev/getting-started/typescript) on how to add it.
+  providers,
   callbacks: {
     session({ session, user }) {
       session.user.id = user.id