The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
fix: update teams API tokens logic
David Nguyen991ce5ff4610
diff --git a/apps/remix/app/components/dialogs/token-delete-dialog.tsx b/apps/remix/app/components/dialogs/token-delete-dialog.tsxindex 8b373d370..511ce04db 100644--- a/apps/remix/app/components/dialogs/token-delete-dialog.tsx+++ b/apps/remix/app/components/dialogs/token-delete-dialog.tsx@@ -30,22 +30,20 @@ import {import { Input } from '@documenso/ui/primitives/input';import { useToast } from '@documenso/ui/primitives/use-toast';+import { useOptionalCurrentTeam } from '~/providers/team';+export type TokenDeleteDialogProps = {- teamId?: number;token: Pick<ApiToken, 'id' | 'name'>;onDelete?: () => void;children?: React.ReactNode;};-export default function TokenDeleteDialog({- teamId,- token,- onDelete,- children,-}: TokenDeleteDialogProps) {+export default function TokenDeleteDialog({ token, onDelete, children }: TokenDeleteDialogProps) {const { _ } = useLingui();const { toast } = useToast();+ const team = useOptionalCurrentTeam();+const [isOpen, setIsOpen] = useState(false);const deleteMessage = _(msg`delete ${token.name}`);@@ -75,7 +73,7 @@ export default function TokenDeleteDialog({try {await deleteTokenMutation({id: token.id,- teamId,+ teamId: team?.id,});toast({diff --git a/apps/remix/app/components/forms/token.tsx b/apps/remix/app/components/forms/token.tsxindex 41ce41bf3..d7bec0cba 100644--- a/apps/remix/app/components/forms/token.tsx+++ b/apps/remix/app/components/forms/token.tsx@@ -1,4 +1,4 @@-import { useState, useTransition } from 'react';+import { useState } from 'react';import { zodResolver } from '@hookform/resolvers/zod';import { msg } from '@lingui/core/macro';@@ -38,6 +38,8 @@ import {import { Switch } from '@documenso/ui/primitives/switch';import { useToast } from '@documenso/ui/primitives/use-toast';+import { useOptionalCurrentTeam } from '~/providers/team';+export const EXPIRATION_DATES = {ONE_WEEK: msg`7 days`,ONE_MONTH: msg`1 month`,@@ -59,15 +61,14 @@ type NewlyCreatedToken = {export type ApiTokenFormProps = {className?: string;- teamId?: number;tokens?: Pick<ApiToken, 'id'>[];};-export const ApiTokenForm = ({ className, teamId, tokens }: ApiTokenFormProps) => {- const [isTransitionPending, startTransition] = useTransition();-+export const ApiTokenForm = ({ className, tokens }: ApiTokenFormProps) => {const [, copy] = useCopyToClipboard();+ const team = useOptionalCurrentTeam();+const { _ } = useLingui();const { toast } = useToast();@@ -113,7 +114,7 @@ export const ApiTokenForm = ({ className, teamId, tokens }: ApiTokenFormProps) =const onSubmit = async ({ tokenName, expirationDate }: TCreateTokenMutationSchema) => {try {await createTokenMutation({- teamId,+ teamId: team?.id,tokenName,expirationDate: noExpirationDate ? null : expirationDate,});@@ -238,7 +239,7 @@ export const ApiTokenForm = ({ className, teamId, tokens }: ApiTokenFormProps) =type="submit"className="hidden md:inline-flex"disabled={!form.formState.isDirty}- loading={form.formState.isSubmitting || isTransitionPending}+ loading={form.formState.isSubmitting}><Trans>Create token</Trans></Button>@@ -247,7 +248,7 @@ export const ApiTokenForm = ({ className, teamId, tokens }: ApiTokenFormProps) =<Buttontype="submit"disabled={!form.formState.isDirty}- loading={form.formState.isSubmitting || isTransitionPending}+ loading={form.formState.isSubmitting}><Trans>Create token</Trans></Button>diff --git a/apps/remix/app/components/general/settings-header.tsx b/apps/remix/app/components/general/settings-header.tsxindex 6f5ae28bc..06de2ff24 100644--- a/apps/remix/app/components/general/settings-header.tsx+++ b/apps/remix/app/components/general/settings-header.tsx@@ -3,8 +3,8 @@ import React from 'react';import { cn } from '@documenso/ui/lib/utils';export type SettingsHeaderProps = {- title: string;- subtitle: string;+ title: string | React.ReactNode;+ subtitle: string | React.ReactNode;hideDivider?: boolean;children?: React.ReactNode;className?: string;diff --git a/apps/remix/app/routes/_authenticated+/settings+/tokens+/index.tsx b/apps/remix/app/routes/_authenticated+/settings+/tokens+/index.tsxindex dcf6bd7d8..bb7c114b1 100644--- a/apps/remix/app/routes/_authenticated+/settings+/tokens+/index.tsx+++ b/apps/remix/app/routes/_authenticated+/settings+/tokens+/index.tsx@@ -1,90 +1,115 @@import { useLingui } from '@lingui/react';import { Trans } from '@lingui/react/macro';+import { TeamMemberRole } from '@prisma/client';import { DateTime } from 'luxon';import { trpc } from '@documenso/trpc/react';+import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';+import { AlertTitle } from '@documenso/ui/primitives/alert';import { Button } from '@documenso/ui/primitives/button';import TokenDeleteDialog from '~/components/dialogs/token-delete-dialog';import { ApiTokenForm } from '~/components/forms/token';+import { SettingsHeader } from '~/components/general/settings-header';+import { useOptionalCurrentTeam } from '~/providers/team';export default function ApiTokensPage() {const { i18n } = useLingui();const { data: tokens } = trpc.apiToken.getTokens.useQuery();+ const team = useOptionalCurrentTeam();+return (<div>- <h3 className="text-2xl font-semibold">- <Trans>API Tokens</Trans>- </h3>-- <p className="text-muted-foreground mt-2 text-sm">- <Trans>- On this page, you can create new API tokens and manage the existing ones. <br />- Also see our{' '}- <a- className="text-primary underline"- href={'https://docs.documenso.com/developers/public-api'}- target="_blank"- >- Documentation- </a>- .- </Trans>- </p>-- <hr className="my-4" />+ <SettingsHeader+ title={<Trans>API Tokens</Trans>}+ subtitle={+ <Trans>+ On this page, you can create and manage API tokens. See our{' '}+ <a+ className="text-primary underline"+ href={'https://docs.documenso.com/developers/public-api'}+ target="_blank"+ >+ Documentation+ </a>{' '}+ for more information.+ </Trans>+ }+ />- <ApiTokenForm className="max-w-xl" tokens={tokens} />+ {team && team?.currentTeamMember.role !== TeamMemberRole.ADMIN ? (+ <Alert+ className="flex flex-col items-center justify-between gap-4 p-6 md:flex-row"+ variant="warning"+ >+ <div>+ <AlertTitle>+ <Trans>Unauthorized</Trans>+ </AlertTitle>+ <AlertDescription className="mr-2">+ <Trans>You need to be an admin to manage API tokens.</Trans>+ </AlertDescription>+ </div>+ </Alert>+ ) : (+ <>+ <ApiTokenForm className="max-w-xl" tokens={tokens} />- <hr className="mb-4 mt-8" />+ <hr className="mb-4 mt-8" />- <h4 className="text-xl font-medium">- <Trans>Your existing tokens</Trans>- </h4>+ <h4 className="text-xl font-medium">+ <Trans>Your existing tokens</Trans>+ </h4>- {tokens && tokens.length === 0 && (- <div className="mb-4">- <p className="text-muted-foreground mt-2 text-sm italic">- <Trans>Your tokens will be shown here once you create them.</Trans>- </p>- </div>- )}+ {tokens && tokens.length === 0 && (+ <div className="mb-4">+ <p className="text-muted-foreground mt-2 text-sm italic">+ <Trans>Your tokens will be shown here once you create them.</Trans>+ </p>+ </div>+ )}- {tokens && tokens.length > 0 && (- <div className="mt-4 flex max-w-xl flex-col gap-y-4">- {tokens.map((token) => (- <div key={token.id} className="border-border rounded-lg border p-4">- <div className="flex items-center justify-between gap-x-4">- <div>- <h5 className="text-base">{token.name}</h5>+ {tokens && tokens.length > 0 && (+ <div className="mt-4 flex max-w-xl flex-col gap-y-4">+ {tokens.map((token) => (+ <div key={token.id} className="border-border rounded-lg border p-4">+ <div className="flex items-center justify-between gap-x-4">+ <div>+ <h5 className="text-base">{token.name}</h5>- <p className="text-muted-foreground mt-2 text-xs">- <Trans>Created on {i18n.date(token.createdAt, DateTime.DATETIME_FULL)}</Trans>- </p>- {token.expires ? (- <p className="text-muted-foreground mt-1 text-xs">- <Trans>Expires on {i18n.date(token.expires, DateTime.DATETIME_FULL)}</Trans>- </p>- ) : (- <p className="text-muted-foreground mt-1 text-xs">- <Trans>Token doesn't have an expiration date</Trans>- </p>- )}- </div>+ <p className="text-muted-foreground mt-2 text-xs">+ <Trans>+ Created on {i18n.date(token.createdAt, DateTime.DATETIME_FULL)}+ </Trans>+ </p>+ {token.expires ? (+ <p className="text-muted-foreground mt-1 text-xs">+ <Trans>+ Expires on {i18n.date(token.expires, DateTime.DATETIME_FULL)}+ </Trans>+ </p>+ ) : (+ <p className="text-muted-foreground mt-1 text-xs">+ <Trans>Token doesn't have an expiration date</Trans>+ </p>+ )}+ </div>- <div>- <TokenDeleteDialog token={token}>- <Button variant="destructive">- <Trans>Delete</Trans>- </Button>- </TokenDeleteDialog>+ <div>+ <TokenDeleteDialog token={token}>+ <Button variant="destructive">+ <Trans>Delete</Trans>+ </Button>+ </TokenDeleteDialog>+ </div>+ </div></div>- </div>+ ))}</div>- ))}- </div>+ )}+ </>)}</div>);diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings+/tokens.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings+/tokens.tsxindex e2c07c59b..8e9c9e1b7 100644--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings+/tokens.tsx+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings+/tokens.tsx@@ -1,126 +1,3 @@-import { useLingui } from '@lingui/react';-import { Trans } from '@lingui/react/macro';-import { DateTime } from 'luxon';+import ApiTokensPage from '~/routes/_authenticated+/settings+/tokens+/index';-import { getSession } from '@documenso/auth/server/lib/utils/get-session';-import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';-import { getTeamTokens } from '@documenso/lib/server-only/public-api/get-all-team-tokens';-import { getTeamByUrl } from '@documenso/lib/server-only/team/get-team';-import { Button } from '@documenso/ui/primitives/button';--import TokenDeleteDialog from '~/components/dialogs/token-delete-dialog';-import { ApiTokenForm } from '~/components/forms/token';--import type { Route } from './+types/tokens';--// Todo: This can be optimized.-export async function loader({ request, params }: Route.LoaderArgs) {- const { user } = await getSession(request);-- const team = await getTeamByUrl({- userId: user.id,- teamUrl: params.teamUrl,- });-- const tokens = await getTeamTokens({ userId: user.id, teamId: team.id }).catch(() => null);-- return {- user,- team,- tokens,- };-}--export default function ApiTokensPage({ loaderData }: Route.ComponentProps) {- const { i18n } = useLingui();-- const { team, tokens } = loaderData;-- if (!tokens) {- return (- <div>- <h3 className="text-2xl font-semibold">- <Trans>API Tokens</Trans>- </h3>- <p className="text-muted-foreground mt-2 text-sm">- <Trans>Something went wrong.</Trans>- </p>- </div>- );- }-- return (- <div>- <h3 className="text-2xl font-semibold">- <Trans>API Tokens</Trans>- </h3>-- <p className="text-muted-foreground mt-2 text-sm">- <Trans>- On this page, you can create new API tokens and manage the existing ones. <br />- You can view our swagger docs{' '}- <a- className="text-primary underline"- href={`${NEXT_PUBLIC_WEBAPP_URL()}/api/v1/openapi`}- target="_blank"- >- here- </a>- </Trans>- </p>-- <hr className="my-4" />-- <ApiTokenForm className="max-w-xl" teamId={team.id} tokens={tokens} />-- <hr className="mb-4 mt-8" />-- <h4 className="text-xl font-medium">- <Trans>Your existing tokens</Trans>- </h4>-- {tokens.length === 0 && (- <div className="mb-4">- <p className="text-muted-foreground mt-2 text-sm italic">- <Trans>Your tokens will be shown here once you create them.</Trans>- </p>- </div>- )}-- {tokens.length > 0 && (- <div className="mt-4 flex max-w-xl flex-col gap-y-4">- {tokens.map((token) => (- <div key={token.id} className="border-border rounded-lg border p-4">- <div className="flex items-center justify-between gap-x-4">- <div>- <h5 className="text-base">{token.name}</h5>-- <p className="text-muted-foreground mt-2 text-xs">- <Trans>Created on {i18n.date(token.createdAt, DateTime.DATETIME_FULL)}</Trans>- </p>- {token.expires ? (- <p className="text-muted-foreground mt-1 text-xs">- <Trans>Expires on {i18n.date(token.expires, DateTime.DATETIME_FULL)}</Trans>- </p>- ) : (- <p className="text-muted-foreground mt-1 text-xs">- <Trans>Token doesn't have an expiration date</Trans>- </p>- )}- </div>-- <div>- <TokenDeleteDialog token={token} teamId={team.id}>- <Button variant="destructive">- <Trans>Delete</Trans>- </Button>- </TokenDeleteDialog>- </div>- </div>- </div>- ))}- </div>- )}- </div>- );-}+export default ApiTokensPage;diff --git a/packages/api/v1/openapi.ts b/packages/api/v1/openapi.tsindex 55ec4d7fd..293395b18 100644--- a/packages/api/v1/openapi.ts+++ b/packages/api/v1/openapi.ts@@ -1,5 +1,7 @@import { generateOpenApi } from '@ts-rest/open-api';+import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';+import { ApiContractV1 } from './contract';export const OpenAPIV1 = Object.assign(@@ -11,6 +13,11 @@ export const OpenAPIV1 = Object.assign(version: '1.0.0',description: 'The Documenso API for retrieving, creating, updating and deleting documents.',},+ servers: [+ {+ url: NEXT_PUBLIC_WEBAPP_URL(),+ },+ ],},{setOperationId: true,diff --git a/packages/lib/server-only/public-api/get-all-team-tokens.ts b/packages/lib/server-only/public-api/get-all-team-tokens.tsdeleted file mode 100644index b04d947be..000000000--- a/packages/lib/server-only/public-api/get-all-team-tokens.ts+++ /dev/null@@ -1,42 +0,0 @@-import { TeamMemberRole } from '@prisma/client';--import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';-import { prisma } from '@documenso/prisma';--export type GetUserTokensOptions = {- userId: number;- teamId: number;-};--export type GetTeamTokensResponse = Awaited<ReturnType<typeof getTeamTokens>>;--export const getTeamTokens = async ({ userId, teamId }: GetUserTokensOptions) => {- const teamMember = await prisma.teamMember.findFirst({- where: {- userId,- teamId,- },- });-- if (teamMember?.role !== TeamMemberRole.ADMIN) {- throw new AppError(AppErrorCode.UNAUTHORIZED, {- message: 'You do not have the required permissions to view this page.',- });- }-- return await prisma.apiToken.findMany({- where: {- teamId,- },- select: {- id: true,- name: true,- algorithm: true,- createdAt: true,- expires: true,- },- orderBy: {- createdAt: 'desc',- },- });-};diff --git a/packages/lib/server-only/public-api/get-all-user-tokens.ts b/packages/lib/server-only/public-api/get-all-user-tokens.tsdeleted file mode 100644index 5561a308f..000000000--- a/packages/lib/server-only/public-api/get-all-user-tokens.ts+++ /dev/null@@ -1,24 +0,0 @@-import { prisma } from '@documenso/prisma';--export type GetUserTokensOptions = {- userId: number;-};--export const getUserTokens = async ({ userId }: GetUserTokensOptions) => {- return await prisma.apiToken.findMany({- where: {- userId,- teamId: null,- },- select: {- id: true,- name: true,- algorithm: true,- createdAt: true,- expires: true,- },- orderBy: {- createdAt: 'desc',- },- });-};diff --git a/packages/lib/server-only/public-api/get-api-tokens.ts b/packages/lib/server-only/public-api/get-api-tokens.tsnew file mode 100644index 000000000..075aa15a1--- /dev/null+++ b/packages/lib/server-only/public-api/get-api-tokens.ts@@ -0,0 +1,39 @@+import { prisma } from '@documenso/prisma';+import { TeamMemberRole } from '@documenso/prisma/client';++export type GetApiTokensOptions = {+ userId: number;+ teamId?: number;+};++export const getApiTokens = async ({ userId, teamId }: GetApiTokensOptions) => {+ return await prisma.apiToken.findMany({+ where: {+ ...(teamId+ ? {+ team: {+ id: teamId,+ members: {+ some: {+ userId,+ role: TeamMemberRole.ADMIN,+ },+ },+ },+ }+ : {+ userId,+ teamId: null,+ }),+ },+ select: {+ id: true,+ name: true,+ createdAt: true,+ expires: true,+ },+ orderBy: {+ createdAt: 'desc',+ },+ });+};diff --git a/packages/trpc/server/api-token-router/router.ts b/packages/trpc/server/api-token-router/router.tsindex eae15f1e3..de4cb4138 100644--- a/packages/trpc/server/api-token-router/router.ts+++ b/packages/trpc/server/api-token-router/router.ts@@ -1,7 +1,7 @@import { createApiToken } from '@documenso/lib/server-only/public-api/create-api-token';import { deleteTokenById } from '@documenso/lib/server-only/public-api/delete-api-token-by-id';-import { getUserTokens } from '@documenso/lib/server-only/public-api/get-all-user-tokens';import { getApiTokenById } from '@documenso/lib/server-only/public-api/get-api-token-by-id';+import { getApiTokens } from '@documenso/lib/server-only/public-api/get-api-tokens';import { authenticatedProcedure, router } from '../trpc';import {@@ -12,7 +12,7 @@ import {export const apiTokenRouter = router({getTokens: authenticatedProcedure.query(async ({ ctx }) => {- return await getUserTokens({ userId: ctx.user.id });+ return await getApiTokens({ userId: ctx.user.id, teamId: ctx.teamId });}),getTokenById: authenticatedProcedure