fix: WanIpCheck web component

This commit is contained in:
Zack Spear
2023-06-22 12:35:44 -05:00
parent 45b3d07d61
commit 0cc53be948
3 changed files with 12 additions and 7 deletions

View File

@@ -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';
}
}
});

View File

@@ -25,7 +25,7 @@ onBeforeMount(() => {
<KeyActionsCe />
<hr />
<h3>WanIpCheckCe</h3>
<WanIpCheckCe />
<WanIpCheckCe php-wan-ip="47.184.85.45" />
<hr />
<h3>ModalsCe</h3>
<ModalsCe />

View File

@@ -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>