wibu/hipmi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix middle v106

Browse Source
This commit is contained in:
Bagasbanuna02
2025-04-09 15:24:47 +08:00
parent c4e789a952
commit eb0421b3bc
3 changed files with 57 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/api/middleware/route.ts
View File

@@ -5,16 +5,9 @@ import { NextResponse } from "next/server";
export async function GET(req: Request) { export async function GET(req: Request) {
// const token = req.headers.get("Authorizationx")?.split(" ")[1]; // const token = req.headers.get("Authorizationx")?.split(" ")[1];
const SESSIONKEY = process.env.NEXT_PUBLIC_BASE_SESSION_KEY!; const SESSIONKEY = process.env.NEXT_PUBLIC_BASE_SESSION_KEY!;
console.log(
"Token received in API Middleware:",
SESSIONKEY,
`<<<<<<<<<<<<<<<`
);
const tokenCookies = cookies().get(SESSIONKEY)?.value; const tokenCookies = cookies().get(SESSIONKEY)?.value;
console.log("Token received in Cookies:", tokenCookies);
const tokenHeader = req.headers.get("Authorization")?.split(" ")[1]; const tokenHeader = req.headers.get("Authorization")?.split(" ")[1];
console.log("Token received in Header:", tokenHeader);
if (!tokenCookies) return NextResponse.json({ success: false }); if (!tokenCookies) return NextResponse.json({ success: false });
return NextResponse.json({ success: true }); return NextResponse.json({ success: true });

126
src/middleware.ts
View File

@@ -76,19 +76,8 @@ export const middleware = async (req: NextRequest) => {
} = middlewareConfig; } = middlewareConfig;
const { pathname } = req.nextUrl; const { pathname } = req.nextUrl;
// console.warn(cookies().get("hipmi-key")?.value);
// const f = await fetch("https://localhost:3000/api/middleware", {
// method: "GET",
// headers: {
// "Content-Type": "application/json",
// },
// });
// console.warn(await f.text())
// console.log("Cookies >>", req.cookies.get("hipmi-key")?.value);
// Handle CORS
const corsResponse = handleCors(req); const corsResponse = handleCors(req);
if (corsResponse) { if (corsResponse) {
return corsResponse; return corsResponse;
} }
@@ -105,29 +94,6 @@ export const middleware = async (req: NextRequest) => {
console.log("Request URL v2 >>", req.url); console.log("Request URL v2 >>", req.url);
// const fetchValidation = async (url: string) => {
// try {
// const origin = new URL(req.url).origin;
// console.log("Origin URL:", origin + url);
// console.log("URL:", url);
// const response = await fetch(origin + url, {
// headers: {
// "Content-Type": "application/json",
// Authorization: `Bearer ${token}`,
// },
// });
// if (!response.ok) {
// console.error("Validation failed:", response.statusText);
// return null;
// }
// const data = await response.json();
// return data;
// } catch (error) {
// console.error("Error fetching validation:", error);
// return null;
// }
// };
// Handle login page access // Handle login page access
if (pathname === loginPath) { if (pathname === loginPath) {
if (user) { if (user) {
@@ -165,7 +131,8 @@ export const middleware = async (req: NextRequest) => {
const originURL = process.env.NEXT_PUBLIC_API_URL; const originURL = process.env.NEXT_PUBLIC_API_URL;
console.log("Origin URL >> ", originURL); console.log("Origin URL >> ", originURL);
const apiBaseUrl = process.env.NEXT_PUBLIC_API_URL || new URL(req.url).origin; const apiBaseUrl =
process.env.NEXT_PUBLIC_API_URL || new URL(req.url).origin;
const validationResponse = await fetch(`${apiBaseUrl}/api/validation`, { const validationResponse = await fetch(`${apiBaseUrl}/api/validation`, {
headers: { headers: {
Authorization: `Bearer ${token}`, Authorization: `Bearer ${token}`,
@@ -191,48 +158,49 @@ export const middleware = async (req: NextRequest) => {
} }
} }
// // Handle /dev routes that require active status // Handle /dev routes that require active status
// if (pathname.startsWith("/dev")) { if (pathname.startsWith("/dev")) {
// try { try {
// const userValidate = await fetch( const apiBaseUrl =
// new URL(req.url).origin + "/api/user-validate", process.env.NEXT_PUBLIC_API_URL || new URL(req.url).origin;
// {
// headers: {
// "Content-Type": "application/json",
// Authorization: `Bearer ${token}`,
// },
// }
// );
// if (!userValidate.ok) { const userValidate = await fetch(`${apiBaseUrl}/api/user-validate`, {
// throw new Error("Failed to validate user"); headers: {
// } "Content-Type": "application/json",
Authorization: `Bearer ${token}`,
},
});
// const userValidateJson = await userValidate.json(); if (!userValidate.ok) {
console.error("Validation failed:", userValidate.statusText);
return setCorsHeaders(unauthorizedResponseAPIUserValidate());
}
// if (userValidateJson.success == true && !userValidateJson.data) { const userValidateJson = await userValidate.json();
// unauthorizedResponseDataUserNotFound(req);
// }
// if (!userValidateJson.data.active) { if (userValidateJson.success == true && !userValidateJson.data) {
// return setCorsHeaders(unauthorizedResponseUserNotActive(req)); unauthorizedResponseDataUserNotFound(req);
// } }
// } catch (error) {
// console.error("Error validating user:", error); if (!userValidateJson.data.active) {
// if (!token) { return setCorsHeaders(unauthorizedResponseUserNotActive(req));
// console.error("Token is undefined"); }
// return setCorsHeaders(unauthorizedResponseTokenPAGE()); } catch (error) {
// } console.error("Error api user validate:", error);
// return setCorsHeaders( if (!token) {
// await unauthorizedResponseValidationUser({ console.error("Token is undefined");
// loginPath, return setCorsHeaders(unauthorizedResponseTokenPAGE());
// sessionKey, }
// token, return setCorsHeaders(
// req, await unauthorizedResponseValidationUser({
// }) loginPath,
// ); sessionKey,
// } token,
// } req,
})
);
}
}
// // Ensure token is preserved in cookie // // Ensure token is preserved in cookie
// if (token) { // if (token) {
@@ -273,6 +241,16 @@ function unauthorizedResponse() {
}); });
} }
function unauthorizedResponseAPIUserValidate() {
return new NextResponse(
JSON.stringify({ error: "Unauthorized api user validate" }),
{
status: 401,
headers: { "Content-Type": "application/json" },
}
);
}
function unauthorizedResponseTokenAPI() { function unauthorizedResponseTokenAPI() {
return new NextResponse( return new NextResponse(
JSON.stringify({ error: "Unauthorized token on API" }), JSON.stringify({ error: "Unauthorized token on API" }),

8
x.sh
View File

@@ -1,5 +1,7 @@
TOKEN="eyJhbGciOiJIUzI1NiJ9.eyJ1c2VyIjp7ImlkIjoiY20wYWUzcmw2MDAwMWZzNWowN3ZtdjRvaCIsIm5vbW9yIjoiNjI4MjM0MDM3NDQxMiIsInVzZXJuYW1lIjoiYmFnYXNfYWRtaW4iLCJhY3RpdmUiOnRydWUsIm1hc3RlclVzZXJSb2xlSWQiOiIzIn0sImlhdCI6MTc0Mjk2OTc1OSwiZXhwIjoxOTYzODcyOTU5fQ.4bFEdhm4TeysoDcC1D54PPbyJPHSMBisiEn5GXoYr30" TOKEN="eyJhbGciOiJIUzI1NiJ9.eyJ1c2VyIjp7ImlkIjoiY202MGc3eDR2MDAwODEyNHVsbmg0MDR6bSIsIm5vbW9yIjoiNjI4MTMzOTE1ODkxMSIsInVzZXJuYW1lIjoiQmFnYXNfYmFudW5hIiwiYWN0aXZlIjp0cnVlLCJtYXN0ZXJVc2VyUm9sZUlkIjoiMSJ9LCJpYXQiOjE3NDQwOTQyMjQsImV4cCI6MTk2NDk5NzQyNH0.ByTKFPpcL6oljeizWkUM4Z0jaWzc9oPrkpCCImQY3KE"
# curl -X GET -H "Authorization: Bearer $TOKEN" https://localhost:3000/api/middleware URL="https://stg-hipmi.wibudev.com"
# curl -X GET -H "Authorization: Bearer $TOKEN" ${URL}/api/middleware
curl -X GET -H "Cookie: hipmi-key=$TOKEN; user_id=789" https://localhost:3000/api/middleware
curl -X GET -H "Cookie: hipmi-key=$TOKEN; user_id=789" ${URL}/dev/home | tee test.html