From eed1e2297d888afebc36ac89184cc88b9a368ee3 Mon Sep 17 00:00:00 2001
From: kompotkot <sumarokovsergei@yandex.ru>
Date: Thu, 28 Sep 2023 11:25:47 +0000
Subject: [PATCH 1/2] Access id could be set in URL path

---
 nodebalancer/cmd/nodebalancer/middleware.go | 15 ++++++++++++---
 nodebalancer/cmd/nodebalancer/version.go    |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/nodebalancer/cmd/nodebalancer/middleware.go b/nodebalancer/cmd/nodebalancer/middleware.go
index 0eca1c47..e5068909 100644
--- a/nodebalancer/cmd/nodebalancer/middleware.go
+++ b/nodebalancer/cmd/nodebalancer/middleware.go
@@ -305,9 +305,13 @@ func fetchClientAccessFromResources(accessID, authorizationToken string, tsNow i
 func extractAccessID(r *http.Request) string {
 	var accessID string
 
-	accessIDHeaders := r.Header[strings.Title(NB_ACCESS_ID_HEADER)]
-	for _, h := range accessIDHeaders {
-		accessID = h
+	urlPathSlice := strings.Split(r.URL.Path, "/")
+	if len(urlPathSlice) == 5 {
+		potentialUuid := urlPathSlice[4]
+		_, uuidParseErr := uuid.Parse(potentialUuid)
+		if uuidParseErr == nil {
+			accessID = potentialUuid
+		}
 	}
 
 	queries := r.URL.Query()
@@ -317,6 +321,11 @@ func extractAccessID(r *http.Request) string {
 		}
 	}
 
+	accessIDHeaders := r.Header[strings.Title(NB_ACCESS_ID_HEADER)]
+	for _, h := range accessIDHeaders {
+		accessID = h
+	}
+
 	return accessID
 }
 
diff --git a/nodebalancer/cmd/nodebalancer/version.go b/nodebalancer/cmd/nodebalancer/version.go
index 4aeaf877..013fae97 100644
--- a/nodebalancer/cmd/nodebalancer/version.go
+++ b/nodebalancer/cmd/nodebalancer/version.go
@@ -1,3 +1,3 @@
 package main
 
-var NB_VERSION = "0.2.3"
+var NB_VERSION = "0.2.4"

From e27308f809b0651269bf67118e5eaf9632845d5a Mon Sep 17 00:00:00 2001
From: kompotkot <sumarokovsergei@yandex.ru>
Date: Thu, 28 Sep 2023 12:12:33 +0000
Subject: [PATCH 2/2] Deploy updates

---
 nodebalancer/deploy/deploy.bash          | 4 ++--
 nodebalancer/deploy/nodebalancer.service | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nodebalancer/deploy/deploy.bash b/nodebalancer/deploy/deploy.bash
index f94f8357..2ec7151f 100755
--- a/nodebalancer/deploy/deploy.bash
+++ b/nodebalancer/deploy/deploy.bash
@@ -15,8 +15,8 @@ PREFIX_CRIT="${C_RED}[CRIT]${C_RESET} [$(date +%d-%m\ %T)]"
 
 # Main
 AWS_DEFAULT_REGION="${AWS_DEFAULT_REGION:-us-east-1}"
-APP_DIR="${APP_DIR:-/home/ubuntu/moonstream}"
-SECRETS_DIR="${SECRETS_DIR:-/home/ubuntu/moonstream-secrets}"
+APP_DIR="${APP_DIR:-/home/ubuntu/api}"
+SECRETS_DIR="${SECRETS_DIR:-/home/ubuntu/nodebalancer-secrets}"
 PARAMETERS_ENV_PATH="${SECRETS_DIR}/app.env"
 SCRIPT_DIR="$(realpath $(dirname $0))"
 
diff --git a/nodebalancer/deploy/nodebalancer.service b/nodebalancer/deploy/nodebalancer.service
index 43c855fe..e353ec58 100644
--- a/nodebalancer/deploy/nodebalancer.service
+++ b/nodebalancer/deploy/nodebalancer.service
@@ -5,11 +5,11 @@ StartLimitIntervalSec=300
 StartLimitBurst=3
 
 [Service]
-WorkingDirectory=/home/ubuntu/moonstream/nodebalancer
-EnvironmentFile=/home/ubuntu/moonstream-secrets/app.env
+WorkingDirectory=/home/ubuntu/api/nodebalancer
+EnvironmentFile=/home/ubuntu/nodebalancer-secrets/app.env
 Restart=on-failure
 RestartSec=15s
-ExecStart=/home/ubuntu/moonstream/nodebalancer/nodebalancer server \
+ExecStart=/home/ubuntu/api/nodebalancer/nodebalancer server \
     -host "${AWS_LOCAL_IPV4}" \
     -port 8544 \
     -healthcheck \