-
{document.title}
-
+ {envelope.title}
+
- {document.deletedAt && (
+ {envelope.deletedAt && (
Deleted
@@ -81,11 +88,11 @@ export default function AdminDocumentDetailsPage({ loaderData }: Route.Component
- Created on: {i18n.date(document.createdAt, DateTime.DATETIME_MED)}
+ Created on: {i18n.date(envelope.createdAt, DateTime.DATETIME_MED)}
- Last updated at: {i18n.date(document.updatedAt, DateTime.DATETIME_MED)}
+ Last updated at: {i18n.date(envelope.updatedAt, DateTime.DATETIME_MED)}
@@ -102,12 +109,12 @@ export default function AdminDocumentDetailsPage({ loaderData }: Route.Component
@@ -123,7 +130,7 @@ export default function AdminDocumentDetailsPage({ loaderData }: Route.Component
@@ -136,7 +143,7 @@ export default function AdminDocumentDetailsPage({ loaderData }: Route.Component
- {document.recipients.map((recipient) => (
+ {envelope.recipients.map((recipient) => (
- {document && }
+
+
+
+
+ {envelope && }
);
}
diff --git a/apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx b/apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
index 35640b28e..0504fed76 100644
--- a/apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
+++ b/apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
@@ -33,7 +33,7 @@ export default function AdminDocumentsPage() {
const perPage = searchParams?.get?.('perPage') ? Number(searchParams.get('perPage')) : undefined;
const { data: findDocumentsData, isPending: isFindDocumentsLoading } =
- trpc.admin.findDocuments.useQuery(
+ trpc.admin.document.find.useQuery(
{
query: debouncedTerm,
page: page || 1,
@@ -64,7 +64,7 @@ export default function AdminDocumentsPage() {
cell: ({ row }) => {
return (
{row.original.title}
diff --git a/apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx b/apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
index 0a93d2d66..5aa188895 100644
--- a/apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+++ b/apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
@@ -71,6 +71,23 @@ export default function OrganisationGroupSettingsPage({ params }: Route.Componen
},
});
+ const { mutateAsync: promoteToOwner, isPending: isPromotingToOwner } =
+ trpc.admin.organisationMember.promoteToOwner.useMutation({
+ onSuccess: () => {
+ toast({
+ title: t`Success`,
+ description: t`Member promoted to owner successfully`,
+ });
+ },
+ onError: () => {
+ toast({
+ title: t`Error`,
+ description: t`We couldn't promote the member to owner. Please try again.`,
+ variant: 'destructive',
+ });
+ },
+ });
+
const teamsColumns = useMemo(() => {
return [
{
@@ -101,6 +118,26 @@ export default function OrganisationGroupSettingsPage({ params }: Route.Componen
{row.original.user.email}
),
},
+ {
+ header: t`Actions`,
+ cell: ({ row }) => (
+
+
+
+ ),
+ },
] satisfies DataTableColumnDef
[];
}, [organisation]);
diff --git a/apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx b/apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
index fb05128a6..3cd0f5853 100644
--- a/apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+++ b/apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
@@ -2,14 +2,14 @@ import { zodResolver } from '@hookform/resolvers/zod';
import { msg } from '@lingui/core/macro';
import { useLingui } from '@lingui/react';
import { Trans } from '@lingui/react/macro';
-import type { User } from '@prisma/client';
import { useForm } from 'react-hook-form';
import { useRevalidator } from 'react-router';
import { Link } from 'react-router';
import type { z } from 'zod';
import { trpc } from '@documenso/trpc/react';
-import { ZAdminUpdateProfileMutationSchema } from '@documenso/trpc/server/admin-router/schema';
+import type { TGetUserResponse } from '@documenso/trpc/server/admin-router/get-user.types';
+import { ZUpdateUserRequestSchema } from '@documenso/trpc/server/admin-router/update-user.types';
import { Button } from '@documenso/ui/primitives/button';
import {
Form,
@@ -27,17 +27,18 @@ import { AdminOrganisationCreateDialog } from '~/components/dialogs/admin-organi
import { AdminUserDeleteDialog } from '~/components/dialogs/admin-user-delete-dialog';
import { AdminUserDisableDialog } from '~/components/dialogs/admin-user-disable-dialog';
import { AdminUserEnableDialog } from '~/components/dialogs/admin-user-enable-dialog';
+import { AdminUserResetTwoFactorDialog } from '~/components/dialogs/admin-user-reset-two-factor-dialog';
import { GenericErrorLayout } from '~/components/general/generic-error-layout';
import { AdminOrganisationsTable } from '~/components/tables/admin-organisations-table';
import { MultiSelectRoleCombobox } from '../../../components/general/multiselect-role-combobox';
-const ZUserFormSchema = ZAdminUpdateProfileMutationSchema.omit({ id: true });
+const ZUserFormSchema = ZUpdateUserRequestSchema.omit({ id: true });
type TUserFormSchema = z.infer;
export default function UserPage({ params }: { params: { id: number } }) {
- const { data: user, isLoading: isLoadingUser } = trpc.profile.getUser.useQuery(
+ const { data: user, isLoading: isLoadingUser } = trpc.admin.user.get.useQuery(
{
id: Number(params.id),
},
@@ -77,14 +78,14 @@ export default function UserPage({ params }: { params: { id: number } }) {
return ;
}
-const AdminUserPage = ({ user }: { user: User }) => {
+const AdminUserPage = ({ user }: { user: TGetUserResponse }) => {
const { _ } = useLingui();
const { toast } = useToast();
const { revalidate } = useRevalidator();
const roles = user.roles ?? [];
- const { mutateAsync: updateUserMutation } = trpc.admin.updateUser.useMutation();
+ const { mutateAsync: updateUserMutation } = trpc.admin.user.update.useMutation();
const form = useForm({
resolver: zodResolver(ZUserFormSchema),
@@ -219,10 +220,11 @@ const AdminUserPage = ({ user }: { user: User }) => {
/>
-
- {user &&
}
+
+ {user && user.twoFactorEnabled &&
}
{user && user.disabled &&
}
{user && !user.disabled &&
}
+ {user &&
}
);
diff --git a/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx b/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
index 87326a5fa..1ef247147 100644
--- a/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+++ b/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
@@ -6,6 +6,7 @@ import {
GroupIcon,
MailboxIcon,
Settings2Icon,
+ ShieldCheckIcon,
Users2Icon,
} from 'lucide-react';
import { FaUsers } from 'react-icons/fa6';
@@ -77,6 +78,11 @@ export default function SettingsLayout() {
label: t`Groups`,
icon: GroupIcon,
},
+ {
+ path: `/o/${organisation.url}/settings/sso`,
+ label: t`SSO`,
+ icon: ShieldCheckIcon,
+ },
{
path: `/o/${organisation.url}/settings/billing`,
label: t`Billing`,
@@ -94,6 +100,13 @@ export default function SettingsLayout() {
return false;
}
+ if (
+ (!isBillingEnabled || !organisation.organisationClaim.flags.authenticationPortal) &&
+ route.path.includes('/sso')
+ ) {
+ return false;
+ }
+
return true;
});
diff --git a/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.sso.tsx b/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.sso.tsx
new file mode 100644
index 000000000..db6b7c38d
--- /dev/null
+++ b/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.sso.tsx
@@ -0,0 +1,432 @@
+import { zodResolver } from '@hookform/resolvers/zod';
+import { msg } from '@lingui/core/macro';
+import { Trans, useLingui } from '@lingui/react/macro';
+import { OrganisationMemberRole } from '@prisma/client';
+import { useForm } from 'react-hook-form';
+import { z } from 'zod';
+
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
+import { ORGANISATION_MEMBER_ROLE_HIERARCHY } from '@documenso/lib/constants/organisations';
+import { ORGANISATION_MEMBER_ROLE_MAP } from '@documenso/lib/constants/organisations-translations';
+import {
+ formatOrganisationCallbackUrl,
+ formatOrganisationLoginUrl,
+} from '@documenso/lib/utils/organisation-authentication-portal';
+import { trpc } from '@documenso/trpc/react';
+import { domainRegex } from '@documenso/trpc/server/enterprise-router/create-organisation-email-domain.types';
+import type { TGetOrganisationAuthenticationPortalResponse } from '@documenso/trpc/server/enterprise-router/get-organisation-authentication-portal.types';
+import { ZUpdateOrganisationAuthenticationPortalRequestSchema } from '@documenso/trpc/server/enterprise-router/update-organisation-authentication-portal.types';
+import { CopyTextButton } from '@documenso/ui/components/common/copy-text-button';
+import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
+import { Button } from '@documenso/ui/primitives/button';
+import {
+ Form,
+ FormControl,
+ FormField,
+ FormItem,
+ FormLabel,
+ FormMessage,
+} from '@documenso/ui/primitives/form/form';
+import { Input } from '@documenso/ui/primitives/input';
+import { Label } from '@documenso/ui/primitives/label';
+import {
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+} from '@documenso/ui/primitives/select';
+import { SpinnerBox } from '@documenso/ui/primitives/spinner';
+import { Switch } from '@documenso/ui/primitives/switch';
+import { Textarea } from '@documenso/ui/primitives/textarea';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+import { SettingsHeader } from '~/components/general/settings-header';
+import { appMetaTags } from '~/utils/meta';
+
+const ZProviderFormSchema = ZUpdateOrganisationAuthenticationPortalRequestSchema.shape.data
+ .pick({
+ enabled: true,
+ wellKnownUrl: true,
+ clientId: true,
+ autoProvisionUsers: true,
+ defaultOrganisationRole: true,
+ })
+ .extend({
+ clientSecret: z.string().nullable(),
+ allowedDomains: z.string().refine(
+ (value) => {
+ const domains = value.split(' ').filter(Boolean);
+
+ return domains.every((domain) => domainRegex.test(domain));
+ },
+ {
+ message: msg`Invalid domains`.id,
+ },
+ ),
+ });
+
+type TProviderFormSchema = z.infer
;
+
+export function meta() {
+ return appMetaTags('Organisation SSO Portal');
+}
+
+export default function OrganisationSettingSSOLoginPage() {
+ const { t } = useLingui();
+ const organisation = useCurrentOrganisation();
+
+ const { data: authenticationPortal, isLoading: isLoadingAuthenticationPortal } =
+ trpc.enterprise.organisation.authenticationPortal.get.useQuery({
+ organisationId: organisation.id,
+ });
+
+ if (isLoadingAuthenticationPortal || !authenticationPortal) {
+ return ;
+ }
+
+ return (
+
+
+
+
+
+ );
+}
+
+type SSOProviderFormProps = {
+ authenticationPortal: TGetOrganisationAuthenticationPortalResponse;
+};
+
+const SSOProviderForm = ({ authenticationPortal }: SSOProviderFormProps) => {
+ const { t } = useLingui();
+ const { toast } = useToast();
+
+ const organisation = useCurrentOrganisation();
+
+ const { mutateAsync: updateOrganisationAuthenticationPortal } =
+ trpc.enterprise.organisation.authenticationPortal.update.useMutation();
+
+ const form = useForm({
+ resolver: zodResolver(ZProviderFormSchema),
+ defaultValues: {
+ enabled: authenticationPortal.enabled,
+ clientId: authenticationPortal.clientId,
+ clientSecret: authenticationPortal.clientSecretProvided ? null : '',
+ wellKnownUrl: authenticationPortal.wellKnownUrl,
+ autoProvisionUsers: authenticationPortal.autoProvisionUsers,
+ defaultOrganisationRole: authenticationPortal.defaultOrganisationRole,
+ allowedDomains: authenticationPortal.allowedDomains.join(' '),
+ },
+ });
+
+ const onSubmit = async (values: TProviderFormSchema) => {
+ const { enabled, clientId, clientSecret, wellKnownUrl } = values;
+
+ if (enabled && !clientId) {
+ form.setError('clientId', {
+ message: t`Client ID is required`,
+ });
+
+ return;
+ }
+
+ if (enabled && clientSecret === '') {
+ form.setError('clientSecret', {
+ message: t`Client secret is required`,
+ });
+
+ return;
+ }
+
+ if (enabled && !wellKnownUrl) {
+ form.setError('wellKnownUrl', {
+ message: t`Well-known URL is required`,
+ });
+
+ return;
+ }
+
+ try {
+ await updateOrganisationAuthenticationPortal({
+ organisationId: organisation.id,
+ data: {
+ enabled,
+ clientId,
+ clientSecret: values.clientSecret ?? undefined,
+ wellKnownUrl,
+ autoProvisionUsers: values.autoProvisionUsers,
+ defaultOrganisationRole: values.defaultOrganisationRole,
+ allowedDomains: values.allowedDomains.split(' ').filter(Boolean),
+ },
+ });
+
+ toast({
+ title: t`Success`,
+ description: t`Provider has been updated successfully`,
+ duration: 5000,
+ });
+ } catch (err) {
+ console.error(err);
+
+ toast({
+ title: t`An error occurred`,
+ description: t`We couldn't update the provider. Please try again.`,
+ variant: 'destructive',
+ });
+ }
+ };
+
+ const isSsoEnabled = form.watch('enabled');
+
+ return (
+
+
+ );
+};
diff --git a/apps/remix/app/routes/_authenticated+/o.$orgUrl.support.tsx b/apps/remix/app/routes/_authenticated+/o.$orgUrl.support.tsx
new file mode 100644
index 000000000..dc27400d3
--- /dev/null
+++ b/apps/remix/app/routes/_authenticated+/o.$orgUrl.support.tsx
@@ -0,0 +1,125 @@
+import { useState } from 'react';
+
+import { Trans } from '@lingui/react/macro';
+import { BookIcon, HelpCircleIcon, Link2Icon } from 'lucide-react';
+import { Link, useSearchParams } from 'react-router';
+
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
+import { useSession } from '@documenso/lib/client-only/providers/session';
+import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
+import { Button } from '@documenso/ui/primitives/button';
+
+import { SupportTicketForm } from '~/components/forms/support-ticket-form';
+import { appMetaTags } from '~/utils/meta';
+
+export function meta() {
+ return appMetaTags('Support');
+}
+
+export default function SupportPage() {
+ const [showForm, setShowForm] = useState(false);
+ const { user } = useSession();
+ const organisation = useCurrentOrganisation();
+
+ const [searchParams] = useSearchParams();
+
+ const teamId = searchParams.get('team');
+
+ const subscriptionStatus = organisation.subscription?.status;
+
+ const handleSuccess = () => {
+ setShowForm(false);
+ };
+
+ const handleCloseForm = () => {
+ setShowForm(false);
+ };
+
+ return (
+
+
+
+
+ Support
+
+
+
+ Your current plan includes the following support channels:
+
+
+
+
+
+
+
+ Documentation
+
+
+
+ Read our documentation to get started with Documenso.
+
+
+
+
+
+
+ Discord
+
+
+
+
+ Join our community on{' '}
+
+ Discord
+ {' '}
+ for community support and discussion.
+
+
+
+ {organisation && IS_BILLING_ENABLED() && subscriptionStatus && (
+ <>
+
+
+
+ Contact us
+
+
+ We'll get back to you as soon as possible via email.
+
+
+ {!showForm ? (
+
+ ) : (
+
+ )}
+
+
+
+ )}
+
+
+
+
+ Linked Accounts
+
+
+
+ View and manage all login methods linked to your account.
+
+
);
}
diff --git a/apps/remix/app/routes/_authenticated+/settings+/security.linked-accounts.tsx b/apps/remix/app/routes/_authenticated+/settings+/security.linked-accounts.tsx
new file mode 100644
index 000000000..1c9c57914
--- /dev/null
+++ b/apps/remix/app/routes/_authenticated+/settings+/security.linked-accounts.tsx
@@ -0,0 +1,179 @@
+import { useMemo, useState } from 'react';
+
+import { useLingui } from '@lingui/react/macro';
+import { Trans } from '@lingui/react/macro';
+import { useQuery } from '@tanstack/react-query';
+import { DateTime } from 'luxon';
+
+import { authClient } from '@documenso/auth/client';
+import { Button } from '@documenso/ui/primitives/button';
+import type { DataTableColumnDef } from '@documenso/ui/primitives/data-table';
+import { DataTable } from '@documenso/ui/primitives/data-table';
+import {
+ Dialog,
+ DialogContent,
+ DialogDescription,
+ DialogFooter,
+ DialogHeader,
+ DialogTitle,
+ DialogTrigger,
+} from '@documenso/ui/primitives/dialog';
+import { Skeleton } from '@documenso/ui/primitives/skeleton';
+import { TableCell } from '@documenso/ui/primitives/table';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+import { SettingsHeader } from '~/components/general/settings-header';
+import { appMetaTags } from '~/utils/meta';
+
+export function meta() {
+ return appMetaTags('Linked Accounts');
+}
+
+export default function SettingsSecurityLinkedAccounts() {
+ const { t } = useLingui();
+
+ const { data, isLoading, isLoadingError, refetch } = useQuery({
+ queryKey: ['linked-accounts'],
+ queryFn: async () => await authClient.account.getMany(),
+ });
+
+ const results = data?.accounts ?? [];
+
+ const columns = useMemo(() => {
+ return [
+ {
+ header: t`Provider`,
+ accessorKey: 'provider',
+ cell: ({ row }) => row.original.provider,
+ },
+ {
+ header: t`Linked At`,
+ accessorKey: 'createdAt',
+ cell: ({ row }) =>
+ row.original.createdAt
+ ? DateTime.fromJSDate(row.original.createdAt).toRelative()
+ : t`Unknown`,
+ },
+ {
+ id: 'actions',
+ cell: ({ row }) => (
+