From 50b0c86312bca1bf36086cd57c856097862d018c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivar=20Conradi=20=C3=98sthus?= <ivarconr@gmail.com>
Date: Wed, 1 Dec 2021 20:49:57 +0100
Subject: [PATCH] fix: cleanup old user permissions

---
 src/lib/routes/admin-api/user.ts   | 3 ---
 src/lib/services/access-service.ts | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/lib/routes/admin-api/user.ts b/src/lib/routes/admin-api/user.ts
index a0449d1b8d..02d162484e 100644
--- a/src/lib/routes/admin-api/user.ts
+++ b/src/lib/routes/admin-api/user.ts
@@ -65,9 +65,6 @@ class UserController extends Controller {
         );
         const splash = await this.userSplashService.getAllUserSplashs(user);
 
-        // TODO: remove this line after we remove it from db.
-        delete user.permissions;
-
         return res
             .status(200)
             .json({ user, permissions, feedback, splash })
diff --git a/src/lib/services/access-service.ts b/src/lib/services/access-service.ts
index 1303eb5921..e5011a63e4 100644
--- a/src/lib/services/access-service.ts
+++ b/src/lib/services/access-service.ts
@@ -109,9 +109,9 @@ export class AccessService {
         }
     }
 
-    async getPermissionsForUser(user: User): Promise<IUserPermission[]> {
+    async getPermissionsForUser(user: IUser): Promise<IUserPermission[]> {
         if (user.isAPI) {
-            return user.permissions.map((p) => ({
+            return user.permissions?.map((p) => ({
                 permission: p,
             }));
         }