From 594226d5a4b011295c46fffea012f72276dab513 Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Wed, 6 Dec 2023 14:35:07 -0800
Subject: [PATCH] Revert "Fix: respect baseURI for pdfjs worker URL"

This reverts commit b91c7db3e004cf981f0b2782d4bab1bf82bab742.
---
 .../components/common/pdf-viewer/pdf-viewer.component.ts | 4 +---
 .../share-links-dropdown.component.spec.ts               | 9 +++++----
 .../share-links-dropdown.component.ts                    | 5 ++++-
 src-ui/src/environments/environment.prod.ts              | 3 +--
 src-ui/src/environments/environment.ts                   | 1 -
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src-ui/src/app/components/common/pdf-viewer/pdf-viewer.component.ts b/src-ui/src/app/components/common/pdf-viewer/pdf-viewer.component.ts
index 2c41da509..f9e7eb005 100644
--- a/src-ui/src/app/components/common/pdf-viewer/pdf-viewer.component.ts
+++ b/src-ui/src/app/components/common/pdf-viewer/pdf-viewer.component.ts
@@ -33,7 +33,6 @@ import type {
   ZoomScale,
 } from './typings'
 import { PDFSinglePageViewer } from 'pdfjs-dist/web/pdf_viewer'
-import { environment } from 'src/environments/environment'
 
 PDFJS['verbosity'] = PDFJS.VerbosityLevel.ERRORS
 
@@ -232,8 +231,7 @@ export class PdfViewerComponent
     private element: ElementRef<HTMLElement>,
     private ngZone: NgZone
   ) {
-    PDFJS.GlobalWorkerOptions['workerSrc'] =
-      `${environment.baseUrl}assets/js/pdf.worker.min.js`
+    PDFJS.GlobalWorkerOptions['workerSrc'] = '/assets/js/pdf.worker.min.js'
   }
 
   ngAfterViewChecked(): void {
diff --git a/src-ui/src/app/components/common/share-links-dropdown/share-links-dropdown.component.spec.ts b/src-ui/src/app/components/common/share-links-dropdown/share-links-dropdown.component.spec.ts
index 0b763ab68..27955a8a5 100644
--- a/src-ui/src/app/components/common/share-links-dropdown/share-links-dropdown.component.spec.ts
+++ b/src-ui/src/app/components/common/share-links-dropdown/share-links-dropdown.component.spec.ts
@@ -194,19 +194,20 @@ describe('ShareLinksDropdownComponent', () => {
   })
 
   it('should correctly generate share URLs', () => {
-    environment.baseUrl = 'http://example.com/'
+    environment.apiBaseUrl = 'http://example.com/api/'
     expect(component.getShareUrl({ slug: '123abc123' } as any)).toEqual(
       'http://example.com/share/123abc123'
     )
-    environment.baseUrl = 'http://example.domainwithapiinit.com/'
+    environment.apiBaseUrl = 'http://example.domainwithapiinit.com/api/'
     expect(component.getShareUrl({ slug: '123abc123' } as any)).toEqual(
       'http://example.domainwithapiinit.com/share/123abc123'
     )
-    environment.baseUrl = 'http://example.domainwithapiinit.com:1234/'
+    environment.apiBaseUrl = 'http://example.domainwithapiinit.com:1234/api/'
     expect(component.getShareUrl({ slug: '123abc123' } as any)).toEqual(
       'http://example.domainwithapiinit.com:1234/share/123abc123'
     )
-    environment.baseUrl = 'http://example.domainwithapiinit.com:1234/subpath/'
+    environment.apiBaseUrl =
+      'http://example.domainwithapiinit.com:1234/subpath/api/'
     expect(component.getShareUrl({ slug: '123abc123' } as any)).toEqual(
       'http://example.domainwithapiinit.com:1234/subpath/share/123abc123'
     )
diff --git a/src-ui/src/app/components/common/share-links-dropdown/share-links-dropdown.component.ts b/src-ui/src/app/components/common/share-links-dropdown/share-links-dropdown.component.ts
index d80a88cba..fa2df3a54 100644
--- a/src-ui/src/app/components/common/share-links-dropdown/share-links-dropdown.component.ts
+++ b/src-ui/src/app/components/common/share-links-dropdown/share-links-dropdown.component.ts
@@ -80,7 +80,10 @@ export class ShareLinksDropdownComponent implements OnInit {
   }
 
   getShareUrl(link: PaperlessShareLink): string {
-    return `${environment.baseUrl}share/${link.slug}`
+    const apiURL = new URL(environment.apiBaseUrl)
+    return `${apiURL.origin}${apiURL.pathname.replace(/\/api\/$/, '/share/')}${
+      link.slug
+    }`
   }
 
   getDaysRemaining(link: PaperlessShareLink): string {
diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts
index 38ea42341..e202fe700 100644
--- a/src-ui/src/environments/environment.prod.ts
+++ b/src-ui/src/environments/environment.prod.ts
@@ -2,8 +2,7 @@ const base_url = new URL(document.baseURI)
 
 export const environment = {
   production: true,
-  baseUrl: base_url,
-  apiBaseUrl: `${base_url}api/`,
+  apiBaseUrl: document.baseURI + 'api/',
   apiVersion: '3',
   appTitle: 'Paperless-ngx',
   version: '2.1.0-dev',
diff --git a/src-ui/src/environments/environment.ts b/src-ui/src/environments/environment.ts
index ed501dba5..10d245f34 100644
--- a/src-ui/src/environments/environment.ts
+++ b/src-ui/src/environments/environment.ts
@@ -4,7 +4,6 @@
 
 export const environment = {
   production: false,
-  baseUrl: 'http://localhost:8000/',
   apiBaseUrl: 'http://localhost:8000/api/',
   apiVersion: '3',
   appTitle: 'Paperless-ngx',