diff --git a/src/kitUI/publicRoute.tsx b/src/kitUI/publicRoute.tsx
index 4759b4a..5946241 100644
--- a/src/kitUI/publicRoute.tsx
+++ b/src/kitUI/publicRoute.tsx
@@ -5,6 +5,7 @@ import { authStore } from "@root/stores/auth";
const PublicRoute = ({ children }: any) => {
const location = useLocation();
const { token } = authStore();
+ console.log(token)
if (token) {
return ;
diff --git a/src/pages/dashboard/Content/Users.tsx b/src/pages/dashboard/Content/Users.tsx
index 816a0aa..6c1359d 100644
--- a/src/pages/dashboard/Content/Users.tsx
+++ b/src/pages/dashboard/Content/Users.tsx
@@ -16,8 +16,16 @@ import ClearIcon from "@mui/icons-material/Clear";
import { getRoles_mock, TMockData } from "../../../api/roles";
import theme from "../../../theme";
import axios from "axios";
+import {authStore} from "@stores/auth";
const Users: React.FC = () => {
+ const { makeRequest } = authStore();
+ makeRequest({
+ url: "https://admin.pena.digital/strator/account",
+ method: "get",
+ bearer: true,
+ contentType: true,
+ })
const radioboxes = ["a", "b", "c"];
const [selectedValue, setSelectedValue] = React.useState("a");
diff --git a/src/pages/dashboard/Header/index.tsx b/src/pages/dashboard/Header/index.tsx
index be7cdb1..b7feb52 100644
--- a/src/pages/dashboard/Header/index.tsx
+++ b/src/pages/dashboard/Header/index.tsx
@@ -53,7 +53,7 @@ const Header: React.FC = () => {
{
makeRequest({
- url: "https://admin.pena.digital/auth/logout",
+ url: "https://admin.pena.digital/auth/auth/logout",
contentType: true,
}).then(() => localStorage.setItem("AT", ""));
}}
diff --git a/src/stores/auth.ts b/src/stores/auth.ts
index 05c5cdb..93cdf17 100644
--- a/src/stores/auth.ts
+++ b/src/stores/auth.ts
@@ -17,11 +17,12 @@ interface FirstRequest {
body?: T;
useToken?: boolean;
contentType?: boolean;
+ bearer?: boolean;
signal?: AbortSignal;
}
export const authStore = create()(
- devtools(
+ devtools(
(set, get) => ({
token: "",
setToken: (newToken) => set({ token: newToken }),
@@ -50,13 +51,14 @@ async function makeRequest({
useToken = true,
signal,
contentType = false,
+ bearer = false,
HC,
token,
}: MakeRequest) {
//В случае 401 рефреш должен попробовать вызваться 1 раз
let counterRefresh = true;
let headers: any = {};
- if (useToken) headers["Authorization"] = token;
+ if (useToken) headers["Authorization"] = bearer ? "Bearer " + token : token;
if (contentType) headers["Content-Type"] = "application/json";
try {