Merge branch 'main' into chore/improve-errors

packages/core/src/lib/callback-handler.ts

@@ -155,6 +155,11 @@ export async function handleLogin(
 
     return { session, user: userByAccount, isNewUser }
   } else {
+    const { provider: p } = options as InternalOptions<"oauth" | "oidc">
+    const { type, provider, providerAccountId, userId, ...tokenSet } = account
+    const defaults = { providerAccountId, provider, type, userId }
+    account = Object.assign(p.account(tokenSet), defaults)
+
     if (user) {
       // If the user is already signed in and the OAuth account isn't already associated
       // with another user account then we can go ahead and link the accounts safely.