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

fix: rework sessions

Browse Source
This commit is contained in:
David Nguyen
2025-02-17 22:46:36 +11:00
parent 1ed1cb0773
commit 5fc724b247
57 changed files with 1512 additions and 1446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
View File

@ -2,8 +2,8 @@ import { Trans } from '@lingui/react/macro';
import { TeamMemberInviteStatus } from '@prisma/client';
import { DateTime } from 'luxon';
import { Link } from 'react-router';
import { getOptionalLoaderSession } from 'server/utils/get-loader-session';
import { getOptionalSession } from '@documenso/auth/server/lib/utils/get-session';
import { encryptSecondaryData } from '@documenso/lib/server-only/crypto/encrypt';
import { declineTeamInvitation } from '@documenso/lib/server-only/team/decline-team-invitation';
import { getTeamById } from '@documenso/lib/server-only/team/get-team';
@ -12,8 +12,8 @@ import { Button } from '@documenso/ui/primitives/button';
import type { Route } from './+types/team.decline.$token';
export async function loader({ params }: Route.LoaderArgs) {
const session = getOptionalLoaderSession();
export async function loader({ params, request }: Route.LoaderArgs) {
const session = await getOptionalSession(request);
const { token } = params;
@ -74,7 +74,7 @@ export async function loader({ params }: Route.LoaderArgs) {
} as const;
}
const isSessionUserTheInvitedUser = user.id === session?.user.id;
const isSessionUserTheInvitedUser = user.id === session?.user?.id;
return {
state: 'Success',