Redo server functionality

src/server/middleware/authenticate.ts

@@ -1,9 +1,4 @@
-import {
-  ServerCredential,
-  ServerFolderPermission,
-  ServerPermission,
-  User,
-} from '@prisma/client';
+import { ServerFolderPermission, ServerPermission, User } from '@prisma/client';
 import { NextFunction, Request, Response } from 'express';
 import passport from 'passport';
 
@@ -55,13 +50,6 @@ export const authenticate = (
       (permission: ServerPermission) => permission.serverId
     );
 
-    const serverCredentials = user.serverCredentials.map(
-      (credential: ServerCredential) => ({
-        id: credential.id,
-        serverId: credential.serverId,
-      })
-    );
-
     const props = {
       createdAt: user?.createdAt,
       enabled: user?.enabled,
@@ -70,7 +58,6 @@ export const authenticate = (
       id: user?.id,
       isAdmin: user?.isAdmin,
       server: req.params.serverId,
-      serverCredentials,
       serverFolderPermissions: user?.serverFolderPermissions,
       serverPermissions: user?.serverPermissions,
       updatedAt: user?.updatedAt,

src/server/middleware/error-handler.ts

@@ -1,5 +1,5 @@
 import { NextFunction, Request, Response } from 'express';
-import { isJsonString } from '../utils';
+import { isJsonString } from '@utils/is-json-string';
 
 export const errorHandler = (
   err: any,
@@ -9,7 +9,7 @@ export const errorHandler = (
 ) => {
   let message = '';
 
-  const trace = err.stack.match(/at .* \(.*\)/g).map((e: string) => {
+  const trace = err.stack?.match(/at .* \(.*\)/g).map((e: string) => {
     return e.replace(/\(|\)/g, '');
   });