fix: wip

packages/lib/universal/get-base-url.ts

@@ -1,13 +1,14 @@
 /* eslint-disable turbo/no-undeclared-env-vars */
 import { NEXT_PUBLIC_WEBAPP_URL } from '../constants/app';
+import { env } from '../utils/env';
 
 export const getBaseUrl = () => {
   if (typeof window !== 'undefined') {
     return '';
   }
 
-  if (process.env.VERCEL_URL) {
-    return `https://${process.env.VERCEL_URL}`;
+  if (env('VERCEL_URL')) {
+    return `https://${env('VERCEL_URL')}`;
   }
 
   const webAppUrl = NEXT_PUBLIC_WEBAPP_URL();
@@ -16,5 +17,5 @@ export const getBaseUrl = () => {
     return webAppUrl;
   }
 
-  return `http://localhost:${process.env.PORT ?? 3000}`;
+  return `http://localhost:${env('PORT') ?? 3000}`;
 };

packages/lib/universal/upload/put-file.ts

@@ -1,9 +1,10 @@
 import { DocumentDataType } from '@prisma/client';
 import { base64 } from '@scure/base';
-import { env } from 'next-runtime-env';
 import { PDFDocument } from 'pdf-lib';
 import { match } from 'ts-pattern';
 
+import { env } from '@documenso/lib/utils/env';
+
 import { AppError } from '../../errors/app-error';
 import { createDocumentData } from '../../server-only/document-data/create-document-data';
 

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

@@ -1,8 +1,3 @@
-'use server';
-
-import { headers } from 'next/headers';
-import { NextRequest } from 'next/server';
-
 import {
   DeleteObjectCommand,
   GetObjectCommand,
@@ -10,10 +5,11 @@ import {
   S3Client,
 } from '@aws-sdk/client-s3';
 import slugify from '@sindresorhus/slugify';
-import { type JWT, getToken } from 'next-auth/jwt';
-import { env } from 'next-runtime-env';
+import { type JWT } from 'next-auth/jwt';
 import path from 'node:path';
 
+import { env } from '@documenso/lib/utils/env';
+
 import { APP_BASE_URL } from '../../constants/app';
 import { ONE_HOUR, ONE_SECOND } from '../../constants/time';
 import { alphaid } from '../id';
@@ -23,16 +19,17 @@ export const getPresignPostUrl = async (fileName: string, contentType: string) =
 
   const { getSignedUrl } = await import('@aws-sdk/s3-request-presigner');
 
-  let token: JWT | null = null;
+  const token: JWT | null = null;
 
   try {
     const baseUrl = APP_BASE_URL() ?? 'http://localhost:3000';
 
-    token = await getToken({
-      req: new NextRequest(baseUrl, {
-        headers: headers(),
-      }),
-    });
+    // Todo
+    // token = await getToken({
+    //   req: new NextRequest(baseUrl, {
+    //     headers: headers(),
+    //   }),
+    // });
   } catch (err) {
     // Non server-component environment
   }
@@ -47,7 +44,7 @@ export const getPresignPostUrl = async (fileName: string, contentType: string) =
   }
 
   const putObjectCommand = new PutObjectCommand({
-    Bucket: process.env.NEXT_PRIVATE_UPLOAD_BUCKET,
+    Bucket: env('NEXT_PRIVATE_UPLOAD_BUCKET'),
     Key: key,
     ContentType: contentType,
   });
@@ -65,7 +62,7 @@ export const getAbsolutePresignPostUrl = async (key: string) => {
   const { getSignedUrl: getS3SignedUrl } = await import('@aws-sdk/s3-request-presigner');
 
   const putObjectCommand = new PutObjectCommand({
-    Bucket: process.env.NEXT_PRIVATE_UPLOAD_BUCKET,
+    Bucket: env('NEXT_PRIVATE_UPLOAD_BUCKET'),
     Key: key,
   });
 
@@ -77,15 +74,15 @@ export const getAbsolutePresignPostUrl = async (key: string) => {
 };
 
 export const getPresignGetUrl = async (key: string) => {
-  if (process.env.NEXT_PRIVATE_UPLOAD_DISTRIBUTION_DOMAIN) {
-    const distributionUrl = new URL(key, `${process.env.NEXT_PRIVATE_UPLOAD_DISTRIBUTION_DOMAIN}`);
+  if (env('NEXT_PRIVATE_UPLOAD_DISTRIBUTION_DOMAIN')) {
+    const distributionUrl = new URL(key, `${env('NEXT_PRIVATE_UPLOAD_DISTRIBUTION_DOMAIN')}`);
 
     const { getSignedUrl: getCloudfrontSignedUrl } = await import('@aws-sdk/cloudfront-signer');
 
     const url = getCloudfrontSignedUrl({
       url: distributionUrl.toString(),
-      keyPairId: `${process.env.NEXT_PRIVATE_UPLOAD_DISTRIBUTION_KEY_ID}`,
-      privateKey: `${process.env.NEXT_PRIVATE_UPLOAD_DISTRIBUTION_KEY_CONTENTS}`,
+      keyPairId: `${env('NEXT_PRIVATE_UPLOAD_DISTRIBUTION_KEY_ID')}`,
+      privateKey: `${env('NEXT_PRIVATE_UPLOAD_DISTRIBUTION_KEY_CONTENTS')}`,
       dateLessThan: new Date(Date.now() + ONE_HOUR).toISOString(),
     });
 
@@ -97,7 +94,7 @@ export const getPresignGetUrl = async (key: string) => {
   const { getSignedUrl: getS3SignedUrl } = await import('@aws-sdk/s3-request-presigner');
 
   const getObjectCommand = new GetObjectCommand({
-    Bucket: process.env.NEXT_PRIVATE_UPLOAD_BUCKET,
+    Bucket: env('NEXT_PRIVATE_UPLOAD_BUCKET'),
     Key: key,
   });
 
@@ -113,7 +110,7 @@ export const deleteS3File = async (key: string) => {
 
   await client.send(
     new DeleteObjectCommand({
-      Bucket: process.env.NEXT_PRIVATE_UPLOAD_BUCKET,
+      Bucket: env('NEXT_PRIVATE_UPLOAD_BUCKET'),
       Key: key,
     }),
   );
@@ -127,17 +124,16 @@ const getS3Client = () => {
   }
 
   const hasCredentials =
-    process.env.NEXT_PRIVATE_UPLOAD_ACCESS_KEY_ID &&
-    process.env.NEXT_PRIVATE_UPLOAD_SECRET_ACCESS_KEY;
+    env('NEXT_PRIVATE_UPLOAD_ACCESS_KEY_ID') && env('NEXT_PRIVATE_UPLOAD_SECRET_ACCESS_KEY');
 
   return new S3Client({
-    endpoint: process.env.NEXT_PRIVATE_UPLOAD_ENDPOINT || undefined,
-    forcePathStyle: process.env.NEXT_PRIVATE_UPLOAD_FORCE_PATH_STYLE === 'true',
-    region: process.env.NEXT_PRIVATE_UPLOAD_REGION || 'us-east-1',
+    endpoint: env('NEXT_PRIVATE_UPLOAD_ENDPOINT') || undefined,
+    forcePathStyle: env('NEXT_PRIVATE_UPLOAD_FORCE_PATH_STYLE') === 'true',
+    region: env('NEXT_PRIVATE_UPLOAD_REGION') || 'us-east-1',
     credentials: hasCredentials
       ? {
-          accessKeyId: String(process.env.NEXT_PRIVATE_UPLOAD_ACCESS_KEY_ID),
-          secretAccessKey: String(process.env.NEXT_PRIVATE_UPLOAD_SECRET_ACCESS_KEY),
+          accessKeyId: String(env('NEXT_PRIVATE_UPLOAD_ACCESS_KEY_ID')),
+          secretAccessKey: String(env('NEXT_PRIVATE_UPLOAD_SECRET_ACCESS_KEY')),
         }
       : undefined,
   });