Skip to content

Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.

feat: improve advanced Excel viewer

Iuliia Shnaie4084a2f4882
diff --git a/app/api/views-dataroom/route.ts b/app/api/views-dataroom/route.ts
index 8e3294dd..f1eebd84 100644
--- a/app/api/views-dataroom/route.ts
+++ b/app/api/views-dataroom/route.ts
@@ -1,7 +1,6 @@
import { NextRequest, NextResponse } from "next/server";
import { reportDeniedAccessAttempt } from "@/ee/features/access-notifications";
-import { getTeamStorageConfigById } from "@/ee/features/storage/config";
import { ItemType, LinkAudienceType, LinkType } from "@prisma/client";
import { ipAddress, waitUntil } from "@vercel/functions";
import { getServerSession } from "next-auth";
@@ -18,6 +17,7 @@ import { verifyDataroomSession } from "@/lib/auth/dataroom-auth";
import { PreviewSession, verifyPreviewSession } from "@/lib/auth/preview-auth";
import { isEmbeddableUrl } from "@/lib/edge-config/embeddable-domains";
import { sendOtpVerificationEmail } from "@/lib/emails/send-email-otp-verification";
+import { getAdvancedExcelFileUrl } from "@/lib/files/advanced-excel-url";
import { getFile } from "@/lib/files/get-file";
import { signPageLinks } from "@/lib/files/sign-page-links";
import { newId } from "@/lib/id-helper";
@@ -1364,15 +1364,10 @@ export async function POST(request: NextRequest) {
useAdvancedExcelViewer = document?.advancedExcelEnabled ?? false;
if (useAdvancedExcelViewer) {
- if (documentVersion.file.includes("https://")) {
- documentVersion.file = documentVersion.file;
- } else {
- // Get team-specific storage config for advanced distribution host
- const storageConfig = await getTeamStorageConfigById(
- link.teamId!,
- );
- documentVersion.file = `https://${storageConfig.advancedDistributionHost}/${documentVersion.file}`;
- }
+ documentVersion.file = await getAdvancedExcelFileUrl({
+ file: documentVersion.file,
+ storageType: documentVersion.storageType,
+ });
} else {
const fileUrl = await getFile({
data: documentVersion.file,
diff --git a/app/api/views/route.ts b/app/api/views/route.ts
index ef83b611..27fd1607 100644
--- a/app/api/views/route.ts
+++ b/app/api/views/route.ts
@@ -1,7 +1,6 @@
import { NextRequest, NextResponse } from "next/server";
import { reportDeniedAccessAttempt } from "@/ee/features/access-notifications";
-import { getTeamStorageConfigById } from "@/ee/features/storage/config";
import { ipAddress, waitUntil } from "@vercel/functions";
import { getServerSession } from "next-auth";
@@ -20,6 +19,7 @@ import { PreviewSession } from "@/lib/auth/preview-auth";
import { isEmbeddableUrl } from "@/lib/edge-config/embeddable-domains";
import { sendOtpVerificationEmail } from "@/lib/emails/send-email-otp-verification";
import { getFeatureFlags } from "@/lib/featureFlags";
+import { getAdvancedExcelFileUrl } from "@/lib/files/advanced-excel-url";
import { getFile } from "@/lib/files/get-file";
import { signPageLinks } from "@/lib/files/sign-page-links";
import { newId } from "@/lib/id-helper";
@@ -870,13 +870,10 @@ export async function POST(request: NextRequest) {
if (documentVersion.type === "sheet") {
if (useAdvancedExcelViewer) {
- if (!documentVersion.file.includes("https://")) {
- // Get team-specific storage config for advanced distribution host
- const storageConfig = await getTeamStorageConfigById(
- link.teamId!,
- );
- documentVersion.file = `https://${storageConfig.advancedDistributionHost}/${documentVersion.file}`;
- }
+ documentVersion.file = await getAdvancedExcelFileUrl({
+ file: documentVersion.file,
+ storageType: documentVersion.storageType,
+ });
} else {
const fileUrl = await getFile({
data: documentVersion.file,
diff --git a/components/documents/preview-viewers/preview-excel-viewer.tsx b/components/documents/preview-viewers/preview-excel-viewer.tsx
index d81918de..24cd85e1 100644
--- a/components/documents/preview-viewers/preview-excel-viewer.tsx
+++ b/components/documents/preview-viewers/preview-excel-viewer.tsx
@@ -2,6 +2,7 @@ import { useState } from "react";
import { DocumentPreviewData } from "@/lib/types/document-preview";
import { cn } from "@/lib/utils";
+import { getOfficeViewerEmbedUrl } from "@/lib/utils/office-viewer";
interface PreviewExcelViewerProps {
documentData: DocumentPreviewData;
@@ -24,7 +25,7 @@ export function PreviewExcelViewer({
);
}
- const embedUrl = `https://view.officeapps.live.com/op/embed.aspx?src=${encodeURIComponent(file)}&wdPrint=0&action=embedview&wdAllowInteractivity=False`;
+ const embedUrl = getOfficeViewerEmbedUrl(file);
return (
<div className="relative h-full w-full overflow-hidden">
diff --git a/components/view/viewer/advanced-excel-viewer.tsx b/components/view/viewer/advanced-excel-viewer.tsx
index be55839f..3cb9703a 100644
--- a/components/view/viewer/advanced-excel-viewer.tsx
+++ b/components/view/viewer/advanced-excel-viewer.tsx
@@ -3,6 +3,7 @@ import { useEffect, useRef, useState } from "react";
import { useSafePageViewTracker } from "@/lib/tracking/safe-page-view-tracker";
import { getTrackingOptions } from "@/lib/tracking/tracking-config";
import { cn } from "@/lib/utils";
+import { getOfficeViewerEmbedUrl } from "@/lib/utils/office-viewer";
import { ScreenProtector } from "../ScreenProtection";
import Nav, { TNavData } from "../nav";
@@ -179,7 +180,7 @@ export default function AdvancedExcelViewer({
screenshotProtectionEnabled &&
"blur-xl transition-all duration-300",
)}
- src={`https://view.officeapps.live.com/op/embed.aspx?src=${file}&wdPrint=0&action=embedview&wdAllowInteractivity=False`}
+ src={getOfficeViewerEmbedUrl(file)}
></iframe>
<div
className="absolute bottom-0 left-0 right-0 z-50 h-[26px] bg-gray-950"
diff --git a/lib/api/documents/process-document.ts b/lib/api/documents/process-document.ts
index 95a9763b..fb44dcee 100644
--- a/lib/api/documents/process-document.ts
+++ b/lib/api/documents/process-document.ts
@@ -1,13 +1,12 @@
+import type {
+ convertFilesToPdfTask,
+ convertKeynoteToPdfTask,
+} from "@/ee/features/conversions/lib/trigger/convert-files";
import { tasks } from "@trigger.dev/sdk";
import { validateExternalDocumentUrl } from "@/lib/api/documents/validate-external-url";
import { DocumentData } from "@/lib/documents/create-document";
-import { copyFileToBucketServer } from "@/lib/files/copy-file-to-bucket-server";
import prisma from "@/lib/prisma";
-import type {
- convertFilesToPdfTask,
- convertKeynoteToPdfTask,
-} from "@/ee/features/conversions/lib/trigger/convert-files";
import { processVideo } from "@/lib/trigger/optimize-video-files";
import { convertPdfToImageRoute } from "@/lib/trigger/pdf-to-image-route";
import { getExtension } from "@/lib/utils";
@@ -232,12 +231,6 @@ export const processDocument = async ({
}
if (type === "sheet" && enableExcelAdvancedMode) {
- await copyFileToBucketServer({
- filePath: document.versions[0].file,
- storageType: document.versions[0].storageType,
- teamId,
- });
-
await prisma.documentVersion.update({
where: { id: document.versions[0].id },
data: { numPages: 1 },
diff --git a/lib/files/advanced-excel-url.ts b/lib/files/advanced-excel-url.ts
new file mode 100644
index 00000000..f42cbf57
--- /dev/null
+++ b/lib/files/advanced-excel-url.ts
@@ -0,0 +1,28 @@
+import { DocumentStorageType } from "@prisma/client";
+
+import { ONE_MINUTE } from "@/lib/constants";
+import { getFile } from "@/lib/files/get-file";
+
+/**
+ * Resolve the URL handed to the Office Online viewer for an advanced-mode
+ * sheet. Microsoft fetches it from their own backend, so it needs a short-lived
+ * signed URL rather than an authenticated request.
+ */
+export const getAdvancedExcelFileUrl = async ({
+ file,
+ storageType,
+}: {
+ file: string;
+ storageType: DocumentStorageType;
+}): Promise<string> => {
+ // Legacy VERCEL_BLOB versions already store an absolute URL.
+ if (file.includes("https://")) {
+ return file;
+ }
+
+ return getFile({
+ data: file,
+ type: storageType,
+ expiresIn: ONE_MINUTE,
+ });
+};
diff --git a/lib/utils/office-viewer.ts b/lib/utils/office-viewer.ts
new file mode 100644
index 00000000..a84e4e1f
--- /dev/null
+++ b/lib/utils/office-viewer.ts
@@ -0,0 +1,13 @@
+/**
+ * Build the Office Online embed URL for a workbook.
+ *
+ * `src` must be percent-encoded, or a signed URL's `&Signature=`/`&Key-Pair-Id=`
+ * are parsed as parameters of `embed.aspx` itself and `src` is truncated at the
+ * first `&`. Not `URLSearchParams`: it encodes spaces as `+`, which Microsoft
+ * decodes back to a space and invalidates the signature.
+ */
+export function getOfficeViewerEmbedUrl(fileUrl: string): string {
+ return `https://view.officeapps.live.com/op/embed.aspx?src=${encodeURIComponent(
+ fileUrl,
+ )}&wdPrint=0&action=embedview&wdAllowInteractivity=False`;
+}
diff --git a/pages/api/teams/[teamId]/documents/[id]/advanced-mode.ts b/pages/api/teams/[teamId]/documents/[id]/advanced-mode.ts
index 91b65c3d..bc0d23c0 100644
--- a/pages/api/teams/[teamId]/documents/[id]/advanced-mode.ts
+++ b/pages/api/teams/[teamId]/documents/[id]/advanced-mode.ts
@@ -4,7 +4,6 @@ import { authOptions } from "@/pages/api/auth/[...nextauth]";
import { getServerSession } from "next-auth/next";
import { errorhandler } from "@/lib/errorHandler";
-import { copyFileToBucketServer } from "@/lib/files/copy-file-to-bucket-server";
import prisma from "@/lib/prisma";
import { CustomUser } from "@/lib/types";
import { supportsAdvancedExcelMode } from "@/lib/utils/get-content-type";
@@ -80,15 +79,6 @@ export default async function handle(
});
}
- // If enabling advanced mode, copy file to bucket
- if (enabled && !document.advancedExcelEnabled) {
- await copyFileToBucketServer({
- filePath: documentVersion.file,
- storageType: documentVersion.storageType,
- teamId,
- });
- }
-
const documentPromise = prisma.document.update({
where: { id: docId },
data: { advancedExcelEnabled: enabled },
diff --git a/pages/api/teams/[teamId]/documents/[id]/preview-data.ts b/pages/api/teams/[teamId]/documents/[id]/preview-data.ts
index 922ab8cb..ac5f2ec6 100644
--- a/pages/api/teams/[teamId]/documents/[id]/preview-data.ts
+++ b/pages/api/teams/[teamId]/documents/[id]/preview-data.ts
@@ -2,9 +2,8 @@ import { NextApiRequest, NextApiResponse } from "next";
import { getServerSession } from "next-auth/next";
-import { getTeamStorageConfigById } from "@/ee/features/storage/config";
-
import { enforceDocumentMemberScope } from "@/lib/api/rbac/guard";
+import { getAdvancedExcelFileUrl } from "@/lib/files/advanced-excel-url";
import { getFile } from "@/lib/files/get-file";
import { signPageLinks } from "@/lib/files/sign-page-links";
import prisma from "@/lib/prisma";
@@ -34,9 +33,7 @@ export default async function handle(
const userId = (session.user as CustomUser).id;
// Dataroom-scoped members may only access documents in their assigned rooms.
- if (
- await enforceDocumentMemberScope({ userId, teamId, documentId, res })
- ) {
+ if (await enforceDocumentMemberScope({ userId, teamId, documentId, res })) {
return;
}
@@ -133,8 +130,8 @@ export default async function handle(
? await getFile({ data: page.file, type: storageType })
: null,
pageLinks: inWindow
- ? (await signPageLinks(otherPageData.pageLinks)) ??
- otherPageData.pageLinks
+ ? ((await signPageLinks(otherPageData.pageLinks)) ??
+ otherPageData.pageLinks)
: otherPageData.pageLinks,
};
}),
@@ -149,12 +146,10 @@ export default async function handle(
} else if (primaryVersion.type === "sheet") {
if (document.advancedExcelEnabled) {
// Advanced Excel mode: use Office Online viewer URL
- if (!primaryVersion.file.includes("https://")) {
- const storageConfig = await getTeamStorageConfigById(document.teamId);
- returnData.file = `https://${storageConfig.advancedDistributionHost}/${primaryVersion.file}`;
- } else {
- returnData.file = primaryVersion.file;
- }
+ returnData.file = await getAdvancedExcelFileUrl({
+ file: primaryVersion.file,
+ storageType: primaryVersion.storageType,
+ });
returnData.numPages = 1;
}
// Non-advanced sheets: return 200 with advancedExcelEnabled=false so
diff --git a/pages/api/teams/[teamId]/documents/[id]/versions/index.ts b/pages/api/teams/[teamId]/documents/[id]/versions/index.ts
index bd8b1444..1a83c94f 100644
--- a/pages/api/teams/[teamId]/documents/[id]/versions/index.ts
+++ b/pages/api/teams/[teamId]/documents/[id]/versions/index.ts
@@ -1,17 +1,14 @@
import { NextApiRequest, NextApiResponse } from "next";
-import { tasks } from "@trigger.dev/sdk";
-
import { isTeamPausedById } from "@/ee/features/billing/cancellation/lib/is-team-paused";
+import type { convertFilesToPdfTask } from "@/ee/features/conversions/lib/trigger/convert-files";
import { authOptions } from "@/pages/api/auth/[...nextauth]";
+import { tasks } from "@trigger.dev/sdk";
import { getServerSession } from "next-auth/next";
import { hashToken } from "@/lib/api/auth/token";
import { enforceDocumentMemberScope } from "@/lib/api/rbac/guard";
-import { copyFileToBucketServer } from "@/lib/files/copy-file-to-bucket-server";
import prisma from "@/lib/prisma";
-
-import type { convertFilesToPdfTask } from "@/ee/features/conversions/lib/trigger/convert-files";
import { processVideo } from "@/lib/trigger/optimize-video-files";
import { convertPdfToImageRoute } from "@/lib/trigger/pdf-to-image-route";
import { CustomUser } from "@/lib/types";
@@ -62,9 +59,7 @@ export default async function handle(
}
// Scoped members may only add versions to documents in their rooms.
- if (
- await enforceDocumentMemberScope({ userId, teamId, documentId, res })
- ) {
+ if (await enforceDocumentMemberScope({ userId, teamId, documentId, res })) {
return;
}
@@ -245,15 +240,6 @@ export default async function handle(
);
}
- if (type === "sheet" && document?.advancedExcelEnabled) {
- console.log("copying file to bucket server");
- await copyFileToBucketServer({
- filePath: version.file,
- storageType: version.storageType,
- teamId,
- });
- }
-
res.status(200).json({ id: documentId });
} catch (error) {
log({
diff --git a/pages/api/teams/[teamId]/enable-advanced-mode.ts b/pages/api/teams/[teamId]/enable-advanced-mode.ts
index bd1b60b0..36a912c6 100644
--- a/pages/api/teams/[teamId]/enable-advanced-mode.ts
+++ b/pages/api/teams/[teamId]/enable-advanced-mode.ts
@@ -4,7 +4,6 @@ import { Session } from "next-auth";
import { getServerSession } from "next-auth/next";
import { errorhandler } from "@/lib/errorHandler";
-import { copyFileToBucketServer } from "@/lib/files/copy-file-to-bucket-server";
import prisma from "@/lib/prisma";
import { supportsAdvancedExcelMode } from "@/lib/utils/get-content-type";
@@ -96,13 +95,6 @@ export default async function handle(
if (!primaryVersion) return;
if (enableExcelAdvancedMode) {
- // Copy file to bucket if enabling advanced mode
- await copyFileToBucketServer({
- filePath: primaryVersion.file,
- storageType: primaryVersion.storageType,
- teamId: teamId as string,
- });
-
// Update document and version when enabling
await Promise.all([
tx.document.update({