fix: logout if user not found

cbartel · Dec 1, 2021 · 99e4d40 · 99e4d40
1 parent f9a37a5
commit 99e4d40
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/server/src/user/user.service.ts b/server/src/user/user.service.ts
@@ -38,21 +38,23 @@ export class UserService {
       .then((permissions) => permissions.map((permission) => permission.permission));
   }
 
-  async findUserWithPermissionsById(id: number): Promise<UserWithPermissions> {
-    return this.client.user
-      .findUnique({
-        where: { id },
-        include: {
-          UserPermission: true,
-        },
-      })
-      .then((result) => ({
-        id: result.id,
-        discordId: result.discordId,
-        discordUsername: result.discordUsername,
-        characterName: result.characterName,
-        permissions: result.UserPermission.map((it) => it.permission as Permission),
-      }));
+  async findUserWithPermissionsById(id: number): Promise<UserWithPermissions | undefined> {
+    const user = await this.client.user.findUnique({
+      where: { id },
+      include: {
+        UserPermission: true,
+      },
+    });
+    if (!user) {
+      return undefined;
+    }
+    return {
+      id: user.id,
+      discordId: user.discordId,
+      discordUsername: user.discordUsername,
+      characterName: user.characterName,
+      permissions: user.UserPermission.map((it) => it.permission as Permission),
+    };
   }
 
   async findByDiscordId(discordId: string): Promise<User> {

diff --git a/server/webpack.config.js b/server/webpack.config.js
@@ -11,5 +11,6 @@ module.exports = function (options) {
       path: path.resolve(__dirname, 'dist'),
       filename: '[name].js',
     },
+    devtool: 'source-map',
   };
 };