Skip to content

⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.

minor fix to apple oauth

daniel31x131ca6f2a3c46c
diff --git a/apps/web/lib/api/apple.ts b/apps/web/lib/api/apple.ts
index d057402a..7e6fe783 100644
--- a/apps/web/lib/api/apple.ts
+++ b/apps/web/lib/api/apple.ts
@@ -96,6 +96,22 @@ export async function verifyAppleIdentityToken(
};
}
+export function parseAppleSignupName(body: any): string | undefined {
+ if (typeof body?.user !== "string") return undefined;
+
+ try {
+ const user = JSON.parse(body.user);
+ const name = [user?.name?.firstName, user?.name?.lastName]
+ .filter(Boolean)
+ .join(" ")
+ .trim();
+
+ return name || undefined;
+ } catch {
+ return undefined;
+ }
+}
+
export function getAppleClientSecret() {
const now = Math.floor(Date.now() / 1000);
diff --git a/apps/web/pages/api/v1/auth/[...nextauth].ts b/apps/web/pages/api/v1/auth/[...nextauth].ts
index 8f3e5a9c..86ad2bdb 100644
--- a/apps/web/pages/api/v1/auth/[...nextauth].ts
+++ b/apps/web/pages/api/v1/auth/[...nextauth].ts
@@ -3,6 +3,7 @@ import sendInvitationRequest from "@/lib/api/sendInvitationRequest";
import sendVerificationRequest from "@/lib/api/sendVerificationRequest";
import updateSeats from "@/lib/api/billing/updateSeats";
import verifySubscription from "@/lib/api/billing/verifySubscription";
+import { parseAppleSignupName } from "@/lib/api/apple";
import { authProviders, isAuthProviderEnabled } from "@/lib/api/authProviders";
import { ssoEmailVerified } from "@/lib/api/ssoEmailVerified";
import { PrismaAdapter } from "@auth/prisma-adapter";
@@ -191,6 +192,11 @@ for (const entry of authProviders) {
}
export default async function auth(req: NextApiRequest, res: NextApiResponse) {
+ const appleSignupName =
+ Array.isArray(req.query.nextauth) && req.query.nextauth.includes("apple")
+ ? parseAppleSignupName(req.body)
+ : undefined;
+
return await NextAuth(req, res, {
adapter: adapter as Adapter,
session: {
@@ -364,6 +370,13 @@ export default async function auth(req: NextApiRequest, res: NextApiResponse) {
},
});
}
+
+ if (userExists && !userExists.name && appleSignupName) {
+ await prisma.user.update({
+ where: { id: userExists.id },
+ data: { name: appleSignupName },
+ });
+ }
} else if (trigger === "signIn") {
const user = await prisma.user.findUnique({
where: {
@@ -380,6 +393,13 @@ export default async function auth(req: NextApiRequest, res: NextApiResponse) {
data: { username: autoGeneratedUsername },
});
}
+
+ if (user && !user.name && appleSignupName) {
+ await prisma.user.update({
+ where: { id: user.id },
+ data: { name: appleSignupName },
+ });
+ }
}
return token;