chore: Remove over-usage of invariant (#3719)

This commit is contained in:
Tom Moor
2022-07-02 15:29:39 +03:00
committed by GitHub
parent 108b5b934a
commit c9cd424a8d
16 changed files with 34 additions and 55 deletions

View File

@@ -1,4 +1,3 @@
import invariant from "invariant";
import Router from "koa-router";
import { find } from "lodash";
import { parseDomain } from "@shared/utils/domains";
@@ -108,8 +107,9 @@ router.post("auth.config", async (ctx) => {
router.post("auth.info", auth(), async (ctx) => {
const { user } = ctx.state;
const team = await Team.scope("withDomains").findByPk(user.teamId);
invariant(team, "Team not found");
const team = await Team.scope("withDomains").findByPk(user.teamId, {
rejectOnEmpty: true,
});
await ValidateSSOAccessTask.schedule({ userId: user.id });

View File

@@ -641,8 +641,7 @@ router.post("collections.update", auth(), async (ctx) => {
// if the privacy level has changed. Otherwise skip this query for speed.
if (privacyChanged || sharingChanged) {
await collection.reload();
const team = await Team.findByPk(user.teamId);
invariant(team, "team not found");
const team = await Team.findByPk(user.teamId, { rejectOnEmpty: true });
if (
collection.permission === null &&

View File

@@ -26,7 +26,6 @@ import {
Star,
User,
View,
Team,
} from "@server/models";
import { authorize, cannot } from "@server/policies";
import {
@@ -626,7 +625,7 @@ router.post(
}
teamId = share.teamId;
const team = await Team.findByPk(teamId);
const team = await share.$get("team");
invariant(team, "Share must belong to a team");
response = await Document.searchForTeam(team, query, {

View File

@@ -1,4 +1,3 @@
import invariant from "invariant";
import Router from "koa-router";
import { WhereOptions } from "sequelize/types";
import fileOperationDeleter from "@server/commands/fileOperationDeleter";
@@ -18,8 +17,9 @@ router.post("fileOperations.info", auth(), async (ctx) => {
assertUuid(id, "id is required");
const { user } = ctx.state;
const team = await Team.findByPk(user.teamId);
const fileOperation = await FileOperation.findByPk(id);
invariant(fileOperation, "File operation not found");
const fileOperation = await FileOperation.findByPk(id, {
rejectOnEmpty: true,
});
authorize(user, fileOperation.type, team);

View File

@@ -1,4 +1,3 @@
import invariant from "invariant";
import Router from "koa-router";
import { Op } from "sequelize";
import { MAX_AVATAR_DISPLAY } from "@shared/constants";
@@ -80,8 +79,7 @@ router.post("groups.create", auth(), async (ctx) => {
});
// reload to get default scope
const group = await Group.findByPk(g.id);
invariant(group, "group not found");
const group = await Group.findByPk(g.id, { rejectOnEmpty: true });
await Event.create({
name: "groups.create",
@@ -231,12 +229,11 @@ router.post("groups.add_user", auth(), async (ctx) => {
groupId: id,
userId,
},
rejectOnEmpty: true,
});
invariant(membership, "membership not found");
// reload to get default scope
group = await Group.findByPk(id);
invariant(group, "group not found");
group = await Group.findByPk(id, { rejectOnEmpty: true });
await Event.create({
name: "groups.add_user",
@@ -287,8 +284,7 @@ router.post("groups.remove_user", auth(), async (ctx) => {
});
// reload to get default scope
group = await Group.findByPk(id);
invariant(group, "group not found");
group = await Group.findByPk(id, { rejectOnEmpty: true });
ctx.body = {
data: {

View File

@@ -1,4 +1,3 @@
import invariant from "invariant";
import Router from "koa-router";
import { escapeRegExp } from "lodash";
import env from "@server/env";
@@ -103,8 +102,7 @@ router.post("hooks.interactive", async (ctx) => {
throw InvalidRequestError("Invalid callback_id");
}
const team = await Team.findByPk(document.teamId);
invariant(team, "team not found");
const team = await Team.findByPk(document.teamId, { rejectOnEmpty: true });
// respond with a public message that will be posted in the original channel
ctx.body = {

View File

@@ -1,4 +1,3 @@
import invariant from "invariant";
import Router from "koa-router";
import { Sequelize, Op } from "sequelize";
import pinCreator from "@server/commands/pinCreator";
@@ -106,8 +105,7 @@ router.post("pins.update", auth(), async (ctx) => {
assertIndexCharacters(index);
const { user } = ctx.state;
let pin = await Pin.findByPk(id);
invariant(pin, "pin not found");
let pin = await Pin.findByPk(id, { rejectOnEmpty: true });
const document = await Document.findByPk(pin.documentId, {
userId: user.id,
@@ -137,8 +135,7 @@ router.post("pins.delete", auth(), async (ctx) => {
assertUuid(id, "id is required");
const { user } = ctx.state;
const pin = await Pin.findByPk(id);
invariant(pin, "pin not found");
const pin = await Pin.findByPk(id, { rejectOnEmpty: true });
const document = await Document.findByPk(pin.documentId, {
userId: user.id,