The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
fix: refactor token router (#1981)
David Nguyenb8d07fd1a640
diff --git a/apps/remix/app/components/dialogs/token-delete-dialog.tsx b/apps/remix/app/components/dialogs/token-delete-dialog.tsxindex aa557132b..bd20c2377 100644--- a/apps/remix/app/components/dialogs/token-delete-dialog.tsx+++ b/apps/remix/app/components/dialogs/token-delete-dialog.tsx@@ -56,7 +56,7 @@ export default function TokenDeleteDialog({ token, onDelete, children }: TokenDetype TDeleteTokenByIdMutationSchema = z.infer<typeof ZTokenDeleteDialogSchema>;- const { mutateAsync: deleteTokenMutation } = trpc.apiToken.deleteTokenById.useMutation({+ const { mutateAsync: deleteTokenMutation } = trpc.apiToken.delete.useMutation({onSuccess() {onDelete?.();},diff --git a/apps/remix/app/components/forms/token.tsx b/apps/remix/app/components/forms/token.tsxindex 13b7da0b1..1b8e4f3e3 100644--- a/apps/remix/app/components/forms/token.tsx+++ b/apps/remix/app/components/forms/token.tsx@@ -13,7 +13,7 @@ import type { z } from 'zod';import { useCopyToClipboard } from '@documenso/lib/client-only/hooks/use-copy-to-clipboard';import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';import { trpc } from '@documenso/trpc/react';-import { ZCreateTokenMutationSchema } from '@documenso/trpc/server/api-token-router/schema';+import { ZCreateApiTokenRequestSchema } from '@documenso/trpc/server/api-token-router/create-api-token.types';import { cn } from '@documenso/ui/lib/utils';import { Button } from '@documenso/ui/primitives/button';import { Card, CardContent } from '@documenso/ui/primitives/card';@@ -47,7 +47,7 @@ export const EXPIRATION_DATES = {ONE_YEAR: msg`12 months`,} as const;-const ZCreateTokenFormSchema = ZCreateTokenMutationSchema.pick({+const ZCreateTokenFormSchema = ZCreateApiTokenRequestSchema.pick({tokenName: true,expirationDate: true,});@@ -75,7 +75,7 @@ export const ApiTokenForm = ({ className, tokens }: ApiTokenFormProps) => {const [newlyCreatedToken, setNewlyCreatedToken] = useState<NewlyCreatedToken | null>();const [noExpirationDate, setNoExpirationDate] = useState(false);- const { mutateAsync: createTokenMutation } = trpc.apiToken.createToken.useMutation({+ const { mutateAsync: createTokenMutation } = trpc.apiToken.create.useMutation({onSuccess(data) {setNewlyCreatedToken(data);},diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsxindex 1d5f86bd5..584a71197 100644--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx@@ -21,7 +21,7 @@ export function meta() {export default function ApiTokensPage() {const { i18n } = useLingui();- const { data: tokens } = trpc.apiToken.getTokens.useQuery();+ const { data: tokens } = trpc.apiToken.getMany.useQuery();const team = useOptionalCurrentTeam();diff --git a/packages/lib/server-only/public-api/delete-api-token-by-id.ts b/packages/lib/server-only/public-api/delete-api-token-by-id.tsindex 751b08c4f..b7723dfd7 100644--- a/packages/lib/server-only/public-api/delete-api-token-by-id.ts+++ b/packages/lib/server-only/public-api/delete-api-token-by-id.ts@@ -25,7 +25,7 @@ export const deleteTokenById = async ({ id, userId, teamId }: DeleteTokenByIdOpt});}- return await prisma.apiToken.delete({+ await prisma.apiToken.delete({where: {id,teamId,diff --git a/packages/trpc/server/api-token-router/create-api-token.ts b/packages/trpc/server/api-token-router/create-api-token.tsnew file mode 100644index 000000000..6b8e665f8--- /dev/null+++ b/packages/trpc/server/api-token-router/create-api-token.ts@@ -0,0 +1,27 @@+import { createApiToken } from '@documenso/lib/server-only/public-api/create-api-token';++import { authenticatedProcedure } from '../trpc';+import {+ ZCreateApiTokenRequestSchema,+ ZCreateApiTokenResponseSchema,+} from './create-api-token.types';++export const createApiTokenRoute = authenticatedProcedure+ .input(ZCreateApiTokenRequestSchema)+ .output(ZCreateApiTokenResponseSchema)+ .mutation(async ({ input, ctx }) => {+ const { tokenName, teamId, expirationDate } = input;++ ctx.logger.info({+ input: {+ teamId,+ },+ });++ return await createApiToken({+ userId: ctx.user.id,+ teamId,+ tokenName,+ expiresIn: expirationDate,+ });+ });diff --git a/packages/trpc/server/api-token-router/create-api-token.types.ts b/packages/trpc/server/api-token-router/create-api-token.types.tsnew file mode 100644index 000000000..c73c65833--- /dev/null+++ b/packages/trpc/server/api-token-router/create-api-token.types.ts@@ -0,0 +1,12 @@+import { z } from 'zod';++export const ZCreateApiTokenRequestSchema = z.object({+ teamId: z.number(),+ tokenName: z.string().min(3, { message: 'The token name should be 3 characters or longer' }),+ expirationDate: z.string().nullable(),+});++export const ZCreateApiTokenResponseSchema = z.object({+ id: z.number(),+ token: z.string(),+});diff --git a/packages/trpc/server/api-token-router/delete-api-token.ts b/packages/trpc/server/api-token-router/delete-api-token.tsnew file mode 100644index 000000000..45fcc2dee--- /dev/null+++ b/packages/trpc/server/api-token-router/delete-api-token.ts@@ -0,0 +1,27 @@+import { deleteTokenById } from '@documenso/lib/server-only/public-api/delete-api-token-by-id';++import { authenticatedProcedure } from '../trpc';+import {+ ZDeleteApiTokenRequestSchema,+ ZDeleteApiTokenResponseSchema,+} from './delete-api-token.types';++export const deleteApiTokenRoute = authenticatedProcedure+ .input(ZDeleteApiTokenRequestSchema)+ .output(ZDeleteApiTokenResponseSchema)+ .mutation(async ({ input, ctx }) => {+ const { id, teamId } = input;++ ctx.logger.info({+ input: {+ id,+ teamId,+ },+ });++ await deleteTokenById({+ id,+ teamId,+ userId: ctx.user.id,+ });+ });diff --git a/packages/trpc/server/api-token-router/delete-api-token.types.ts b/packages/trpc/server/api-token-router/delete-api-token.types.tsnew file mode 100644index 000000000..7cf235fae--- /dev/null+++ b/packages/trpc/server/api-token-router/delete-api-token.types.ts@@ -0,0 +1,8 @@+import { z } from 'zod';++export const ZDeleteApiTokenRequestSchema = z.object({+ id: z.number().min(1),+ teamId: z.number(),+});++export const ZDeleteApiTokenResponseSchema = z.void();diff --git a/packages/trpc/server/api-token-router/get-api-tokens.ts b/packages/trpc/server/api-token-router/get-api-tokens.tsnew file mode 100644index 000000000..4473c8d42--- /dev/null+++ b/packages/trpc/server/api-token-router/get-api-tokens.ts@@ -0,0 +1,19 @@+import { getApiTokens } from '@documenso/lib/server-only/public-api/get-api-tokens';++import { authenticatedProcedure } from '../trpc';+import { ZGetApiTokensRequestSchema, ZGetApiTokensResponseSchema } from './get-api-tokens.types';++export const getApiTokensRoute = authenticatedProcedure+ .input(ZGetApiTokensRequestSchema)+ .output(ZGetApiTokensResponseSchema)+ .query(async ({ ctx }) => {+ const { teamId } = ctx;++ ctx.logger.info({+ input: {+ teamId,+ },+ });++ return await getApiTokens({ userId: ctx.user.id, teamId });+ });diff --git a/packages/trpc/server/api-token-router/get-api-tokens.types.ts b/packages/trpc/server/api-token-router/get-api-tokens.types.tsnew file mode 100644index 000000000..9e380bf9d--- /dev/null+++ b/packages/trpc/server/api-token-router/get-api-tokens.types.ts@@ -0,0 +1,16 @@+import { z } from 'zod';++import ApiTokenSchema from '@documenso/prisma/generated/zod/modelSchema/ApiTokenSchema';++export const ZGetApiTokensRequestSchema = z.void();++export const ZGetApiTokensResponseSchema = z.array(+ ApiTokenSchema.pick({+ id: true,+ name: true,+ createdAt: true,+ expires: true,+ }),+);++export type TGetApiTokensResponse = z.infer<typeof ZGetApiTokensResponseSchema>;diff --git a/packages/trpc/server/api-token-router/router.ts b/packages/trpc/server/api-token-router/router.tsindex f1439060c..8a17d5b66 100644--- a/packages/trpc/server/api-token-router/router.ts+++ b/packages/trpc/server/api-token-router/router.ts@@ -1,50 +1,10 @@-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 { getApiTokens } from '@documenso/lib/server-only/public-api/get-api-tokens';--import { authenticatedProcedure, router } from '../trpc';-import { ZCreateTokenMutationSchema, ZDeleteTokenByIdMutationSchema } from './schema';+import { router } from '../trpc';+import { createApiTokenRoute } from './create-api-token';+import { deleteApiTokenRoute } from './delete-api-token';+import { getApiTokensRoute } from './get-api-tokens';export const apiTokenRouter = router({- getTokens: authenticatedProcedure.query(async ({ ctx }) => {- return await getApiTokens({ userId: ctx.user.id, teamId: ctx.teamId });- }),-- createToken: authenticatedProcedure- .input(ZCreateTokenMutationSchema)- .mutation(async ({ input, ctx }) => {- const { tokenName, teamId, expirationDate } = input;-- ctx.logger.info({- input: {- teamId,- },- });-- return await createApiToken({- userId: ctx.user.id,- teamId,- tokenName,- expiresIn: expirationDate,- });- }),-- deleteTokenById: authenticatedProcedure- .input(ZDeleteTokenByIdMutationSchema)- .mutation(async ({ input, ctx }) => {- const { id, teamId } = input;-- ctx.logger.info({- input: {- id,- teamId,- },- });-- return await deleteTokenById({- id,- teamId,- userId: ctx.user.id,- });- }),+ create: createApiTokenRoute,+ getMany: getApiTokensRoute,+ delete: deleteApiTokenRoute,});diff --git a/packages/trpc/server/api-token-router/schema.ts b/packages/trpc/server/api-token-router/schema.tsdeleted file mode 100644index 85c41d956..000000000--- a/packages/trpc/server/api-token-router/schema.ts+++ /dev/null@@ -1,16 +0,0 @@-import { z } from 'zod';--export const ZCreateTokenMutationSchema = z.object({- teamId: z.number(),- tokenName: z.string().min(3, { message: 'The token name should be 3 characters or longer' }),- expirationDate: z.string().nullable(),-});--export type TCreateTokenMutationSchema = z.infer<typeof ZCreateTokenMutationSchema>;--export const ZDeleteTokenByIdMutationSchema = z.object({- id: z.number().min(1),- teamId: z.number(),-});--export type TDeleteTokenByIdMutationSchema = z.infer<typeof ZDeleteTokenByIdMutationSchema>;