From 953d18e795ea2dca27621da5b86bc17d3bb0ab7e Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Sun, 7 Aug 2022 08:12:31 -0500
Subject: [PATCH] Remove serverEndpoint completely and fix upload path (#434)

---
 web/src/api/api.ts                                             | 1 -
 web/src/lib/components/shared-components/navigation-bar.svelte | 3 +--
 web/src/lib/components/shared-components/status-box.svelte     | 2 --
 web/src/lib/constants.ts                                       | 1 -
 web/src/lib/stores/websocket.ts                                | 3 ---
 web/src/lib/utils/file-uploader.ts                             | 3 +--
 6 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/web/src/api/api.ts b/web/src/api/api.ts
index d8454350e..5e2b8f356 100644
--- a/web/src/api/api.ts
+++ b/web/src/api/api.ts
@@ -1,4 +1,3 @@
-import { serverEndpoint } from '$lib/constants';
 import {
 	AlbumApi,
 	AssetApi,
diff --git a/web/src/lib/components/shared-components/navigation-bar.svelte b/web/src/lib/components/shared-components/navigation-bar.svelte
index cc7122744..dda6b0c36 100644
--- a/web/src/lib/components/shared-components/navigation-bar.svelte
+++ b/web/src/lib/components/shared-components/navigation-bar.svelte
@@ -4,7 +4,6 @@
 	import type { ImmichUser } from '$lib/models/immich-user';
 	import { createEventDispatcher, onMount } from 'svelte';
 	import { fade, fly, slide } from 'svelte/transition';
-	import { serverEndpoint } from '../../constants';
 	import TrayArrowUp from 'svelte-material-icons/TrayArrowUp.svelte';
 	import { clickOutside } from '../../utils/click-outside';
 	import { api } from '@api';
@@ -131,7 +130,7 @@
 				>
 					{#if shouldShowProfileImage}
 						<img
-							src={`${serverEndpoint}/user/profile-image/${user.id}`}
+							src={`api/user/profile-image/${user.id}`}
 							alt="profile-img"
 							class="inline rounded-full h-20 w-20 object-cover shadow-md"
 						/>
diff --git a/web/src/lib/components/shared-components/status-box.svelte b/web/src/lib/components/shared-components/status-box.svelte
index fe92641a9..7a30ed774 100644
--- a/web/src/lib/components/shared-components/status-box.svelte
+++ b/web/src/lib/components/shared-components/status-box.svelte
@@ -1,12 +1,10 @@
 <script lang="ts">
 	import { onDestroy, onMount } from 'svelte';
-	import { serverEndpoint } from '$lib/constants';
 	import Cloud from 'svelte-material-icons/Cloud.svelte';
 	import Dns from 'svelte-material-icons/Dns.svelte';
 	import LoadingSpinner from './loading-spinner.svelte';
 	import { api, ServerInfoResponseDto } from '@api';
 
-	let endpoint = serverEndpoint;
 	let isServerOk = true;
 	let serverVersion = '';
 	let serverInfo: ServerInfoResponseDto;
diff --git a/web/src/lib/constants.ts b/web/src/lib/constants.ts
index 0fce83a45..7f09000e2 100644
--- a/web/src/lib/constants.ts
+++ b/web/src/lib/constants.ts
@@ -1,2 +1 @@
-export const serverEndpoint: string = import.meta.env.VITE_SERVER_ENDPOINT;
 export const loginPageMessage: string = import.meta.env.VITE_LOGIN_PAGE_MESSAGE;
diff --git a/web/src/lib/stores/websocket.ts b/web/src/lib/stores/websocket.ts
index 604e99aab..569ed5673 100644
--- a/web/src/lib/stores/websocket.ts
+++ b/web/src/lib/stores/websocket.ts
@@ -1,12 +1,9 @@
 import { Socket, io } from 'socket.io-client';
 import { writable } from 'svelte/store';
-import { serverEndpoint } from '../constants';
 
 let websocket: Socket;
 
 export const openWebsocketConnection = () => {
-	const websocketEndpoint = serverEndpoint.replace('/api', '');
-
 	try {
 		websocket = io('', {
 			path: '/api/socket.io',
diff --git a/web/src/lib/utils/file-uploader.ts b/web/src/lib/utils/file-uploader.ts
index 8c1aa6be5..b91ddd568 100644
--- a/web/src/lib/utils/file-uploader.ts
+++ b/web/src/lib/utils/file-uploader.ts
@@ -1,6 +1,5 @@
 /* @vite-ignore */
 import * as exifr from 'exifr';
-import { serverEndpoint } from '../constants';
 import { uploadAssetsStore } from '$lib/stores/upload';
 import type { UploadAsset } from '../models/upload-asset';
 import { api, AssetFileUploadResponseDto } from '@api';
@@ -168,7 +167,7 @@ async function fileUploader(asset: File, uploadType: UploadType) {
 			uploadAssetsStore.updateProgress(deviceAssetId, percentComplete);
 		};
 
-		request.open('POST', `api/asset/upload`);
+		request.open('POST', `/api/asset/upload`);
 
 		request.send(formData);
 	} catch (e) {