refactor: outsource auth function in all routes
This commit is contained in:
@@ -1,14 +1,10 @@
|
|||||||
import { createFileRoute, redirect } from "@tanstack/react-router";
|
import { createFileRoute } from "@tanstack/react-router";
|
||||||
import { isAuthenticated } from "../../../utils/api/auth";
|
import { verifyLogin } from "../../../utils/api/auth";
|
||||||
import { AddProduct } from "../../../pages/AddProduct";
|
import { AddProduct } from "../../../pages/AddProduct";
|
||||||
|
|
||||||
export const Route = createFileRoute("/app/_hiddenLayout/add-product")({
|
export const Route = createFileRoute("/app/_hiddenLayout/add-product")({
|
||||||
beforeLoad: async () => {
|
beforeLoad: async () => {
|
||||||
if (!(await isAuthenticated())) {
|
await verifyLogin();
|
||||||
throw redirect({
|
|
||||||
to: "/login",
|
|
||||||
});
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
component: RouteComponent,
|
component: RouteComponent,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,14 +1,10 @@
|
|||||||
import { createFileRoute, redirect } from "@tanstack/react-router";
|
import { createFileRoute } from "@tanstack/react-router";
|
||||||
import { isAuthenticated } from "../../../utils/api/auth";
|
import { verifyLogin } from "../../../utils/api/auth";
|
||||||
import { Settings } from "../../../pages/Settings";
|
import { Settings } from "../../../pages/Settings";
|
||||||
|
|
||||||
export const Route = createFileRoute("/app/_hiddenLayout/app-settings")({
|
export const Route = createFileRoute("/app/_hiddenLayout/app-settings")({
|
||||||
beforeLoad: async () => {
|
beforeLoad: async () => {
|
||||||
if (!(await isAuthenticated())) {
|
await verifyLogin();
|
||||||
throw redirect({
|
|
||||||
to: "/login",
|
|
||||||
});
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
component: RouteComponent,
|
component: RouteComponent,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,14 +1,10 @@
|
|||||||
import { createFileRoute, redirect } from "@tanstack/react-router";
|
import { createFileRoute } from "@tanstack/react-router";
|
||||||
import { isAuthenticated } from "../../../utils/api/auth";
|
import { verifyLogin } from "../../../utils/api/auth";
|
||||||
import { InventoryPage } from "../../../pages/Inventory";
|
import { InventoryPage } from "../../../pages/Inventory";
|
||||||
|
|
||||||
export const Route = createFileRoute("/app/_hiddenLayout/inventory")({
|
export const Route = createFileRoute("/app/_hiddenLayout/inventory")({
|
||||||
beforeLoad: async () => {
|
beforeLoad: async () => {
|
||||||
if (!(await isAuthenticated())) {
|
await verifyLogin();
|
||||||
throw redirect({
|
|
||||||
to: "/login",
|
|
||||||
});
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
component: RouteComponent,
|
component: RouteComponent,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,14 +1,10 @@
|
|||||||
import { createFileRoute, redirect } from "@tanstack/react-router";
|
import { createFileRoute } from "@tanstack/react-router";
|
||||||
import { isAuthenticated } from "../../../utils/api/auth";
|
import { verifyLogin } from "../../../utils/api/auth";
|
||||||
import { Storages } from "../../../pages/Storages";
|
import { Storages } from "../../../pages/Storages";
|
||||||
|
|
||||||
export const Route = createFileRoute("/app/_hiddenLayout/storages")({
|
export const Route = createFileRoute("/app/_hiddenLayout/storages")({
|
||||||
beforeLoad: async () => {
|
beforeLoad: async () => {
|
||||||
if (!(await isAuthenticated())) {
|
await verifyLogin();
|
||||||
throw redirect({
|
|
||||||
to: "/login",
|
|
||||||
});
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
component: RouteComponent,
|
component: RouteComponent,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,15 +1,11 @@
|
|||||||
import { createFileRoute, redirect } from "@tanstack/react-router";
|
import { createFileRoute } from "@tanstack/react-router";
|
||||||
import { z } from "zod";
|
import { z } from "zod";
|
||||||
import { isAuthenticated } from "../../../utils/api/auth";
|
import { verifyLogin } from "../../../utils/api/auth";
|
||||||
import { ViewProduct } from "../../../pages/ViewProduct";
|
import { ViewProduct } from "../../../pages/ViewProduct";
|
||||||
|
|
||||||
export const Route = createFileRoute("/app/_hiddenLayout/view-product")({
|
export const Route = createFileRoute("/app/_hiddenLayout/view-product")({
|
||||||
beforeLoad: async () => {
|
beforeLoad: async () => {
|
||||||
if (!(await isAuthenticated())) {
|
await verifyLogin();
|
||||||
throw redirect({
|
|
||||||
to: "/login",
|
|
||||||
});
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
validateSearch: z.object({
|
validateSearch: z.object({
|
||||||
product: z.string(),
|
product: z.string(),
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ export const Route = createFileRoute("/")({
|
|||||||
if (!(await isAuthenticated())) {
|
if (!(await isAuthenticated())) {
|
||||||
throw redirect({
|
throw redirect({
|
||||||
to: "/login",
|
to: "/login",
|
||||||
|
search: { loggedOut: true },
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
throw redirect({
|
throw redirect({
|
||||||
|
|||||||
@@ -1,7 +1,11 @@
|
|||||||
import { createFileRoute } from "@tanstack/react-router";
|
import { createFileRoute } from "@tanstack/react-router";
|
||||||
import { LoginCard } from "../components/LoginCard";
|
import { LoginCard } from "../components/LoginCard";
|
||||||
|
import { checkLogin } from "../utils/api/auth.ts";
|
||||||
|
|
||||||
export const Route = createFileRoute("/login")({
|
export const Route = createFileRoute("/login")({
|
||||||
|
beforeLoad: async () => {
|
||||||
|
await checkLogin();
|
||||||
|
},
|
||||||
component: RouteComponent,
|
component: RouteComponent,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -1,85 +1,98 @@
|
|||||||
import {API_BASE} from "../../config/api.config";
|
import { API_BASE } from "../../config/api.config";
|
||||||
import Cookies from "js-cookie";
|
import Cookies from "js-cookie";
|
||||||
import type {TFunction} from "i18next";
|
import type { TFunction } from "i18next";
|
||||||
import {fetchSettings} from "./settings";
|
import { fetchSettings } from "./settings";
|
||||||
import type {ChangePasswordIntf} from "../../misc/interfaces";
|
import type { ChangePasswordIntf } from "../../misc/interfaces";
|
||||||
import {createApiError} from "./apiError";
|
import { createApiError } from "./apiError";
|
||||||
|
import { redirect } from "@tanstack/react-router";
|
||||||
|
|
||||||
export async function isAuthenticated() {
|
export const isAuthenticated = async () => {
|
||||||
if (Cookies.get("token")) {
|
if (Cookies.get("token")) {
|
||||||
const result = await fetch(`${API_BASE}/users/verify-token`, {
|
const result = await fetch(`${API_BASE}/users/verify-token`, {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: {
|
headers: {
|
||||||
Authorization: `Bearer ${Cookies.get("token") || ""}`,
|
Authorization: `Bearer ${Cookies.get("token") || ""}`,
|
||||||
"Content-Type": "application/json",
|
"Content-Type": "application/json",
|
||||||
Accept: "application/json",
|
Accept: "application/json",
|
||||||
},
|
},
|
||||||
});
|
|
||||||
|
|
||||||
if (result.status === 200) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Cookies.remove("token");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function signInUser(
|
|
||||||
username: string,
|
|
||||||
password: string,
|
|
||||||
t: TFunction,
|
|
||||||
) {
|
|
||||||
const result = await fetch(`${API_BASE}/users/login`, {
|
|
||||||
method: "POST",
|
|
||||||
headers: {
|
|
||||||
Authorization: `Bearer ${Cookies.get("token") || ""}`,
|
|
||||||
"Content-Type": "application/json",
|
|
||||||
Accept: "application/json",
|
|
||||||
},
|
|
||||||
body: JSON.stringify({username, password}),
|
|
||||||
});
|
});
|
||||||
|
|
||||||
const response = await result.json();
|
if (result.status === 200) {
|
||||||
|
return true;
|
||||||
if (result.status === 202) {
|
|
||||||
Cookies.set("token", response.data.token);
|
|
||||||
|
|
||||||
const settings = await fetchSettings();
|
|
||||||
Cookies.set("app-name", settings?.data[0].value);
|
|
||||||
Cookies.set("currency", settings?.data[1].value);
|
|
||||||
|
|
||||||
return {ok: true as const};
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Cookies.remove("token");
|
Cookies.remove("token");
|
||||||
throw createApiError(response.code, t(response.code || "unknown-error"));
|
return false;
|
||||||
}
|
};
|
||||||
|
|
||||||
export function signOutUser() {
|
export const signInUser = async (
|
||||||
Cookies.remove("token");
|
username: string,
|
||||||
return {ok: true as const};
|
password: string,
|
||||||
}
|
t: TFunction,
|
||||||
|
) => {
|
||||||
|
const result = await fetch(`${API_BASE}/users/login`, {
|
||||||
|
method: "POST",
|
||||||
|
headers: {
|
||||||
|
Authorization: `Bearer ${Cookies.get("token") || ""}`,
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
Accept: "application/json",
|
||||||
|
},
|
||||||
|
body: JSON.stringify({ username, password }),
|
||||||
|
});
|
||||||
|
|
||||||
|
const response = await result.json();
|
||||||
|
|
||||||
|
if (result.status === 202) {
|
||||||
|
Cookies.set("token", response.data.token);
|
||||||
|
|
||||||
|
const settings = await fetchSettings();
|
||||||
|
Cookies.set("app-name", settings?.data[0].value);
|
||||||
|
Cookies.set("currency", settings?.data[1].value);
|
||||||
|
|
||||||
|
return { ok: true as const };
|
||||||
|
}
|
||||||
|
|
||||||
|
Cookies.remove("token");
|
||||||
|
throw createApiError(response.code, t(response.code || "unknown-error"));
|
||||||
|
};
|
||||||
|
|
||||||
export const mutatePassword = async (payload: ChangePasswordIntf) => {
|
export const mutatePassword = async (payload: ChangePasswordIntf) => {
|
||||||
const result = await fetch(`${API_BASE}/users/change-password`, {
|
const result = await fetch(`${API_BASE}/users/change-password`, {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: {
|
headers: {
|
||||||
Authorization: `Bearer ${Cookies.get("token") || ""}`,
|
Authorization: `Bearer ${Cookies.get("token") || ""}`,
|
||||||
"Content-Type": "application/json",
|
"Content-Type": "application/json",
|
||||||
Accept: "application/json",
|
Accept: "application/json",
|
||||||
},
|
},
|
||||||
body: JSON.stringify({
|
body: JSON.stringify({
|
||||||
currentPassword: payload.currentPassword,
|
currentPassword: payload.currentPassword,
|
||||||
newPassword: payload.newPassword,
|
newPassword: payload.newPassword,
|
||||||
}),
|
}),
|
||||||
});
|
});
|
||||||
|
|
||||||
const response = await result.json();
|
const response = await result.json();
|
||||||
|
|
||||||
if (response.code === "SU005") {
|
if (response.code === "SU005") {
|
||||||
return {code: response.code};
|
return { code: response.code };
|
||||||
}
|
}
|
||||||
|
|
||||||
throw createApiError(response.code, "Change password failed");
|
throw createApiError(response.code, "Change password failed");
|
||||||
|
};
|
||||||
|
|
||||||
|
export const verifyLogin = async () => {
|
||||||
|
if (!(await isAuthenticated())) {
|
||||||
|
throw redirect({
|
||||||
|
to: "/login",
|
||||||
|
search: { loggedOut: true },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
export const checkLogin = async () => {
|
||||||
|
if (await isAuthenticated()) {
|
||||||
|
throw redirect({
|
||||||
|
to: "/app/inventory",
|
||||||
|
});
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user