WhatsApp/Signal/Formstack/admin updates

apps/link/app/_lib/authentication.ts

@@ -11,6 +11,9 @@ import Google from "next-auth/providers/google";
 import Credentials from "next-auth/providers/credentials";
 import Apple from "next-auth/providers/apple";
 import AzureADProvider from "next-auth/providers/azure-ad";
+import { createLogger } from "@link-stack/logger";
+
+const logger = createLogger('link-authentication');
 
 const headers = { Authorization: `Token ${process.env.ZAMMAD_API_TOKEN}` };
 
@@ -26,7 +29,7 @@ const fetchRoles = async () => {
 };
 
 const fetchUser = async (email: string) => {
-  const url = `${process.env.ZAMMAD_URL}/api/v1/users/search?query=login:${email}&limit=1`;
+  const url = `${process.env.ZAMMAD_URL}/api/v1/users/search?query=${encodeURIComponent(`login:${email}`)}&limit=1`;
   const res = await fetch(url, { headers });
   const users = await res.json();
   const user = users?.[0];
@@ -37,6 +40,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];
@@ -44,7 +50,7 @@ const getUserRoles = async (email: string) => {
     });
     return roles.filter((role: string) => role !== null);
   } catch (e) {
-    console.log({ e });
+    logger.error({ error: e, email }, 'Failed to get user roles');
     return [];
   }
 };
@@ -122,6 +128,9 @@ export const authOptions: NextAuthOptions = {
     signOut: "/logout",
   },
   providers,
+  session: {
+    maxAge: 3 * 24 * 60 * 60,
+  },
   secret: process.env.NEXTAUTH_SECRET,
   callbacks: {
     signIn: async ({ user }) => {

apps/link/app/_lib/utils.ts

@@ -1,41 +0,0 @@
-export const fetchLeafcutter = async (url: string, options: any) => {
-  /*
-
-    const headers = {
-      'X-Opensearch-Username': process.env.OPENSEARCH_USER!,
-      'X-Opensearch-Password': process.env.OPENSEARCH_PASSWORD!,
-      'X-Leafcutter-User': token.email.toLowerCase()
-    };
-    */
-  const fetchData = async (url: string, options: any) => {
-    try {
-      const res = await fetch(url, options);
-      const json = await res.json();
-      return json;
-    } catch (error) {
-      console.log({ error });
-      return null;
-    }
-  };
-
-  const data = await fetchData(url, options);
-  console.log({ data });
-
-  if (!data) {
-    const csrfURL = `${process.env.NEXT_PUBLIC_LEAFCUTTER_URL}/api/auth/csrf`;
-    const csrfData = await fetchData(csrfURL, {});
-    console.log({ csrfData });
-    const authURL = `${process.env.NEXT_PUBLIC_LEAFCUTTER_URL}/api/auth/callback/credentials`;
-    const authData = await fetchData(authURL, { method: "POST" });
-    console.log({ authData });
-    if (!authData) {
-      return null;
-    } else {
-      return await fetchData(url, options);
-    }
-  } else {
-    return data;
-  }
-};
-
-

apps/link/app/_lib/zammad.ts

@@ -2,12 +2,11 @@ import { getServerSession } from "app/_lib/authentication";
 import { cookies } from "next/headers";
 
 const getHeaders = async () => {
-  const allCookies = cookies().getAll();
+  const allCookies = (await cookies()).getAll();
   const session = await getServerSession();
-  const headers = {
+  const finalHeaders = {
     "Content-Type": "application/json",
     Accept: "application/json",
-    "X-Browser-Fingerprint": `${session.expires}`,
     // @ts-ignore
     "X-CSRF-Token": session.user.zammadCsrfToken,
     Cookie: allCookies
@@ -15,7 +14,7 @@ const getHeaders = async () => {
       .join("; "),
   };
 
-  return headers;
+  return finalHeaders;
 };
 
 interface ExecuteGraphQLOptions {