From 917979bb93da2b5bd4947857fa9cdb738099af7e Mon Sep 17 00:00:00 2001 From: Maximilian Kaske <56969857+mxkaske@users.noreply.github.com> Date: Sat, 28 Dec 2024 10:04:08 +0100 Subject: [PATCH] chore: bump unkey (#1138) --- apps/server/package.json | 2 +- apps/web/package.json | 2 +- .../settings/api-token/_components/actions.ts | 7 ++++ .../settings/api-token/_components/card.tsx | 42 +++++++------------ .../(dashboard)/settings/api-token/page.tsx | 22 +++++++++- pnpm-lock.yaml | 14 +++---- 6 files changed, 52 insertions(+), 37 deletions(-) diff --git a/apps/server/package.json b/apps/server/package.json index 9d7f2bee4..263df5984 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -28,7 +28,7 @@ "@openstatus/utils": "workspace:*", "@scalar/hono-api-reference": "0.5.131", "@t3-oss/env-core": "0.7.1", - "@unkey/api": "0.23.0", + "@unkey/api": "0.26.1", "@upstash/qstash": "2.6.2", "hono": "4.5.3", "nanoid": "5.0.7", diff --git a/apps/web/package.json b/apps/web/package.json index 9a8596b7d..14202e4a0 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -45,7 +45,7 @@ "@trpc/next": "11.0.0-rc.666", "@trpc/react-query": "11.0.0-rc.666", "@trpc/server": "11.0.0-rc.666", - "@unkey/api": "0.23.0", + "@unkey/api": "0.26.1", "@upstash/qstash": "2.6.2", "@upstash/redis": "1.22.1", "@vercel/blob": "0.23.3", diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/api-token/_components/actions.ts b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/api-token/_components/actions.ts index d3086154a..173f42f55 100644 --- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/api-token/_components/actions.ts +++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/api-token/_components/actions.ts @@ -7,6 +7,7 @@ import { user, usersToWorkspaces, workspace } from "@openstatus/db/src/schema"; import { env } from "@/env"; import { auth } from "@/lib/auth"; +import { revalidatePath } from "next/cache"; const unkey = new Unkey({ token: env.UNKEY_TOKEN, cache: "no-cache" }); @@ -34,10 +35,16 @@ export async function create(ownerId: number) { ownerId: String(ownerId), prefix: "os", }); + + revalidatePath("/app/[workspaceSlug]/(dashboard)/settings/api-token"); + return key; } export async function revoke(keyId: string) { const res = await unkey.keys.delete({ keyId }); + + revalidatePath("/app/[workspaceSlug]/(dashboard)/settings/api-token"); + return res; } diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/api-token/_components/card.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/api-token/_components/card.tsx index ec99a1754..cc55fb501 100644 --- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/api-token/_components/card.tsx +++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/api-token/_components/card.tsx @@ -1,27 +1,15 @@ -"use server"; - -import { Unkey } from "@unkey/api"; - import { Container } from "@/components/dashboard/container"; -import { env } from "@/env"; import { formatDate } from "@/lib/utils"; import { CreateForm } from "./create-form"; import { RevokeButton } from "./revoke-button"; -const unkey = new Unkey({ token: env.UNKEY_TOKEN }); - -export async function ApiKeys({ ownerId }: { ownerId: number }) { - const data = await unkey.apis.listKeys({ - apiId: env.UNKEY_API_ID, - ownerId: String(ownerId), - }); - - if (data.error) { - return
Something went wrong. Please contact us.
; - } - - const key = data.result.keys?.[0] || undefined; - +export async function ApiKeys({ + ownerId, + value, +}: { + ownerId: number; + value?: { id: string; start: string; createdAt: number }; +}) { return ( <> - {key ? ( - + {value ? ( + ) : ( )} } > - {key ? ( + {value ? (
Token
-
{key.start}...
+
{value.start}...
Created At
-
{key.createdAt && formatDate(new Date(key.createdAt))}
+
+ {value.createdAt && formatDate(new Date(value.createdAt))} +
) : null}

- Read more about APIs in our{" "} + Read more about API in our{" "} diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/api-token/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/api-token/page.tsx index b3e2d664d..998801e83 100644 --- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/api-token/page.tsx +++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/api-token/page.tsx @@ -1,8 +1,26 @@ +import { Unkey } from "@unkey/api"; + +import { env } from "@/env"; import { api } from "@/trpc/server"; import { ApiKeys } from "./_components/card"; +export const revalidate = 0; + +const unkey = new Unkey({ token: env.UNKEY_TOKEN, cache: "no-cache" }); + export default async function ApiTokenPage() { - const data = await api.workspace.getWorkspace.query(); + const workspace = await api.workspace.getWorkspace.query(); + + const data = await unkey.apis.listKeys({ + apiId: env.UNKEY_API_ID, + ownerId: String(workspace.id), + }); + + if (data.error) { + return

Something went wrong. Please contact us.
; + } + + const value = data.result.keys?.[0] || undefined; - return ; + return ; } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 79ec42e21..884c0817e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -167,8 +167,8 @@ importers: specifier: 0.7.1 version: 0.7.1(typescript@5.7.2)(zod@3.23.8) '@unkey/api': - specifier: 0.23.0 - version: 0.23.0 + specifier: 0.26.1 + version: 0.26.1 '@upstash/qstash': specifier: 2.6.2 version: 2.6.2 @@ -309,8 +309,8 @@ importers: specifier: 11.0.0-rc.666 version: 11.0.0-rc.666(typescript@5.6.2) '@unkey/api': - specifier: 0.23.0 - version: 0.23.0 + specifier: 0.26.1 + version: 0.26.1 '@upstash/qstash': specifier: 2.6.2 version: 2.6.2 @@ -5129,8 +5129,8 @@ packages: peerDependencies: vue: '>=2.7 || >=3' - '@unkey/api@0.23.0': - resolution: {integrity: sha512-N4mFiIQdzBaqDGtBZ70y8d7rNeRgi2iEWac7BgTsiflx12BfMHWd4oMglmUJ4uqHNmNqm3yNVSih7BY24H5K8g==} + '@unkey/api@0.26.1': + resolution: {integrity: sha512-WSYOeZjGbFkO9yA4UsNS6NjprUF9OAYIlBHN/7iRUaFBq+PL502Qe10xNwiwoppYhW6PnrCFobW92vrkjHTcjA==} '@unkey/error@0.2.0': resolution: {integrity: sha512-DFGb4A7SrusZPP0FYuRIF0CO+Gi4etLUAEJ6EKc+TKYmscL0nEJ2Pr38FyX9MvjI4Wx5l35Wc9KsBjMm9Ybh7w==} @@ -14987,7 +14987,7 @@ snapshots: unhead: 1.9.15 vue: 3.4.31(typescript@5.7.2) - '@unkey/api@0.23.0': + '@unkey/api@0.26.1': dependencies: '@unkey/rbac': 0.3.1 -- knotmirror 0.0.1