Update deps and Zammad version (6.4.1)
This commit is contained in:
parent
07ee819520
commit
9e5ea2fc41
40 changed files with 973 additions and 849 deletions
|
|
@ -36,6 +36,9 @@ const fetchUser = async (email: string) => {
|
|||
const getUserRoles = async (email: string) => {
|
||||
try {
|
||||
const user = await fetchUser(email);
|
||||
if (!user) {
|
||||
return [];
|
||||
}
|
||||
const allRoles = await fetchRoles();
|
||||
const roles = user.role_ids.map((roleID: number) => {
|
||||
const role = allRoles[roleID];
|
||||
|
|
|
|||
|
|
@ -14,9 +14,6 @@ const rewriteURL = (
|
|||
const destinationURL = `${destinationBaseURL}/${path}`;
|
||||
console.log(`Rewriting ${request.url} to ${destinationURL}`);
|
||||
const requestHeaders = new Headers(request.headers);
|
||||
for (const [key, value] of requestHeaders.entries()) {
|
||||
console.log(`${key}: ${value}`);
|
||||
}
|
||||
|
||||
requestHeaders.delete("x-forwarded-user");
|
||||
requestHeaders.delete("x-forwarded-roles");
|
||||
|
|
@ -46,6 +43,7 @@ const checkRewrites = async (request: NextRequestWithAuth) => {
|
|||
"/graphql",
|
||||
"/cable",
|
||||
];
|
||||
const isSetupMode = process.env.SETUP_MODE === "true";
|
||||
const { token } = request.nextauth;
|
||||
const email = token?.email?.toLowerCase() ?? "unknown";
|
||||
const roles = (token?.roles as string[]) ?? [];
|
||||
|
|
@ -66,7 +64,7 @@ const checkRewrites = async (request: NextRequestWithAuth) => {
|
|||
} else if (zammadPaths.some((p) => request.nextUrl.pathname.startsWith(p))) {
|
||||
return rewriteURL(request, linkBaseURL, zammadURL, headers);
|
||||
} else if (request.nextUrl.pathname.startsWith("/api/v1")) {
|
||||
if (email && email !== "unknown") {
|
||||
if ((email && email !== "unknown") || isSetupMode) {
|
||||
return NextResponse.next();
|
||||
} else {
|
||||
return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@link-stack/link",
|
||||
"version": "2.3.4",
|
||||
"version": "2.4.0b1",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "next dev",
|
||||
|
|
@ -24,14 +24,14 @@
|
|||
"@mui/icons-material": "^6",
|
||||
"@mui/material": "^6",
|
||||
"@mui/material-nextjs": "^6",
|
||||
"@mui/x-data-grid-pro": "^7.23.2",
|
||||
"@mui/x-date-pickers": "^7.23.2",
|
||||
"@mui/x-date-pickers-pro": "^7.23.2",
|
||||
"@mui/x-license": "^7.23.2",
|
||||
"@mui/x-data-grid-pro": "^7.23.6",
|
||||
"@mui/x-date-pickers": "^7.23.6",
|
||||
"@mui/x-date-pickers-pro": "^7.23.6",
|
||||
"@mui/x-license": "^7.23.6",
|
||||
"date-fns": "^4.1.0",
|
||||
"graphql-request": "^7.1.2",
|
||||
"mui-chips-input": "^4.0.1",
|
||||
"next": "15.1.0",
|
||||
"next": "15.1.4",
|
||||
"next-auth": "^4.24.11",
|
||||
"react": "19.0.0",
|
||||
"react-cookie": "^7.2.2",
|
||||
|
|
@ -42,8 +42,8 @@
|
|||
},
|
||||
"devDependencies": {
|
||||
"@link-stack/eslint-config": "*",
|
||||
"@types/node": "^22.10.2",
|
||||
"@types/react": "19.0.1",
|
||||
"@types/node": "^22.10.6",
|
||||
"@types/react": "19.0.7",
|
||||
"@types/uuid": "^10.0.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue