This commit is contained in:
David Nguyen
2025-02-12 16:41:35 +11:00
parent 548d92c2fc
commit 15922d447b
70 changed files with 889 additions and 551 deletions

View File

@ -11,7 +11,7 @@ import {
TableRow,
} from '@documenso/ui/primitives/table';
import type { Route } from './+types/_index';
import type { Route } from './+types/subscriptions';
export async function loader() {
const subscriptions = await findSubscriptions();

View File

@ -6,7 +6,7 @@ import { findUsers } from '@documenso/lib/server-only/user/get-all-users';
import { AdminDashboardUsersTable } from '~/components/tables/admin-dashboard-users-table';
import type { Route } from './+types/users';
import type { Route } from './+types/users._index';
export async function loader({ request }: Route.LoaderArgs) {
const url = new URL(request.url);

View File

@ -137,7 +137,8 @@ export default function DocumentPage() {
const { recipients, documentData, documentMeta } = document;
const isDocumentHistoryEnabled = false; // Todo: Was flag
// This was a feature flag. Leave to false since it's not ready.
const isDocumentHistoryEnabled = false;
return (
<div className="mx-auto -mt-4 w-full max-w-screen-xl px-4 md:px-8">

View File

@ -60,7 +60,7 @@ export default function PublicProfilePage({ loaderData }: Route.ComponentProps)
const { _ } = useLingui();
const { toast } = useToast();
const user = useSession();
const { user } = useSession();
const team = useOptionalCurrentTeam();
const [isPublicProfileVisible, setIsPublicProfileVisible] = useState(profile.enabled);

View File

@ -2,8 +2,10 @@ import { msg } from '@lingui/core/macro';
import { useLingui } from '@lingui/react';
import { Trans } from '@lingui/react/macro';
import { Link } from 'react-router';
import { getLoaderSession } from 'server/utils/get-loader-session';
import { useSession } from '@documenso/lib/client-only/providers/session';
import { prisma } from '@documenso/prisma';
import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
import { Button } from '@documenso/ui/primitives/button';
@ -13,22 +15,46 @@ import { ViewRecoveryCodesDialog } from '~/components/forms/2fa/view-recovery-co
import { PasswordForm } from '~/components/forms/password';
import { SettingsHeader } from '~/components/general/settings-header';
import type { Route } from './+types';
export function meta() {
return [{ title: 'Security' }];
}
export default function SettingsSecurity() {
export async function loader() {
const { user } = getLoaderSession();
const accounts = await prisma.account.findMany({
where: {
userId: user.id,
},
select: {
provider: true,
},
});
const providers = accounts.map((account) => account.provider);
return {
providers,
};
}
export default function SettingsSecurity({ loaderData }: Route.ComponentProps) {
const { providers } = loaderData;
const { _ } = useLingui();
const { user } = useSession();
const hasEmailPasswordAccount = providers.includes('DOCUMENSO');
return (
<div>
<SettingsHeader
title={_(msg`Security`)}
subtitle={_(msg`Here you can manage your password and security settings.`)}
/>
{user.identityProvider === 'DOCUMENSO' && (
{hasEmailPasswordAccount && (
<>
<PasswordForm user={user} />
@ -46,7 +72,7 @@ export default function SettingsSecurity() {
</AlertTitle>
<AlertDescription className="mr-4">
{user.identityProvider === 'DOCUMENSO' ? (
{hasEmailPasswordAccount ? (
<Trans>
Add an authenticator to serve as a secondary authentication method when signing in,
or when signing documents.

View File

@ -1,7 +1,7 @@
import { msg } from '@lingui/core/macro';
import { useLingui } from '@lingui/react';
import { CreatePasskeyDialog } from '~/components/dialogs/create-passkey-dialog';
import { PasskeyCreateDialog } from '~/components/dialogs/passkey-create-dialog';
import { SettingsHeader } from '~/components/general/settings-header';
import { SettingsSecurityPasskeyTable } from '~/components/tables/settings-security-passkey-table';
@ -21,7 +21,7 @@ export default function SettingsPasskeys() {
subtitle={_(msg`Manage your passkeys.`)}
hideDivider={true}
>
<CreatePasskeyDialog />
<PasskeyCreateDialog />
</SettingsHeader>
<div className="mt-4">

View File

@ -59,10 +59,10 @@ export async function loader({ params }: Route.LoaderArgs) {
}
return superLoaderJson({
isAccessAuthValid: true as const,
isAccessAuthValid: true,
template,
directTemplateRecipient,
});
} as const);
}
export default function DirectTemplatePage() {