From 32e40f334298461f8fa191e1dffbee51a2c025f1 Mon Sep 17 00:00:00 2001 From: Meier Lukas Date: Sat, 30 Sep 2023 00:30:55 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Remove=20DISABLE=5FEDIT=5FMODE?= =?UTF-8?q?=20and=20replace=20with=20admin-procedure=20(#1439)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/api/routers/config.ts | 8 +------- src/server/api/routers/notebook.ts | 12 ++---------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/server/api/routers/config.ts b/src/server/api/routers/config.ts index 25b22bc83..895851138 100644 --- a/src/server/api/routers/config.ts +++ b/src/server/api/routers/config.ts @@ -5,12 +5,12 @@ import fs from 'fs'; import path from 'path'; import { z } from 'zod'; import { configExists } from '~/tools/config/configExists'; +import { getConfig } from '~/tools/config/getConfig'; import { getFrontendConfig } from '~/tools/config/getFrontendConfig'; import { BackendConfigType, ConfigType } from '~/types/config'; import { boardCustomizationSchema } from '~/validations/boards'; import { IRssWidget } from '~/widgets/rss/RssWidgetTile'; -import { getConfig } from '~/tools/config/getConfig'; import { adminProcedure, createTRPCRouter, publicProcedure } from '../trpc'; export const configNameSchema = z.string().regex(/^[a-zA-Z0-9-_]+$/); @@ -67,12 +67,6 @@ export const configRouter = createTRPCRouter({ }) ) .mutation(async ({ input }) => { - if (process.env.DISABLE_EDIT_MODE?.toLowerCase() === 'true') { - throw new TRPCError({ - code: 'METHOD_NOT_SUPPORTED', - message: 'Edit is not allowed, because edit mode is disabled' - }); - } Consola.info(`Saving updated configuration of '${input.name}' config.`); const previousConfig = getConfig(input.name); diff --git a/src/server/api/routers/notebook.ts b/src/server/api/routers/notebook.ts index 1209e6986..e3f033901 100644 --- a/src/server/api/routers/notebook.ts +++ b/src/server/api/routers/notebook.ts @@ -6,20 +6,12 @@ import { getConfig } from '~/tools/config/getConfig'; import { BackendConfigType } from '~/types/config'; import { INotebookWidget } from '~/widgets/notebook/NotebookWidgetTile'; -import { createTRPCRouter, publicProcedure } from '../trpc'; +import { adminProcedure, createTRPCRouter, publicProcedure } from '../trpc'; export const notebookRouter = createTRPCRouter({ - update: publicProcedure + update: adminProcedure .input(z.object({ widgetId: z.string(), content: z.string(), configName: z.string() })) .mutation(async ({ input }) => { - //TODO: #1305 Remove use of DISABLE_EDIT_MODE for auth update - if (process.env.DISABLE_EDIT_MODE?.toLowerCase() === 'true') { - throw new TRPCError({ - code: 'METHOD_NOT_SUPPORTED', - message: 'Edit is not allowed, because edit mode is disabled' - }); - } - const config = getConfig(input.configName); const widget = config.widgets.find((widget) => widget.id === input.widgetId) as | INotebookWidget