From 39cdf1c162d45721cbe5ce290d9107a2ec1e39e7 Mon Sep 17 00:00:00 2001
From: Fedorov Vladimir <vladimir.fodorow@gmail.com>
Date: Tue, 20 May 2025 02:04:33 +0700
Subject: [PATCH] fix login

---
 src/components/GameWindow.vue  | 6 +++---
 src/components/LoginWindow.vue | 4 ++--
 src/components/net.ts          | 5 -----
 src/components/utils.ts        | 9 +++++++++
 4 files changed, 14 insertions(+), 10 deletions(-)
 delete mode 100644 src/components/net.ts
 create mode 100644 src/components/utils.ts

diff --git a/src/components/GameWindow.vue b/src/components/GameWindow.vue
index 7f45550..0a2a22b 100644
--- a/src/components/GameWindow.vue
+++ b/src/components/GameWindow.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
   import { ref, nextTick, watch, onMounted } from 'vue';
   import { useRoute, useRouter } from 'vue-router';
-  import { getApiUrl } from './net';
+  import { encodeUTF8ToBase64, getApiUrl } from './utils';
 
   const router = useRouter();
   const route = useRoute();
@@ -35,7 +35,7 @@
       {
         method: "GET",
         headers: {
-          "X-Id": login.value,
+          "X-Id": encodeUTF8ToBase64(login.value),
           "X-Password": password.value
         },
       }
@@ -65,7 +65,7 @@
       {
         method: "POST",
         headers: {
-          "X-Id": login.value,
+          "X-Id": encodeUTF8ToBase64(login.value),
           "X-Password": password.value
         },
         body: JSON.stringify({
diff --git a/src/components/LoginWindow.vue b/src/components/LoginWindow.vue
index ff5945b..8f7114b 100644
--- a/src/components/LoginWindow.vue
+++ b/src/components/LoginWindow.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
   import { onMounted, ref } from 'vue';
   import { useRouter } from 'vue-router';
-  import { getApiUrl } from './net';
+  import { encodeUTF8ToBase64, getApiUrl } from './utils';
 
   const router = useRouter();
 
@@ -19,7 +19,7 @@
       {
         method: "GET",
         headers: {
-          "X-Id": login.value,
+          "X-Id": encodeUTF8ToBase64(login.value),
           "X-Password": password.value
         },
       }
diff --git a/src/components/net.ts b/src/components/net.ts
deleted file mode 100644
index d8f1ce0..0000000
--- a/src/components/net.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export function getApiUrl(path: string) {
-  const url =  "http://" + window.location.host.split(":")[0] + ":8090" + path
-  console.log(url)
-  return url
-}
diff --git a/src/components/utils.ts b/src/components/utils.ts
new file mode 100644
index 0000000..fd81f5a
--- /dev/null
+++ b/src/components/utils.ts
@@ -0,0 +1,9 @@
+export function getApiUrl(path: string) {
+  const url =  "http://" + window.location.host.split(":")[0] + ":8090" + path
+  console.log(url)
+  return url
+}
+
+export function encodeUTF8ToBase64(s: string) {
+  return btoa(encodeURIComponent(s).replace(/%([0-9A-F]{2})/g, (_, p1) => String.fromCharCode(parseInt(p1, 16))))
+}