yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert isViewer and isAdmin to getters (#6724)

Browse Source
This commit is contained in:
Tom Moor
2024-03-28 17:00:35 -06:00
committed by GitHub
parent 278b81a8fb
commit 0dede0b56e
20 changed files with 113 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
server/routes/api/users/users.test.ts
View File

@@ -1,4 +1,4 @@
import { TeamPreference } from "@shared/types";
import { TeamPreference, UserRole } from "@shared/types";
import {
buildTeam,
buildAdmin,
@@ -368,8 +368,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].isViewer).toBeTruthy();
expect(body.data.users[0].isAdmin).toBeFalsy();
expect(body.data.users[0].role).toEqual(UserRole.Viewer);
});
it("should require authentication", async () => {
@@ -383,7 +382,6 @@ describe("#users.delete", () => {
const user = await buildAdmin();
await buildUser({
teamId: user.teamId,
isAdmin: false,
});
const res = await server.post("/api/users.delete", {
body: {
@@ -397,7 +395,6 @@ describe("#users.delete", () => {
const user = await buildAdmin();
await buildUser({
teamId: user.teamId,
isAdmin: false,
});
const res = await server.post("/api/users.delete", {
body: {
@@ -572,11 +569,7 @@ describe("#users.demote", () => {
it("should demote an admin", async () => {
const team = await buildTeam();
const admin = await buildAdmin({ teamId: team.id });
const user = await buildUser({ teamId: team.id });
await user.update({
isAdmin: true,
}); // Make another admin
const user = await buildAdmin({ teamId: team.id });
const res = await server.post("/api/users.demote", {
body: {
@@ -590,11 +583,7 @@ describe("#users.demote", () => {
it("should demote an admin to viewer", async () => {
const team = await buildTeam();
const admin = await buildAdmin({ teamId: team.id });
const user = await buildUser({ teamId: team.id });
await user.update({
isAdmin: true,
}); // Make another admin
const user = await buildAdmin({ teamId: team.id });
const res = await server.post("/api/users.demote", {
body: {
@@ -609,11 +598,7 @@ describe("#users.demote", () => {
it("should demote an admin to member", async () => {
const team = await buildTeam();
const admin = await buildAdmin({ teamId: team.id });
const user = await buildUser({ teamId: team.id });
await user.update({
isAdmin: true,
}); // Make another admin
const user = await buildAdmin({ teamId: team.id });
const res = await server.post("/api/users.demote", {
body: {
@@ -748,9 +733,8 @@ describe("#users.count", () => {
it("should count admin users", async () => {
const team = await buildTeam();
const user = await buildUser({
const user = await buildAdmin({
teamId: team.id,
isAdmin: true,
});
const res = await server.post("/api/users.count", {
body: {

8
server/routes/api/users/users.ts
View File

@@ -1,6 +1,6 @@
import Router from "koa-router";
import { Op, WhereOptions } from "sequelize";
import { UserPreference } from "@shared/types";
import { UserPreference, UserRole } from "@shared/types";
import { UserValidation } from "@shared/validations";
import userDemoter from "@server/commands/userDemoter";
import userDestroyer from "@server/commands/userDestroyer";
@@ -59,17 +59,17 @@ router.post(
}
case "viewers": {
where = { ...where, isViewer: true };
where = { ...where, role: UserRole.Viewer };
break;
}
case "admins": {
where = { ...where, isAdmin: true };
where = { ...where, role: UserRole.Admin };
break;
}
case "members": {
where = { ...where, isAdmin: false, isViewer: false };
where = { ...where, role: UserRole.Member };
break;
}