Ryan/documenso
1
0
Fork 1
mirror of https://github.com/documenso/documenso.git synced 2025-11-22 04:31:39 +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/_unauthenticated+/signin.tsx
View File

@ -1,5 +1,6 @@
import { Trans } from '@lingui/macro';
import { Link, redirect } from 'react-router';
import { getOptionalLoaderSession } from 'server/utils/get-loader-session';
import {
IS_GOOGLE_SSO_ENABLED,
@ -10,14 +11,14 @@ import { env } from '@documenso/lib/utils/env';
import { SignInForm } from '~/components/forms/signin';
import type { Route } from './+types/signin';
export function meta() {
return [{ title: 'Sign In' }];
}
export function loader({ context }: Route.LoaderArgs) {
if (context.session) {
export function loader() {
const session = getOptionalLoaderSession();
if (session) {
throw redirect('/documents');
}
}

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

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

7
apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
View File

@ -2,6 +2,7 @@ import { Trans } from '@lingui/macro';
import { TeamMemberInviteStatus } from '@prisma/client';
import { DateTime } from 'luxon';
import { Link } from 'react-router';
import { getOptionalLoaderSession } from 'server/utils/get-loader-session';
import { encryptSecondaryData } from '@documenso/lib/server-only/crypto/encrypt';
import { acceptTeamInvitation } from '@documenso/lib/server-only/team/accept-team-invitation';
@ -11,7 +12,9 @@ import { Button } from '@documenso/ui/primitives/button';
import type { Route } from './+types/team.invite.$token';
export async function loader({ params, context }: Route.LoaderArgs) {
export async function loader({ params }: Route.LoaderArgs) {
const session = getOptionalLoaderSession();
const { token } = params;
if (!token) {
@ -74,7 +77,7 @@ export async function loader({ params, context }: Route.LoaderArgs) {
} as const;
}
const isSessionUserTheInvitedUser = user.id === context.session?.user.id;
const isSessionUserTheInvitedUser = user.id === session?.user.id;
return {
state: 'Success',