diff --git a/app/api/config.ts b/app/api/config.ts index e4aeda4..431251b 100644 --- a/app/api/config.ts +++ b/app/api/config.ts @@ -13,6 +13,7 @@ export const ENDPOINTS = { licensed: `${API_PREFIX}/release/streaming/platform`, }, user: { + auth: `${API_PREFIX}/auth/signIn`, profile: `${API_PREFIX}/profile`, bookmark: `${API_PREFIX}/profile/list`, history: `${API_PREFIX}/history`, diff --git a/app/api/profile/login/route.ts b/app/api/profile/login/route.ts deleted file mode 100644 index 21d5a51..0000000 --- a/app/api/profile/login/route.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { NextResponse, NextRequest } from "next/server"; -import { authorize } from "#/api/utils"; -import { API_URL } from "#/api/config"; - -export async function POST(request: NextRequest) { - const response = await authorize(`${API_URL}/auth/signIn`, await request.json()); - if (!response) { - return NextResponse.json({ message: "Server Error" }, { status: 500 }); - } - if (!response.profile) { - return NextResponse.json({ message: "Profile not found" }, { status: 404 }); - } - return NextResponse.json(response); -} diff --git a/app/api/utils.ts b/app/api/utils.ts index 744779f..51a2d1e 100644 --- a/app/api/utils.ts +++ b/app/api/utils.ts @@ -4,7 +4,6 @@ export const HEADERS = { "Content-Type": "application/json; charset=UTF-8", }; -// Types for the result object with discriminated union type Success = { data: T; error: null; @@ -17,7 +16,6 @@ type Failure = { type Result = Success | Failure; -// Main wrapper function export async function tryCatch( promise: Promise ): Promise> { @@ -70,7 +68,7 @@ export async function tryCatchAPI( return { data, error: null }; } catch (error) { - return { data: null, error: error}; + return { data: null, error: error }; } } @@ -84,7 +82,8 @@ export const useSWRfetcher = async (url: string) => { export const fetchDataViaGet = async ( url: string, - API_V2: string | boolean = false + API_V2: string | boolean = false, + addHeaders?: Record ) => { if (API_V2) { HEADERS["API-Version"] = "v2"; @@ -92,7 +91,7 @@ export const fetchDataViaGet = async ( const { data, error } = await tryCatchAPI( fetch(url, { - headers: HEADERS, + headers: { ...HEADERS, ...addHeaders }, }) ); @@ -103,54 +102,21 @@ export const fetchDataViaPost = async ( url: string, body: string, API_V2: string | boolean = false, - contentType: string = "" + addHeaders?: Record ) => { if (API_V2) { HEADERS["API-Version"] = "v2"; } - if (contentType != "") { - HEADERS["Content-Type"] = contentType; - } - try { - const response = await fetch(url, { + const { data, error } = await tryCatchAPI( + fetch(url, { method: "POST", - headers: HEADERS, body: body, - }); - if (response.status !== 200) { - return null; - } - const data = await response.json(); - return data; - } catch (error) { - console.log(error); - } -}; + headers: { ...HEADERS, ...addHeaders }, + }) + ); -export const authorize = async ( - url: string, - data: { login: string; password: string } -) => { - try { - const response = await fetch( - `${url}?login=${data.login}&password=${data.password}`, - { - method: "POST", - headers: { - "User-Agent": USER_AGENT, - Sign: "9aa5c7af74e8cd70c86f7f9587bde23d", - "Content-Type": "application/x-www-form-urlencoded", - }, - } - ); - if (response.status !== 200) { - throw new Error("Error authorizing user"); - } - return await response.json(); - } catch (error) { - return error; - } + return { data, error }; }; export function setJWT(user_id: number | string, jwt: string) { diff --git a/app/pages/Login.tsx b/app/pages/Login.tsx index c316708..4b55c56 100644 --- a/app/pages/Login.tsx +++ b/app/pages/Login.tsx @@ -1,8 +1,11 @@ "use client"; import { useState, useEffect } from "react"; import { useUserStore } from "#/store/auth"; -import { setJWT } from "#/api/utils"; +import { setJWT, tryCatchAPI } from "#/api/utils"; import { useRouter, useSearchParams } from "next/navigation"; +import { useThemeMode } from "flowbite-react"; +import { toast } from "react-toastify"; +import { ENDPOINTS } from "#/api/config"; export function LoginPage() { const [login, setLogin] = useState(""); @@ -12,37 +15,78 @@ export function LoginPage() { const router = useRouter(); const searchParams = useSearchParams(); const redirect = searchParams.get("redirect") || null; + const theme = useThemeMode(); + const [isSending, setIsSending] = useState(false); - function submit(e) { + async function submit(e) { e.preventDefault(); - fetch("/api/profile/login", { - method: "POST", - headers: { - "Content-Type": "application/json", - }, - body: JSON.stringify({ - login: login, - password: password, - }), - }) - .then((response) => { - if (response.ok) { - return response.json(); - } else { - alert("Ошибка получения пользователя."); - } + setIsSending(true); + + const tid = toast.loading("Выполняем вход...", { + position: "bottom-center", + hideProgressBar: true, + closeOnClick: false, + pauseOnHover: false, + draggable: false, + theme: theme.mode == "light" ? "light" : "dark", + }); + + const { data, error } = await tryCatchAPI( + fetch(`${ENDPOINTS.user.auth}?login=${login}&password=${password}`, { + method: "POST", + headers: { + Sign: "9aa5c7af74e8cd70c86f7f9587bde23d", + "Content-Type": "application/x-www-form-urlencoded", + }, }) - .then((data) => { - if (data.profileToken) { - userStore.login(data.profile, data.profileToken.token); - if (remember) { - setJWT(data.profile.id, data.profileToken.token); - } - router.push("/"); - } else { - alert("Неверные данные."); - } + ); + + if (error) { + let message = `Ошибка получения пользователя, code: ${error.code}` + if (error.code == 2) { + message = "Такого пользователя не существует" + } + if (error.code == 3) { + message = "Неправильно указан логин и/или пароль" + } + toast.update(tid, { + render: message, + type: "error", + autoClose: 2500, + isLoading: false, + closeOnClick: true, + draggable: true, }); + setIsSending(false); + return; + } + + if (!data.profileToken) { + toast.update(tid, { + render: "Не удалось войти в аккаунт", + type: "error", + autoClose: 2500, + isLoading: false, + closeOnClick: true, + draggable: true, + }); + setIsSending(false); + return; + } + + userStore.login(data.profile, data.profileToken.token); + if (remember) { + setJWT(data.profile.id, data.profileToken.token); + } + + toast.update(tid, { + render: "Вход успешен!", + type: "success", + autoClose: 2500, + isLoading: false, + closeOnClick: true, + draggable: true, + }); } useEffect(() => { @@ -53,7 +97,7 @@ export function LoginPage() { }, [userStore.user]); return ( -
+
diff --git a/middleware.ts b/middleware.ts index 8e9184e..5408eba 100644 --- a/middleware.ts +++ b/middleware.ts @@ -49,26 +49,33 @@ export default async function middleware( const path = url.pathname.match(/\/api\/proxy\/(.*)/)?.[1] + url.search; const ReqContentTypeHeader = request.headers.get("Content-Type") || ""; + const ReqSignHeader = request.headers.get("Sign") || null; let ResContentTypeHeader = ""; let body = null; if (ReqContentTypeHeader.split(";")[0] == "multipart/form-data") { ResContentTypeHeader = ReqContentTypeHeader; body = await request.arrayBuffer(); + } else if (ReqContentTypeHeader == "application/x-www-form-urlencoded") { + ResContentTypeHeader = ReqContentTypeHeader; } else { ResContentTypeHeader = "application/json; charset=UTF-8"; body = JSON.stringify(await request.json()); } - const data = await fetchDataViaPost( + let resHeaders = {}; + resHeaders["Content-Type"] = ResContentTypeHeader; + ReqSignHeader && (resHeaders["Sign"] = ReqSignHeader); + + const { data, error } = await fetchDataViaPost( `${API_URL}/${path}`, body, isApiV2, - ResContentTypeHeader + resHeaders ); - if (!data) { - return new Response(JSON.stringify({ message: "Error Fetching Data" }), { + if (error) { + return new Response(JSON.stringify(error), { status: 500, headers: { "Content-Type": "application/json",