From 6efc687036e1e2dfa932573037c32171927fd839 Mon Sep 17 00:00:00 2001
From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com>
Date: Sun, 2 Feb 2025 12:34:02 -0500
Subject: [PATCH] fix(ui): properly handle boolean json responses (#3626)

---
 src_assets/common/assets/web/apps.html          |  4 ++--
 src_assets/common/assets/web/password.html      |  6 +++---
 src_assets/common/assets/web/pin.html           |  2 +-
 .../common/assets/web/troubleshooting.html      | 17 +++++++++--------
 src_assets/common/assets/web/welcome.html       |  6 +++---
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src_assets/common/assets/web/apps.html b/src_assets/common/assets/web/apps.html
index 73e5b274..66e264e3 100644
--- a/src_assets/common/assets/web/apps.html
+++ b/src_assets/common/assets/web/apps.html
@@ -441,7 +441,7 @@
         );
         if (resp) {
           fetch("./api/apps/" + id, { method: "DELETE" }).then((r) => {
-            if (r.status == 200) document.location.reload();
+            if (r.status === 200) document.location.reload();
           });
         }
       },
@@ -557,7 +557,7 @@
           method: "POST",
           body: JSON.stringify(this.editForm),
         }).then((r) => {
-          if (r.status == 200) document.location.reload();
+          if (r.status === 200) document.location.reload();
         });
       },
     },
diff --git a/src_assets/common/assets/web/password.html b/src_assets/common/assets/web/password.html
index 7c0163fd..854ee596 100644
--- a/src_assets/common/assets/web/password.html
+++ b/src_assets/common/assets/web/password.html
@@ -94,10 +94,10 @@
           method: "POST",
           body: JSON.stringify(this.passwordData),
         }).then((r) => {
-          if (r.status == 200) {
+          if (r.status === 200) {
             r.json().then((rj) => {
-              if (rj.status.toString() === "true") {
-                this.success = true;
+              this.success = rj.status;
+              if (this.success === true) {
                 setTimeout(() => {
                   document.location.reload();
                 }, 5000);
diff --git a/src_assets/common/assets/web/pin.html b/src_assets/common/assets/web/pin.html
index 8b9c794b..a5dcdb5d 100644
--- a/src_assets/common/assets/web/pin.html
+++ b/src_assets/common/assets/web/pin.html
@@ -42,7 +42,7 @@
         fetch("./api/pin", {method: "POST", body: b})
           .then((response) => response.json())
           .then((response) => {
-            if (response.status.toString().toLowerCase() === "true") {
+            if (response.status === true) {
               document.querySelector(
                 "#status"
               ).innerHTML = `<div class="alert alert-success" role="alert">${this.i18n.t('pin.pair_success')}</div>`;
diff --git a/src_assets/common/assets/web/troubleshooting.html b/src_assets/common/assets/web/troubleshooting.html
index 9ac45698..46d7218b 100644
--- a/src_assets/common/assets/web/troubleshooting.html
+++ b/src_assets/common/assets/web/troubleshooting.html
@@ -120,13 +120,14 @@
       </div>
       <ul id="client-list" class="list-group list-group-flush list-group-item-light" v-if="clients && clients.length > 0">
         <div v-for="client in clients" class="list-group-item d-flex">
-          <div class="p-2 flex-grow-1">{{client.name != "" ? client.name : $t('troubleshooting.unpair_single_unknown')}}</div><div class="me-2 ms-auto btn btn-danger" @click="unpairSingle(client.uuid)"><i class="fas fa-trash"></i></div>
+          <div class="p-2 flex-grow-1">{{ client.name !== "" ? client.name : $t('troubleshooting.unpair_single_unknown') }}</div>
+          <div class="me-2 ms-auto btn btn-danger" @click="unpairSingle(client.uuid)"><i class="fas fa-trash"></i></div>
         </div>
       </ul>
       <ul v-else class="list-group list-group-flush list-group-item-light">
         <div class="list-group-item p-3 text-center"><em>{{ $t('troubleshooting.unpair_single_no_devices') }}</em></div>
       </ul>
-      
+
     </div>
     <!-- Logs -->
     <div class="card p-2 my-4">
@@ -176,7 +177,7 @@
         actualLogs() {
           if (!this.logFilter) return this.logs;
           let lines = this.logs.split("\n");
-          lines = lines.filter(x => x.indexOf(this.logFilter) != -1);
+          lines = lines.filter(x => x.indexOf(this.logFilter) !== -1);
           return lines.join("\n");
         }
       },
@@ -210,7 +211,7 @@
             .then((r) => r.json())
             .then((r) => {
               this.closeAppPressed = false;
-              this.closeAppStatus = r.status.toString() === "true";
+              this.closeAppStatus = r.status;
               setTimeout(() => {
                 this.closeAppStatus = null;
               }, 5000);
@@ -222,7 +223,7 @@
             .then((r) => r.json())
             .then((r) => {
               this.unpairAllPressed = false;
-              this.unpairAllStatus = r.status.toString() === "true";
+              this.unpairAllStatus = r.status;
               setTimeout(() => {
                 this.unpairAllStatus = null;
               }, 5000);
@@ -240,9 +241,9 @@
             .then((response) => response.json())
             .then((response) => {
               const clientList = document.querySelector("#client-list");
-              if (response.status === 'true' && response.named_certs && response.named_certs.length) {
+              if (response.status === true && response.named_certs && response.named_certs.length) {
                 this.clients = response.named_certs.sort((a, b) => {
-                  return (a.name.toLowerCase() > b.name.toLowerCase() || a.name == "" ? 1 : -1)
+                  return (a.name.toLowerCase() > b.name.toLowerCase() || a.name === "" ? 1 : -1)
                 });
               } else {
                 this.clients = [];
@@ -270,7 +271,7 @@
             .then((r) => r.json())
             .then((r) => {
               this.ddResetPressed = false;
-              this.ddResetStatus = r.status.toString() === "true";
+              this.ddResetStatus = r.status;
               setTimeout(() => {
                 this.ddResetStatus = null;
               }, 5000);
diff --git a/src_assets/common/assets/web/welcome.html b/src_assets/common/assets/web/welcome.html
index 4765aeb5..2f06c8a1 100644
--- a/src_assets/common/assets/web/welcome.html
+++ b/src_assets/common/assets/web/welcome.html
@@ -81,10 +81,10 @@
           body: JSON.stringify(this.passwordData),
         }).then((r) => {
           this.loading = false;
-          if (r.status == 200) {
+          if (r.status === 200) {
             r.json().then((rj) => {
-              if (rj.status.toString() === "true") {
-                this.success = true;
+              this.success = rj.status;
+              if (this.success === true) {
                 setTimeout(() => {
                   document.location.reload();
                 }, 5000);