From 2f905caccc02943d4458eda8962709af03a5ef28 Mon Sep 17 00:00:00 2001
From: Zack Spear <hi@zackspear.com>
Date: Thu, 22 Jun 2023 12:35:44 -0500
Subject: [PATCH] fix: WanIpCheck web component

---
 components/WanIpCheck.ce.vue | 15 ++++++++++-----
 pages/index.vue              |  2 +-
 pages/webComponents.vue      |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/components/WanIpCheck.ce.vue b/components/WanIpCheck.ce.vue
index f9c8ec6a0..222030dc0 100644
--- a/components/WanIpCheck.ce.vue
+++ b/components/WanIpCheck.ce.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import { storeToRefs } from 'pinia';
+import { request } from '~/composables/services/request';
 import { useServerStore } from '~/store/server';
 import 'tailwindcss/tailwind.css';
 import '~/assets/main.css';
@@ -31,15 +32,19 @@ watch(wanIp, async () => {
   // if we don't have a client WAN IP AND we have the server WAN IP then we fetch
   if (!wanIp.value && props.phpWanIp) {
     loading.value = true;
-    const { data, error } = await useFetch('https://wanip4.unraid.net/');
-    if (data.value) {
+
+    const response = await request.url('https://wanip4.unraid.net/')
+      .get()
+      .text();
+
+    if (response) {
       loading.value = false;
-      wanIp.value = data.value as string; // response returns text nothing to traverse
+      wanIp.value = response as string; // response returns text nothing to traverse
       // save in sessionStorage so we only make this request once per webGUI session
       sessionStorage.setItem('unraidConnect_wanIp', wanIp.value);
-    } else if (error.value) {
+    } else {
       loading.value = false;
-      fetchError.value = error.value;
+      fetchError.value = 'Unable to fetch client WAN IPv4';
     }
   }
 });
diff --git a/pages/index.vue b/pages/index.vue
index 308686789..9ed6f004b 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -25,7 +25,7 @@ onBeforeMount(() => {
         <KeyActionsCe />
         <hr />
         <h3>WanIpCheckCe</h3>
-        <WanIpCheckCe />
+        <WanIpCheckCe php-wan-ip="47.184.85.45" />
         <hr />
         <h3>ModalsCe</h3>
         <ModalsCe />
diff --git a/pages/webComponents.vue b/pages/webComponents.vue
index 3c31577ad..ee0d1b9f1 100644
--- a/pages/webComponents.vue
+++ b/pages/webComponents.vue
@@ -25,7 +25,7 @@ onBeforeMount(() => {
         <connect-key-actions></connect-key-actions>
         <hr />
         <h3>WanIpCheckCe</h3>
-        <connect-wan-ip-check></connect-wan-ip-check>
+        <connect-wan-ip-check php-wan-ip="47.184.85.45"></connect-wan-ip-check>
         <hr />
         <h3>ModalsCe</h3>
         <connect-modals></connect-modals>