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 () => {