From c21e78c2ec24cc521334abe2b70a9481546c8896 Mon Sep 17 00:00:00 2001 From: Dennis Postma Date: Sun, 9 Feb 2025 03:34:33 +0100 Subject: [PATCH] Removed getDomain func. --- .env.example | 1 + src/application/config.ts | 1 + src/application/utilities.ts | 18 ------------------ src/services/authenticationService.ts | 3 +-- src/stores/gameStore.ts | 5 ++--- 5 files changed, 5 insertions(+), 23 deletions(-) diff --git a/.env.example b/.env.example index 0a2db3a..e33f811 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,5 @@ VITE_NAME=Noxious +VITE_DOMAIN=localhost VITE_ENVIRONMENT=development VITE_SERVER_ENDPOINT=http://localhost:4000 VITE_TILE_SIZE_WIDTH=64 diff --git a/src/application/config.ts b/src/application/config.ts index 62884cf..d20ddfd 100644 --- a/src/application/config.ts +++ b/src/application/config.ts @@ -1,5 +1,6 @@ export default { name: import.meta.env.VITE_NAME, + domain: import.meta.env.VITE_DOMAIN, environment: import.meta.env.VITE_ENVIRONMENT, server_endpoint: import.meta.env.VITE_SERVER_ENDPOINT, tile_size: { diff --git a/src/application/utilities.ts b/src/application/utilities.ts index 55e5ed4..460e1f5 100644 --- a/src/application/utilities.ts +++ b/src/application/utilities.ts @@ -10,24 +10,6 @@ export function unduplicateArray(array: any[]) { return [...new Set(array.flat())] } -export function getDomain() { - // Check if not localhost - if (window.location.hostname !== 'localhost') { - return window.location.hostname - } - - // Check if not IP address - if (window.location.hostname.match(/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/)) { - return window.location.hostname - } - - if (window.location.hostname.split('.').length < 3) { - return window.location.hostname - } - - return window.location.hostname.split('.').slice(-2).join('.') -} - export async function downloadCache(endpoint: string, storage: BaseStorage) { const request = await fetch(`${config.server_endpoint}/cache/${endpoint}`) const response = (await request.json()) as HttpResponse diff --git a/src/services/authenticationService.ts b/src/services/authenticationService.ts index 2f68e2f..2135ef2 100644 --- a/src/services/authenticationService.ts +++ b/src/services/authenticationService.ts @@ -1,5 +1,4 @@ import config from '@/application/config' -import { getDomain } from '@/application/utilities' import { useCookies } from '@vueuse/integrations/useCookies' import axios from 'axios' @@ -22,7 +21,7 @@ export async function login(username: string, password: string) { try { const response = await axios.post(`${config.server_endpoint}/login`, { username, password }) useCookies().set('token', response.data.data.token as string, { - domain: getDomain() + domain: config.domain }) return { success: true, token: response.data.data.token } } catch (error: any) { diff --git a/src/stores/gameStore.ts b/src/stores/gameStore.ts index 5746dbe..4c81ca8 100644 --- a/src/stores/gameStore.ts +++ b/src/stores/gameStore.ts @@ -1,6 +1,5 @@ import config from '@/application/config' -import type { Character, Notification, TextureData, User, WorldSettings } from '@/application/types' -import { getDomain } from '@/application/utilities' +import type { Character, Notification, User, WorldSettings } from '@/application/types' import { useCookies } from '@vueuse/integrations/useCookies' import { defineStore } from 'pinia' import { io, Socket } from 'socket.io-client' @@ -102,7 +101,7 @@ export const useGameStore = defineStore('game', { this.connection?.disconnect() useCookies().remove('token', { - domain: getDomain() + domain: config.domain }) this.connection = null