fix user validation & middleware
This commit is contained in:
@@ -123,9 +123,9 @@ export const middleware = async (req: NextRequest) => {
|
|||||||
|
|
||||||
// Handle API requests
|
// Handle API requests
|
||||||
if (pathname.startsWith(apiPath)) {
|
if (pathname.startsWith(apiPath)) {
|
||||||
const reqToken = req.headers.get("Authorization")?.split(" ")[1];
|
// const reqToken = req.headers.get("Authorization")?.split(" ")[1];
|
||||||
if (!reqToken) {
|
if (!token) {
|
||||||
return setCorsHeaders(unauthorizedResponseToken());
|
return setCorsHeaders(unauthorizedResponseTokenAPI());
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -134,7 +134,7 @@ export const middleware = async (req: NextRequest) => {
|
|||||||
{
|
{
|
||||||
headers: {
|
headers: {
|
||||||
"Content-Type": "application/json",
|
"Content-Type": "application/json",
|
||||||
Authorization: `Bearer ${reqToken}`,
|
Authorization: `Bearer ${token}`,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
@@ -175,7 +175,7 @@ export const middleware = async (req: NextRequest) => {
|
|||||||
console.error("Error validating user:", error);
|
console.error("Error validating user:", error);
|
||||||
if (!token) {
|
if (!token) {
|
||||||
console.error("Token is undefined");
|
console.error("Token is undefined");
|
||||||
return setCorsHeaders(unauthorizedResponseToken());
|
return setCorsHeaders(unauthorizedResponseTokenPAGE());
|
||||||
}
|
}
|
||||||
return setCorsHeaders(
|
return setCorsHeaders(
|
||||||
await unauthorizedResponseValidationUser({
|
await unauthorizedResponseValidationUser({
|
||||||
@@ -226,8 +226,15 @@ function unauthorizedResponse() {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function unauthorizedResponseToken() {
|
function unauthorizedResponseTokenAPI() {
|
||||||
return new NextResponse(JSON.stringify({ error: "Unauthorized token" }), {
|
return new NextResponse(JSON.stringify({ error: "Unauthorized token on API" }), {
|
||||||
|
status: 401,
|
||||||
|
headers: { "Content-Type": "application/json" },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function unauthorizedResponseTokenPAGE() {
|
||||||
|
return new NextResponse(JSON.stringify({ error: "Unauthorized on page" }), {
|
||||||
status: 401,
|
status: 401,
|
||||||
headers: { "Content-Type": "application/json" },
|
headers: { "Content-Type": "application/json" },
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user