Compare commits
1 Commits
8f4996fb2b
...
f9e0c068f4
| Author | SHA1 | Date | |
|---|---|---|---|
| f9e0c068f4 |
7
src/api/user.ts
Normal file
7
src/api/user.ts
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
import apiClient from "./axios";
|
||||||
|
import type { SessionProfileResponse } from "@/types";
|
||||||
|
|
||||||
|
export const getUserProfile = (uuid: string) => {
|
||||||
|
// Этот эндпоинт не начинается с /api, поэтому указываем полный путь
|
||||||
|
return apiClient.get<SessionProfileResponse>(`/sessionserver/session/minecraft/profile/${uuid}`);
|
||||||
|
};
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
import { defineStore } from "pinia";
|
import { defineStore } from "pinia";
|
||||||
import { ref, computed } from "vue";
|
import { ref, computed } from "vue";
|
||||||
import { registerUser as apiRegisterUser } from "@/api/auth";
|
import { registerUser as apiRegisterUser } from "@/api/auth";
|
||||||
|
import { getUserProfile as apiGetUserProfile } from "@/api/user";
|
||||||
import type { RegisterRequest } from "@/types";
|
import type { RegisterRequest } from "@/types";
|
||||||
import router from "@/router";
|
import router from "@/router";
|
||||||
import apiClient from "@/api/axios";
|
import apiClient from "@/api/axios";
|
||||||
@@ -9,6 +10,7 @@ export const useAuthStore = defineStore("auth", () => {
|
|||||||
// State
|
// State
|
||||||
const user = ref<User | null>(null);
|
const user = ref<User | null>(null);
|
||||||
const token = ref<string | null>(localStorage.getItem("authToken"));
|
const token = ref<string | null>(localStorage.getItem("authToken"));
|
||||||
|
const skinUrl = ref<string | null>(null);
|
||||||
const isLoading = ref(false);
|
const isLoading = ref(false);
|
||||||
const error = ref<string | null>(null);
|
const error = ref<string | null>(null);
|
||||||
|
|
||||||
@@ -16,11 +18,34 @@ export const useAuthStore = defineStore("auth", () => {
|
|||||||
const isAuthenticated = computed(() => !!user.value && !!token.value);
|
const isAuthenticated = computed(() => !!user.value && !!token.value);
|
||||||
|
|
||||||
// Actions
|
// Actions
|
||||||
|
async function fetchUserProfile() {
|
||||||
|
if (!user.value) return;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await apiGetUserProfile(user.value.uuid);
|
||||||
|
if (response.data && response.data.properties) {
|
||||||
|
const textureProp = response.data.properties.find((p) => p.name === "textures");
|
||||||
|
if (textureProp) {
|
||||||
|
// Декодируем Base64-строку и парсим JSON
|
||||||
|
const textureData = JSON.parse(atob(textureProp.value));
|
||||||
|
if (textureData.textures?.SKIN?.url) {
|
||||||
|
skinUrl.value = textureData.textures.SKIN.url;
|
||||||
|
} else {
|
||||||
|
skinUrl.value = null; // У пользователя нет скина
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
console.error("Failed to fetch user profile:", e);
|
||||||
|
skinUrl.value = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
function setAuthData(userData: User, authToken: string) {
|
function setAuthData(userData: User, authToken: string) {
|
||||||
user.value = userData;
|
user.value = userData;
|
||||||
token.value = authToken;
|
token.value = authToken;
|
||||||
localStorage.setItem("authToken", authToken);
|
localStorage.setItem("authToken", authToken);
|
||||||
apiClient.defaults.headers.common["Authorization"] = `Bearer ${authToken}`;
|
apiClient.defaults.headers.common["Authorization"] = `Bearer ${authToken}`;
|
||||||
|
fetchUserProfile();
|
||||||
}
|
}
|
||||||
|
|
||||||
async function handleLogin(credentials: LoginRequest) {
|
async function handleLogin(credentials: LoginRequest) {
|
||||||
@@ -61,15 +86,24 @@ export const useAuthStore = defineStore("auth", () => {
|
|||||||
function handleLogout() {
|
function handleLogout() {
|
||||||
user.value = null;
|
user.value = null;
|
||||||
token.value = null;
|
token.value = null;
|
||||||
|
skinUrl.value = null;
|
||||||
localStorage.removeItem("authToken");
|
localStorage.removeItem("authToken");
|
||||||
delete apiClient.defaults.headers.common["Authorization"];
|
delete apiClient.defaults.headers.common["Authorization"];
|
||||||
router.push({ name: "login" });
|
router.push({ name: "login" });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function checkAuth() {
|
||||||
|
if (token.value) {
|
||||||
|
if (user.value) {
|
||||||
|
await fetchUserProfile();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
return {
|
return {
|
||||||
// State
|
// State
|
||||||
user,
|
user,
|
||||||
token,
|
token,
|
||||||
|
skinUrl,
|
||||||
isLoading,
|
isLoading,
|
||||||
error,
|
error,
|
||||||
// Getters
|
// Getters
|
||||||
@@ -78,5 +112,7 @@ export const useAuthStore = defineStore("auth", () => {
|
|||||||
handleLogin,
|
handleLogin,
|
||||||
handleRegister,
|
handleRegister,
|
||||||
handleLogout,
|
handleLogout,
|
||||||
|
fetchUserProfile,
|
||||||
|
checkAuth,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|||||||
12
src/types.ts
12
src/types.ts
@@ -26,3 +26,15 @@ export interface User {
|
|||||||
created_at: string;
|
created_at: string;
|
||||||
updated_at: string;
|
updated_at: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface ProfileProperty {
|
||||||
|
name: string;
|
||||||
|
value: string; // Base64-encoded JSON
|
||||||
|
signature: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface SessionProfileResponse {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
properties: ProfileProperty[];
|
||||||
|
}
|
||||||
|
|||||||
@@ -71,23 +71,49 @@ const onSkinUpload = async () => {
|
|||||||
if (skinViewer) {
|
if (skinViewer) {
|
||||||
skinViewer.loadSkin(URL.createObjectURL(selectedFile.value));
|
skinViewer.loadSkin(URL.createObjectURL(selectedFile.value));
|
||||||
}
|
}
|
||||||
|
await authStore.fetchUserProfile();
|
||||||
} catch (e: any) {
|
} catch (e: any) {
|
||||||
uploadError.value = e.response?.data || "Ошибка при загрузке файла.";
|
uploadError.value = e.response?.data || "Ошибка при загрузке файла.";
|
||||||
} finally {
|
} finally {
|
||||||
isLoading.value = false;
|
isLoading.value = false;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
// --- Логика для 3D-вьювера ---
|
||||||
|
const skinCanvas = ref<HTMLCanvasElement | null>(null);
|
||||||
|
let skinViewer: SkinViewer | null = null;
|
||||||
|
|
||||||
// Инициализация 3D-вьювера при монтировании компонента
|
const setupSkinViewer = () => {
|
||||||
onMounted(() => {
|
if (skinCanvas.value && !skinViewer) {
|
||||||
if (skinCanvas.value) {
|
|
||||||
skinViewer = new SkinViewer({
|
skinViewer = new SkinViewer({
|
||||||
canvas: skinCanvas.value,
|
canvas: skinCanvas.value,
|
||||||
width: 300,
|
width: 300,
|
||||||
height: 400,
|
height: 400,
|
||||||
skin: "/default_skin.png",
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Следим за изменением URL скина в сторе и обновляем вьювер
|
||||||
|
watch(
|
||||||
|
() => authStore.skinUrl,
|
||||||
|
(newUrl) => {
|
||||||
|
if (skinViewer) {
|
||||||
|
if (newUrl) {
|
||||||
|
skinViewer.loadSkin(newUrl);
|
||||||
|
} else {
|
||||||
|
// Если у пользователя нет скина, показываем скин по умолчанию
|
||||||
|
skinViewer.loadSkin("/default_skin.png");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{ immediate: true },
|
||||||
|
);
|
||||||
|
|
||||||
|
// Инициализация 3D-вьювера при монтировании компонента
|
||||||
|
onMounted(() => {
|
||||||
|
setupSkinViewer();
|
||||||
|
if (!authStore.skinUrl && authStore.isAuthenticated) {
|
||||||
|
authStore.fetchUserProfile();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// Очистка ресурсов при размонтировании
|
// Очистка ресурсов при размонтировании
|
||||||
|
|||||||
Reference in New Issue
Block a user