From c9f6b5206a68f6488252ab1b50e7f684def6bbcd Mon Sep 17 00:00:00 2001
From: Jason Ertel <jason.ertel@securityonionsolutions.com>
Date: Fri, 1 Nov 2024 16:18:40 -0400
Subject: [PATCH] connect

---
 salt/manager/tools/sbin/so-client | 2 +-
 salt/soc/files/bin/salt-relay.sh  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/salt/manager/tools/sbin/so-client b/salt/manager/tools/sbin/so-client
index 524de58e8..1eeaf7392 100755
--- a/salt/manager/tools/sbin/so-client
+++ b/salt/manager/tools/sbin/so-client
@@ -242,7 +242,7 @@ function createClient() {
   "grant_types": [ "client_credentials" ],
   "response_types": [ "code" ],
   "metadata": {
-    "note": "$note"
+    "note": "$note",
     "searchUsername": ""
   }
 }
diff --git a/salt/soc/files/bin/salt-relay.sh b/salt/soc/files/bin/salt-relay.sh
index 0ffdf9ad2..18ce8c0b0 100755
--- a/salt/soc/files/bin/salt-relay.sh
+++ b/salt/soc/files/bin/salt-relay.sh
@@ -170,8 +170,8 @@ function manage_client() {
         note=$(echo "$request" | jq -r .note)
         log "Performing client '$op' for client with name '$name' and note '$note'"
         response=$(so-client "$op" --name "$name" --note "$note" --json)
-        webResponse=$response
         exit_code=$?
+        webResponse=$response
         ;;
       delete)
         client_id=$(echo "$request" | jq -r .id)
@@ -190,8 +190,8 @@ function manage_client() {
         client_id=$(echo "$request" | jq -r .id)
         log "Performing '$op' operation for client '$client_id'"
         response=$(so-client "$op" --id "$client_id" --json)
-        webResponse=$response
         exit_code=$?
+        webResponse=$response
         ;;
       update)
         client_id=$(echo "$request" | jq -r .id)