3pp-mirror/rallly
1
0
Fork 0
mirror of https://github.com/lukevella/rallly.git synced 2025-07-28 21:57:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix login error (#932)

Browse source
This commit is contained in:
Luke Vella 2023-11-08 16:14:09 +00:00 • committed by GitHub
parent 3f6a5603b3
commit e3aacbe668
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 141 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

9
apps/web/src/utils/auth.ts
View file

@ -18,7 +18,6 @@ import CredentialsProvider from "next-auth/providers/credentials";
import EmailProvider from "next-auth/providers/email";
import { absoluteUrl } from "@/utils/absolute-url";
import { LegacyTokenProvider } from "@/utils/auth/legacy-token-provider";
import { mergeGuestsIntoUser } from "@/utils/auth/merge-user";
import { emailClient } from "@/utils/emails";
@ -30,7 +29,6 @@ const getAuthOptions = (...args: GetServerSessionParams) =>
strategy: "jwt",
},
providers: [
LegacyTokenProvider,
// When a user registers, we don't want to go through the email verification process
// so this providers allows us exchange the registration token for a session token
CredentialsProvider({
@ -139,7 +137,8 @@ const getAuthOptions = (...args: GetServerSessionParams) =>
return false;
}
}
} else {
} else if (user.email) {
// merge guest user into newly logged in user
const session = await getServerSession(...args);
if (session && session.user.email === null) {
await mergeGuestsIntoUser(user.id, [session.user.id]);
@ -198,8 +197,8 @@ type GetServerSessionParams =
| [NextApiRequest, NextApiResponse]
| [];
export function getServerSession(...args: GetServerSessionParams) {
return getServerSessionWithOptions(...args, getAuthOptions(...args));
export async function getServerSession(...args: GetServerSessionParams) {
return await getServerSessionWithOptions(...args, getAuthOptions(...args));
}
export async function AuthApiRoute(req: NextApiRequest, res: NextApiResponse) {