From 09c82bdf40339508b899d531ca3f4474f41e641e Mon Sep 17 00:00:00 2001
From: Tom Moor <tom@getoutline.com>
Date: Fri, 29 Mar 2024 07:29:59 -0600
Subject: [PATCH] Remove `isAdmin`, `isViewer` from API response (#6738)

* Remove isAdmin,isViewer from API response

* snap
---
 server/presenters/__snapshots__/user.test.ts.snap | 4 ----
 server/presenters/user.ts                         | 4 ----
 server/routes/api/users/users.test.ts             | 3 +--
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/server/presenters/__snapshots__/user.test.ts.snap b/server/presenters/__snapshots__/user.test.ts.snap
index 3869fbb86..51abe76e0 100644
--- a/server/presenters/__snapshots__/user.test.ts.snap
+++ b/server/presenters/__snapshots__/user.test.ts.snap
@@ -6,9 +6,7 @@ exports[`presents a user 1`] = `
   "color": "#FF5C80",
   "createdAt": undefined,
   "id": "123",
-  "isAdmin": false,
   "isSuspended": false,
-  "isViewer": false,
   "lastActiveAt": undefined,
   "name": "Test User",
   "role": "member",
@@ -22,9 +20,7 @@ exports[`presents a user without slack data 1`] = `
   "color": "#FF5C80",
   "createdAt": undefined,
   "id": "123",
-  "isAdmin": false,
   "isSuspended": false,
-  "isViewer": false,
   "lastActiveAt": undefined,
   "name": "Test User",
   "role": "member",
diff --git a/server/presenters/user.ts b/server/presenters/user.ts
index 2d6821448..d01d940f3 100644
--- a/server/presenters/user.ts
+++ b/server/presenters/user.ts
@@ -15,9 +15,7 @@ type UserPresentation = {
   lastActiveAt: Date | null;
   color: string;
   role: UserRole;
-  isAdmin: boolean;
   isSuspended: boolean;
-  isViewer: boolean;
   email?: string | null;
   language?: string;
   preferences?: UserPreferences | null;
@@ -34,9 +32,7 @@ export default function presentUser(
     avatarUrl: user.avatarUrl,
     color: user.color,
     role: user.role,
-    isAdmin: user.isAdmin,
     isSuspended: user.isSuspended,
-    isViewer: user.isViewer,
     createdAt: user.createdAt,
     updatedAt: user.updatedAt,
     lastActiveAt: user.lastActiveAt,
diff --git a/server/routes/api/users/users.test.ts b/server/routes/api/users/users.test.ts
index 5c9bfa67c..74f5e5de5 100644
--- a/server/routes/api/users/users.test.ts
+++ b/server/routes/api/users/users.test.ts
@@ -347,8 +347,7 @@ describe("#users.invite", () => {
     const body = await res.json();
     expect(res.status).toEqual(200);
     expect(body.data.sent.length).toEqual(1);
-    expect(body.data.users[0].isAdmin).toBeTruthy();
-    expect(body.data.users[0].isViewer).toBeFalsy();
+    expect(body.data.users[0].role).toEqual(UserRole.Admin);
   });
 
   it("should invite user as a viewer", async () => {