From 15850380c417843b8033c25070c1be4e69a1b9a9 Mon Sep 17 00:00:00 2001
From: Simon Larsen <simonlarsen@oneuptime.com>
Date: Mon, 25 Dec 2023 13:39:11 +0000
Subject: [PATCH] Fix file picker and notification proxy URLs

---
 CommonUI/src/Components/FilePicker/FilePicker.tsx | 4 +---
 Nginx/default.conf.template                       | 8 ++++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/CommonUI/src/Components/FilePicker/FilePicker.tsx b/CommonUI/src/Components/FilePicker/FilePicker.tsx
index 726c0f3475..74bc97bba5 100644
--- a/CommonUI/src/Components/FilePicker/FilePicker.tsx
+++ b/CommonUI/src/Components/FilePicker/FilePicker.tsx
@@ -112,9 +112,7 @@ const FilePicker: FunctionComponent<ComponentProps> = (
                             modelType: FileModel,
                             requestOptions: {
                                 overrideRequestUrl:
-                                    CommonURL.fromURL(FILE_URL).addRoute(
-                                        '/file'
-                                    ),
+                                    CommonURL.fromURL(FILE_URL),
                             },
                         })) as HTTPResponse<FileModel>;
                     filesResult.push(result.data as FileModel);
diff --git a/Nginx/default.conf.template b/Nginx/default.conf.template
index cad48596c9..25fc753889 100644
--- a/Nginx/default.conf.template
+++ b/Nginx/default.conf.template
@@ -338,7 +338,7 @@ server {
         proxy_pass http://otel-collector;
     }
 
-    location /notification/ {
+    location /notification {
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -348,7 +348,7 @@ server {
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";
-        proxy_pass http://dashboard-api/api/notification/;
+        proxy_pass http://dashboard-api/api/notification;
     }
 
     location /ingestor {
@@ -433,7 +433,7 @@ server {
         proxy_pass http://api-reference;
     }
 
-    location /file/ {
+    location /file {
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -443,7 +443,7 @@ server {
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";
-        proxy_pass http://dashboard-api/api/file/;
+        proxy_pass http://dashboard-api/api/file;
 
         client_max_body_size 50M;
     }