From 10e0c91d6acb1664f00634dd28037985b4462f76 Mon Sep 17 00:00:00 2001 From: dvelo <52332868+DeveloLongScript@users.noreply.github.com> Date: Wed, 18 Dec 2024 21:07:18 -0600 Subject: [PATCH] fix: breaking changes w/ clerk --- biome.json | 31 ++++++++++--------- .../v0/account-linking/claim-account-code.ts | 2 +- .../api/v0/account-linking/own-server.ts | 5 +-- .../api/v0/account-linking/owned-user.ts | 3 +- .../api/v0/account-linking/unlink-account.ts | 6 ++-- .../api/v0/account-linking/unown-server.ts | 3 +- 6 files changed, 28 insertions(+), 22 deletions(-) diff --git a/biome.json b/biome.json index 4766c1b..faa0495 100644 --- a/biome.json +++ b/biome.json @@ -1,17 +1,18 @@ { - "$schema": "./node_modules/@biomejs/biome/configuration_schema.json", - "linter": { - "rules": { - "style": { - "useTemplate": "off" - }, - "suspicious": { - "noExplicitAny": "off", - "noDoubleEquals": "warn" - }, - "complexity": { - "noForEach": "off" - } - } - } + "$schema": "./node_modules/@biomejs/biome/configuration_schema.json", + "linter": { + "rules": { + "style": { + "useTemplate": "off", + "useImportType": "warn" + }, + "suspicious": { + "noExplicitAny": "off", + "noDoubleEquals": "warn" + }, + "complexity": { + "noForEach": "off" + } + } + } } diff --git a/src/pages/api/v0/account-linking/claim-account-code.ts b/src/pages/api/v0/account-linking/claim-account-code.ts index 8b4c445..c8c422a 100644 --- a/src/pages/api/v0/account-linking/claim-account-code.ts +++ b/src/pages/api/v0/account-linking/claim-account-code.ts @@ -62,7 +62,7 @@ export default async function handler( const users = db.collection("claimed-users"); await users.insertOne({ player: entry.player, userId }); - await clerkClient.users.updateUserMetadata(userId, { + (await clerkClient()).users.updateUserMetadata(userId, { publicMetadata: { player: entry.player, }, diff --git a/src/pages/api/v0/account-linking/own-server.ts b/src/pages/api/v0/account-linking/own-server.ts index f2411e4..32476ce 100644 --- a/src/pages/api/v0/account-linking/own-server.ts +++ b/src/pages/api/v0/account-linking/own-server.ts @@ -49,7 +49,8 @@ export default async function handler( return res.status(401).json({ error: "Unauthorized" }); } if ( - (await clerkClient.users.getUser(userId)).publicMetadata.player == undefined + (await (await clerkClient()).users.getUser(userId)).publicMetadata.player == + undefined ) { return res.status(401).json({ error: "Account not linked" }); } @@ -81,7 +82,7 @@ export default async function handler( servers.forEach(async (c, i) => { if (c.name == server) { - const MCUsername = (await clerkClient.users.getUser(userId)) + const MCUsername = (await (await clerkClient()).users.getUser(userId)) .publicMetadata.player; if (MCUsername == c.author) { diff --git a/src/pages/api/v0/account-linking/owned-user.ts b/src/pages/api/v0/account-linking/owned-user.ts index 40bd4f9..7e58570 100644 --- a/src/pages/api/v0/account-linking/owned-user.ts +++ b/src/pages/api/v0/account-linking/owned-user.ts @@ -48,7 +48,8 @@ export default async function handler( return res.status(401).json({ error: "Unauthorized" }); } if ( - (await clerkClient.users.getUser(userId)).publicMetadata.player == undefined + (await (await clerkClient()).users.getUser(userId)).publicMetadata.player == + undefined ) { return res.status(401).json({ error: "Account not linked" }); } diff --git a/src/pages/api/v0/account-linking/unlink-account.ts b/src/pages/api/v0/account-linking/unlink-account.ts index c998916..e190b42 100644 --- a/src/pages/api/v0/account-linking/unlink-account.ts +++ b/src/pages/api/v0/account-linking/unlink-account.ts @@ -46,14 +46,16 @@ export default async function handler( const db = client.db("mhsf"); const users = db.collection("claimed-users"); - const user = await clerkClient.users.getUser(userId); + const user = await (await clerkClient()).users.getUser(userId); if (user.publicMetadata.player == undefined) { res.status(400).send({ result: "Hasn't linked yet!" }); return; } await users.findOneAndDelete({ player: user.publicMetadata.player }); - await clerkClient.users.updateUserMetadata(userId, { + await ( + await clerkClient() + ).users.updateUserMetadata(userId, { publicMetadata: { player: null }, }); diff --git a/src/pages/api/v0/account-linking/unown-server.ts b/src/pages/api/v0/account-linking/unown-server.ts index dbb484f..4b56d50 100644 --- a/src/pages/api/v0/account-linking/unown-server.ts +++ b/src/pages/api/v0/account-linking/unown-server.ts @@ -48,7 +48,8 @@ export default async function handler( return res.status(401).json({ error: "Unauthorized" }); } if ( - (await clerkClient.users.getUser(userId)).publicMetadata.player == undefined + (await (await clerkClient()).users.getUser(userId)).publicMetadata.player == + undefined ) { return res.status(401).json({ error: "Account not linked" }); }