fix: resolve issues with signing document stickiness

packages/lib/next-auth/get-server-session.ts

@@ -15,7 +15,7 @@ export const getServerSession = async ({ req, res }: GetServerSessionOptions) =>
   const session = await getNextAuthServerSession(req, res, NEXT_AUTH_OPTIONS);
 
   if (!session || !session.user?.email) {
-    return null;
+    return { user: null, session: null };
   }
 
   const user = await prisma.user.findFirstOrThrow({
@@ -24,14 +24,14 @@ export const getServerSession = async ({ req, res }: GetServerSessionOptions) =>
     },
   });
 
-  return user;
+  return { user, session };
 };
 
 export const getServerComponentSession = async () => {
   const session = await getNextAuthServerSession(NEXT_AUTH_OPTIONS);
 
   if (!session || !session.user?.email) {
-    return null;
+    return { user: null, session: null };
   }
 
   const user = await prisma.user.findFirstOrThrow({
@@ -40,15 +40,15 @@ export const getServerComponentSession = async () => {
     },
   });
 
-  return user;
+  return { user, session };
 };
 
 export const getRequiredServerComponentSession = async () => {
-  const session = await getServerComponentSession();
+  const { user, session } = await getServerComponentSession();
 
-  if (!session) {
+  if (!user || !session) {
     throw new Error('No session found');
   }
 
-  return session;
+  return { user, session };
 };

packages/lib/universal/upload/server-actions.ts

@@ -17,7 +17,7 @@ import { alphaid } from '../id';
 export const getPresignPostUrl = async (fileName: string, contentType: string) => {
   const client = getS3Client();
 
-  const user = await getServerComponentSession();
+  const { user } = await getServerComponentSession();
 
   // Get the basename and extension for the file
   const { name, ext } = path.parse(fileName);

packages/trpc/server/context.ts

@@ -3,7 +3,7 @@ import { CreateNextContextOptions } from '@trpc/server/adapters/next';
 import { getServerSession } from '@documenso/lib/next-auth/get-server-session';
 
 export const createTrpcContext = async ({ req, res }: CreateNextContextOptions) => {
-  const session = await getServerSession({ req, res });
+  const { session, user } = await getServerSession({ req, res });
 
   if (!session) {
     return {
@@ -12,9 +12,16 @@ export const createTrpcContext = async ({ req, res }: CreateNextContextOptions)
     };
   }
 
+  if (!user) {
+    return {
+      session: null,
+      user: null,
+    };
+  }
+
   return {
     session,
-    user: session,
+    user,
   };
 };
 

packages/ui/primitives/dialog.tsx

@@ -11,9 +11,19 @@ const Dialog = DialogPrimitive.Root;
 
 const DialogTrigger = DialogPrimitive.Trigger;
 
-const DialogPortal = ({ className, children, ...props }: DialogPrimitive.DialogPortalProps) => (
+const DialogPortal = ({
+  className,
+  children,
+  position = 'start',
+  ...props
+}: DialogPrimitive.DialogPortalProps & { position?: 'start' | 'end' }) => (
   <DialogPrimitive.Portal className={cn(className)} {...props}>
-    <div className="fixed inset-0 z-50 flex items-start justify-center sm:items-center">
+    <div
+      className={cn('fixed inset-0 z-50 flex justify-center sm:items-center', {
+        'items-start': position === 'start',
+        'items-end': position === 'end',
+      })}
+    >
       {children}
     </div>
   </DialogPrimitive.Portal>
@@ -39,14 +49,14 @@ DialogOverlay.displayName = DialogPrimitive.Overlay.displayName;
 
 const DialogContent = React.forwardRef<
   React.ElementRef<typeof DialogPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content>
->(({ className, children, ...props }, ref) => (
-  <DialogPortal>
+  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content> & { position?: 'start' | 'end' }
+>(({ className, children, position = 'start', ...props }, ref) => (
+  <DialogPortal position={position}>
     <DialogOverlay />
     <DialogPrimitive.Content
       ref={ref}
       className={cn(
-        'bg-background animate-in data-[state=open]:fade-in-90 data-[state=open]:slide-in-from-bottom-10 sm:zoom-in-90 data-[state=open]:sm:slide-in-from-bottom-0 fixed z-50 grid w-full gap-4 rounded-b-lg border p-6 shadow-lg sm:max-w-lg sm:rounded-lg',
+        'bg-background animate-in data-[state=open]:fade-in-90 sm:zoom-in-90 data-[state=open]:slide-in-from-bottom-10 data-[state=open]:sm:slide-in-from-bottom-0 fixed z-50 grid w-full gap-4 rounded-b-lg border p-6 shadow-lg sm:max-w-lg sm:rounded-lg',
         className,
       )}
       {...props}