Ryan/documenso
1
0
Fork 1
mirror of https://github.com/documenso/documenso.git synced 2025-11-23 05:01:54 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix: wip

Browse Source
This commit is contained in:
David Nguyen
2025-02-07 00:58:50 +11:00
parent e5cc6455dd
commit 8373af3f41
34 changed files with 193 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/remix/app/routes/_recipient+/_layout.tsx
View File

@ -1,6 +1,7 @@
import { Trans } from '@lingui/macro';
import { ChevronLeft } from 'lucide-react';
import { Link, Outlet } from 'react-router';
import { getOptionalLoaderSession } from 'server/utils/get-loader-session';
import { Button } from '@documenso/ui/primitives/button';
@ -8,10 +9,12 @@ import { Header as AuthenticatedHeader } from '~/components/general/app-header';
import type { Route } from './+types/_layout';
export function loader({ context }: Route.LoaderArgs) {
export function loader() {
const session = getOptionalLoaderSession();
return {
user: context.session?.user,
teams: context.session?.teams || [],
user: session?.user,
teams: session?.teams || [],
};
}

8
apps/remix/app/routes/_recipient+/d.$token+/_index.tsx
View File

@ -1,6 +1,7 @@
import { Plural } from '@lingui/macro';
import { UsersIcon } from 'lucide-react';
import { redirect } from 'react-router';
import { getOptionalLoaderSession } from 'server/utils/get-loader-session';
import { match } from 'ts-pattern';
import { useOptionalSession } from '@documenso/lib/client-only/providers/session';
@ -16,7 +17,9 @@ import { superLoaderJson, useSuperLoaderData } from '~/utils/super-json-loader';
import type { Route } from './+types/_index';
export async function loader({ params, context }: Route.LoaderArgs) {
export async function loader({ params }: Route.LoaderArgs) {
const session = getOptionalLoaderSession();
const { token } = params;
if (!token) {
@ -45,7 +48,7 @@ export async function loader({ params, context }: Route.LoaderArgs) {
// Ensure typesafety when we add more options.
const isAccessAuthValid = match(derivedRecipientAccessAuth)
.with(DocumentAccessAuth.ACCOUNT, () => context.session?.user !== null)
.with(DocumentAccessAuth.ACCOUNT, () => session?.user !== null)
.with(null, () => true)
.exhaustive();
@ -67,6 +70,7 @@ export default function DirectTemplatePage() {
const data = useSuperLoaderData<typeof loader>();
// Should not be possible for directLink to be null.
if (!data.isAccessAuthValid) {
return <DirectTemplateAuthPageView />;
}

7
apps/remix/app/routes/_recipient+/sign.$token+/_index.tsx
View File

@ -2,6 +2,7 @@ import { Trans } from '@lingui/macro';
import { DocumentStatus, SigningStatus } from '@prisma/client';
import { Clock8 } from 'lucide-react';
import { Link, redirect } from 'react-router';
import { getOptionalLoaderSession } from 'server/utils/get-loader-session';
import signingCelebration from '@documenso/assets/images/signing-celebration.png';
import { useOptionalSession } from '@documenso/lib/client-only/providers/session';
@ -25,14 +26,16 @@ import { superLoaderJson, useSuperLoaderData } from '~/utils/super-json-loader';
import type { Route } from './+types/_index';
export async function loader({ params, context }: Route.LoaderArgs) {
export async function loader({ params }: Route.LoaderArgs) {
const session = getOptionalLoaderSession();
const { token } = params;
if (!token) {
throw new Response('Not Found', { status: 404 });
}
const user = context.session?.user;
const user = session?.user;
const [document, fields, recipient, completedFields] = await Promise.all([
getDocumentAndSenderByToken({

7
apps/remix/app/routes/_recipient+/sign.$token+/complete.tsx
View File

@ -3,6 +3,7 @@ import { useLingui } from '@lingui/react';
import { DocumentStatus, FieldType, RecipientRole } from '@prisma/client';
import { CheckCircle2, Clock8, FileSearch } from 'lucide-react';
import { Link } from 'react-router';
import { getOptionalLoaderSession } from 'server/utils/get-loader-session';
import { match } from 'ts-pattern';
import signingCelebration from '@documenso/assets/images/signing-celebration.png';
@ -27,14 +28,16 @@ import { DocumentSigningAuthPageView } from '~/components/general/document-signi
import type { Route } from './+types/complete';
export async function loader({ params, context }: Route.LoaderArgs) {
export async function loader({ params }: Route.LoaderArgs) {
const session = getOptionalLoaderSession();
const { token } = params;
if (!token) {
throw new Response('Not Found', { status: 404 });
}
const user = context.session?.user;
const user = session?.user;
const document = await getDocumentAndSenderByToken({
token,

7
apps/remix/app/routes/_recipient+/sign.$token+/rejected.tsx
View File

@ -2,6 +2,7 @@ import { Trans } from '@lingui/macro';
import { FieldType } from '@prisma/client';
import { XCircle } from 'lucide-react';
import { Link } from 'react-router';
import { getOptionalLoaderSession } from 'server/utils/get-loader-session';
import { useOptionalSession } from '@documenso/lib/client-only/providers/session';
import { getDocumentAndSenderByToken } from '@documenso/lib/server-only/document/get-document-by-token';
@ -16,14 +17,16 @@ import { truncateTitle } from '~/utils/truncate-title';
import type { Route } from './+types/rejected';
export async function loader({ params, context }: Route.LoaderArgs) {
export async function loader({ params }: Route.LoaderArgs) {
const session = getOptionalLoaderSession();
const { token } = params;
if (!token) {
throw new Response('Not Found', { status: 404 });
}
const user = context.session?.user;
const user = session?.user;
const document = await getDocumentAndSenderByToken({
token,

7
apps/remix/app/routes/_recipient+/sign.$token+/waiting.tsx
View File

@ -2,6 +2,7 @@ import { Trans } from '@lingui/macro';
import type { Team } from '@prisma/client';
import { DocumentStatus } from '@prisma/client';
import { Link, redirect } from 'react-router';
import { getOptionalLoaderSession } from 'server/utils/get-loader-session';
import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id';
import { getDocumentAndSenderByToken } from '@documenso/lib/server-only/document/get-document-by-token';
@ -12,7 +13,9 @@ import { Button } from '@documenso/ui/primitives/button';
import type { Route } from './+types/waiting';
export async function loader({ params, context }: Route.LoaderArgs) {
export async function loader({ params }: Route.LoaderArgs) {
const session = getOptionalLoaderSession();
const { token } = params;
if (!token) {
@ -34,7 +37,7 @@ export async function loader({ params, context }: Route.LoaderArgs) {
let isOwnerOrTeamMember = false;
const user = context.session?.user;
const user = session?.user;
let team: Team | null = null;
if (user) {