♻️ Update api endpoint authorization

This commit is contained in:
Meier Lukas
2023-08-06 15:40:19 +02:00
parent d281a2ee98
commit 3ef12cfe12
10 changed files with 124 additions and 109 deletions

View File

@@ -12,7 +12,7 @@ export const CreateBoardModal = ({ id }: ContextModalProps<{}>) => {
const utils = api.useContext();
const { isLoading, mutate } = api.config.save.useMutation({
onSuccess: async () => {
await utils.config.all.invalidate();
await utils.boards.all.invalidate();
modals.close(id);
},
});

View File

@@ -10,7 +10,7 @@ export const DeleteBoardModal = ({ id, innerProps }: ContextModalProps<InnerProp
const utils = api.useContext();
const { isLoading, mutateAsync } = api.config.delete.useMutation({
onSuccess: async () => {
await utils.config.all.invalidate();
await utils.boards.all.invalidate();
modals.close(id);
},
});

View File

@@ -25,6 +25,7 @@ import {
IconTrash,
} from '@tabler/icons-react';
import { GetServerSideProps } from 'next';
import { useSession } from 'next-auth/react';
import { useTranslation } from 'next-i18next';
import Head from 'next/head';
import Link from 'next/link';
@@ -39,6 +40,7 @@ import { api } from '~/utils/api';
const BoardsPage = () => {
const context = api.useContext();
const { data: sessionData } = useSession();
const { data } = api.boards.all.useQuery();
const { mutateAsync } = api.user.makeDefaultDashboard.useMutation({
onSettled: () => {
@@ -60,6 +62,7 @@ const BoardsPage = () => {
<Group position="apart">
<Title mb="xl">{t('pageTitle')}</Title>
{sessionData?.user.isAdmin && (
<Button
onClick={openCreateBoardModal}
leftIcon={<IconPlus size="1rem" />}
@@ -67,6 +70,7 @@ const BoardsPage = () => {
>
{t('buttons.create')}
</Button>
)}
</Group>
{data && (
@@ -143,7 +147,7 @@ const BoardsPage = () => {
>
{t('cards.buttons.view')}
</Button>
<Menu width={240} withinPortal>
<Menu width={240} withinPortal position="bottom-end">
<Menu.Target>
<ActionIcon h={34} w={34} variant="default">
<IconDotsVertical size="1rem" />
@@ -160,6 +164,8 @@ const BoardsPage = () => {
>
<Text size="sm">{t('cards.menu.setAsDefault')}</Text>
</Menu.Item>
{sessionData?.user.isAdmin && (
<>
<Menu.Divider />
<Menu.Item
onClick={async () => {
@@ -182,6 +188,8 @@ const BoardsPage = () => {
<Text size="xs">{t('cards.menu.delete.disabled')}</Text>
)}
</Menu.Item>
</>
)}
</Menu.Dropdown>
</Menu>
</Group>

View File

@@ -1,17 +1,16 @@
import fs from 'fs';
import { getFrontendConfig } from '~/tools/config/getFrontendConfig';
import { createTRPCRouter, protectedProcedure, publicProcedure } from '../trpc';
import { getFrontendConfig } from '~/tools/config/getFrontendConfig';
export const boardRouter = createTRPCRouter({
all: protectedProcedure.query(async ({ ctx }) => {
const files = fs.readdirSync('./data/configs').filter((file) => file.endsWith('.json'));
const userSettings = await ctx.prisma.userSettings.findUniqueOrThrow({
where: {
userId: ctx.session?.user.id
}
userId: ctx.session?.user.id,
},
});
return await Promise.all(
@@ -26,7 +25,7 @@ export const boardRouter = createTRPCRouter({
countApps: countApps,
countWidgets: config.widgets.length,
countCategories: config.categories.length,
isDefaultForUser: name === userSettings.defaultBoard
isDefaultForUser: name === userSettings.defaultBoard,
};
})
);

View File

@@ -16,13 +16,6 @@ import { adminProcedure, createTRPCRouter, publicProcedure } from '../trpc';
const configNameSchema = z.string().regex(/^[a-zA-Z0-9-_]+$/);
export const configRouter = createTRPCRouter({
all: publicProcedure.query(async () => {
// Get all the configs in the /data/configs folder
// All the files that end in ".json"
const files = fs.readdirSync('./data/configs').filter((file) => file.endsWith('.json'));
// Strip the .json extension from the file name
return files.map((file) => file.replace('.json', ''));
}),
delete: adminProcedure
.input(
z.object({

View File

@@ -2,13 +2,13 @@ import { TRPCError } from '@trpc/server';
import Dockerode from 'dockerode';
import { z } from 'zod';
import { createTRPCRouter, publicProcedure } from '../../trpc';
import { adminProcedure, createTRPCRouter } from '../../trpc';
import DockerSingleton from './DockerSingleton';
const dockerActionSchema = z.enum(['remove', 'start', 'stop', 'restart']);
export const dockerRouter = createTRPCRouter({
containers: publicProcedure.query(async () => {
containers: adminProcedure.query(async () => {
try {
const docker = DockerSingleton.getInstance();
const containers = await docker.listContainers({ all: true });
@@ -20,7 +20,7 @@ export const dockerRouter = createTRPCRouter({
});
}
}),
action: publicProcedure
action: adminProcedure
.input(
z.object({
id: z.string(),

View File

@@ -1,6 +1,6 @@
import { z } from 'zod';
import { createTRPCRouter, publicProcedure } from '../trpc';
import { adminProcedure, createTRPCRouter, publicProcedure } from '../trpc';
const citySchema = z.object({
id: z.number(),
@@ -24,7 +24,7 @@ const weatherSchema = z.object({
});
export const weatherRouter = createTRPCRouter({
findCity: publicProcedure
findCity: adminProcedure
.input(
z.object({
query: z.string().min(2),

View File

@@ -1,11 +1,11 @@
import { Badge, Box, Button, Card, Group, Image, SimpleGrid, Stack, Text } from '@mantine/core';
import { useElementSize } from '@mantine/hooks';
import { IconDeviceGamepad, IconPlayerPlay, IconPlayerStop } from '@tabler/icons-react';
import { useSession } from 'next-auth/react';
import { useTranslation } from 'next-i18next';
import { api } from '~/utils/api';
import { useConfigContext } from '../../config/provider';
import { queryClient } from '../../tools/server/configurations/tanstack/queryClient.tool';
import { defineWidget } from '../helper';
import { WidgetLoading } from '../loading';
import { IWidget } from '../widgets';
@@ -32,6 +32,8 @@ interface DnsHoleControlsWidgetProps {
}
function DnsHoleControlsWidgetTile({ widget }: DnsHoleControlsWidgetProps) {
const utils = api.useContext();
const { data: sessionData } = useSession();
const { isInitialLoading, data } = useDnsHoleSummeryQuery();
const { mutateAsync } = useDnsHoleControlMutation();
const { width, ref } = useElementSize();
@@ -45,14 +47,21 @@ function DnsHoleControlsWidgetTile({ widget }: DnsHoleControlsWidgetProps) {
return (
<Stack justify="space-between" h={'100%'} spacing="0.25rem">
<SimpleGrid ref={ref} cols={width > 275 ? 2 : 1} verticalSpacing="0.25rem" spacing="0.25rem">
{sessionData?.user?.isAdmin && (
<SimpleGrid
ref={ref}
cols={width > 275 ? 2 : 1}
verticalSpacing="0.25rem"
spacing="0.25rem"
>
<Button
onClick={async () => {
await mutateAsync({
action: 'enable',
configName,
});
await queryClient.invalidateQueries({ queryKey: ['dns-hole-summary'] });
await utils.dnsHole.summary.invalidate();
}}
leftIcon={<IconPlayerPlay size={20} />}
variant="light"
@@ -67,7 +76,7 @@ function DnsHoleControlsWidgetTile({ widget }: DnsHoleControlsWidgetProps) {
action: 'disable',
configName,
});
await queryClient.invalidateQueries({ queryKey: ['dns-hole-summary'] });
await utils.dnsHole.summary.invalidate();
}}
leftIcon={<IconPlayerStop size={20} />}
variant="light"
@@ -77,6 +86,7 @@ function DnsHoleControlsWidgetTile({ widget }: DnsHoleControlsWidgetProps) {
{t('disableAll')}
</Button>
</SimpleGrid>
)}
<Stack spacing="0.25rem">
{data.status.map((status, index) => {

View File

@@ -12,6 +12,7 @@ import {
} from '@mantine/core';
import { notifications } from '@mantine/notifications';
import { IconCheck, IconGitPullRequest, IconThumbDown, IconThumbUp } from '@tabler/icons-react';
import { useSession } from 'next-auth/react';
import { useTranslation } from 'next-i18next';
import { useConfigContext } from '~/config/provider';
import { api } from '~/utils/api';
@@ -95,6 +96,7 @@ function MediaRequestListTile({ widget }: MediaRequestListWidgetProps) {
const { data, isLoading } = useMediaRequestQuery();
// Use mutation to approve or deny a pending request
const decideAsync = useMediaRequestDecisionMutation();
const { data: sessionData } = useSession();
if (!data || isLoading) {
return <WidgetLoading />;
@@ -177,7 +179,7 @@ function MediaRequestListTile({ widget }: MediaRequestListWidgetProps) {
</Text>
</Flex>
{item.status === MediaRequestStatus.PendingApproval && (
{item.status === MediaRequestStatus.PendingApproval && sessionData?.user?.isAdmin && (
<Group>
<Tooltip label={t('tooltips.approve')} withArrow withinPortal>
<ActionIcon

View File

@@ -3,18 +3,19 @@ import { useElementSize } from '@mantine/hooks';
import { IconFileDownload, IconPlayerPause, IconPlayerPlay } from '@tabler/icons-react';
import dayjs from 'dayjs';
import duration from 'dayjs/plugin/duration';
import { useSession } from 'next-auth/react';
import { useTranslation } from 'next-i18next';
import { useEffect, useState } from 'react';
import { useConfigContext } from '../../config/provider';
import { MIN_WIDTH_MOBILE } from '../../constants/constants';
import { humanFileSize } from '../../tools/humanFileSize';
import { AppIntegrationType } from '../../types/app';
import {
useGetUsenetInfo,
usePauseUsenetQueueMutation,
useResumeUsenetQueueMutation,
} from '../dashDot/api';
import { humanFileSize } from '../../tools/humanFileSize';
import { AppIntegrationType } from '../../types/app';
import { defineWidget } from '../helper';
import { IWidget } from '../widgets';
import { UsenetHistoryList } from './UsenetHistoryList';
@@ -49,7 +50,8 @@ function UseNetTile({ widget }: UseNetTileProps) {
const downloadApps =
config?.apps.filter((x) => x.integration && downloadAppTypes.includes(x.integration.type)) ??
[];
const { ref, width, height } = useElementSize();
const { ref, width } = useElementSize();
const { data: sessionData } = useSession();
const [selectedAppId, setSelectedApp] = useState<string | null>(downloadApps[0]?.id);
const { data } = useGetUsenetInfo({ appId: selectedAppId! });
@@ -106,7 +108,8 @@ function UseNetTile({ widget }: UseNetTileProps) {
)}
<Tabs.Panel value="queue">
<UsenetQueueList appId={selectedAppId} />
{!data ? null : data.paused ? (
{sessionData?.user?.isAdmin &&
(!data ? null : data.paused ? (
<Button
uppercase
onClick={async () => resumeAsync({ appId: selectedAppId })}
@@ -129,7 +132,7 @@ function UseNetTile({ widget }: UseNetTileProps) {
<IconPlayerPause size={12} style={{ marginRight: 5 }} />{' '}
{dayjs.duration(data.eta, 's').format('HH:mm')}
</Button>
)}
))}
</Tabs.Panel>
<Tabs.Panel value="history" style={{ display: 'flex', flexDirection: 'column' }}>
<UsenetHistoryList appId={selectedAppId} />