From c261baeb57fff2a14e5bc1bbf37787c2776fc772 Mon Sep 17 00:00:00 2001 From: Atridad Lahiji Date: Wed, 23 Aug 2023 08:06:42 -0600 Subject: [PATCH] Fixes before work --- package.json | 2 +- pnpm-lock.yaml | 8 ++++---- src/server/unkey.ts | 4 +--- src/server/webhookHelpers.ts | 16 +++++++++------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 04812cc..ed7948a 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@trpc/next": "10.37.1", "@trpc/react-query": "10.37.1", "@trpc/server": "10.37.1", - "@unkey/api": "^0.6.13", + "@unkey/api": "^0.6.14", "@upstash/ratelimit": "^0.4.3", "@upstash/redis": "^1.22.0", "ably": "^1.2.43", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bb646b6..280d7dd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -36,8 +36,8 @@ dependencies: specifier: 10.37.1 version: 10.37.1 '@unkey/api': - specifier: ^0.6.13 - version: 0.6.13 + specifier: ^0.6.14 + version: 0.6.14 '@upstash/ratelimit': specifier: ^0.4.3 version: 0.4.3 @@ -1869,8 +1869,8 @@ packages: eslint-visitor-keys: 3.4.3 dev: true - /@unkey/api@0.6.13: - resolution: {integrity: sha512-fYIph+wLd+lIuYqc2qXjQ52Zm/jDOhsLiZgOPNOlYzESU1ouU5Tm/9PNYb9lXgzeTqL3rU/EWtR8GoLHu/BfjA==} + /@unkey/api@0.6.14: + resolution: {integrity: sha512-d2tssSRf4Y4kCF44mloFcqphBenfWN5G2D1Iyz8EMmAoNi+ytvmHmmc1zZf4k3GhK68xLDA7uEO/b/1vtgD5qg==} dev: false /@upstash/core-analytics@0.0.6: diff --git a/src/server/unkey.ts b/src/server/unkey.ts index 554e11a..5157b74 100644 --- a/src/server/unkey.ts +++ b/src/server/unkey.ts @@ -9,9 +9,7 @@ export const validateApiKey = async (key: string) => { const res = await unkey.keys.verify({ key, }); - // @ts-ignore This is broken... - const isValid = res.result?.valid || (res.valid as boolean); - return isValid; + return res.result?.valid || false; } catch { return false; } diff --git a/src/server/webhookHelpers.ts b/src/server/webhookHelpers.ts index e6b51f1..ac460fd 100644 --- a/src/server/webhookHelpers.ts +++ b/src/server/webhookHelpers.ts @@ -41,14 +41,16 @@ export const onUserCreatedHandler = async ( } ); - userEmails.forEach((userEmail) => { - void resend.sendEmail({ - from: "no-reply@sprintpadawan.dev", - to: userEmail, - subject: "🎉 Welcome to Sprint Padawan! 🎉", - react: Welcome({ name: userName }), + if (userUpdateResponse.ok) { + userEmails.forEach((userEmail) => { + void resend.sendEmail({ + from: "no-reply@sprintpadawan.dev", + to: userEmail, + subject: "🎉 Welcome to Sprint Padawan! 🎉", + react: Welcome({ name: userName }), + }); }); - }); + } return userUpdateResponse.ok; };