♻️ Address pull request feedback

This commit is contained in:
Meier Lukas
2023-08-06 14:12:39 +02:00
parent 4b2c5f2816
commit 9e576f1498
53 changed files with 934 additions and 746 deletions

View File

@@ -7,7 +7,7 @@ import { z } from 'zod';
import { configExists } from '~/tools/config/configExists';
import { getFrontendConfig } from '~/tools/config/getFrontendConfig';
import { BackendConfigType, ConfigType } from '~/types/config';
import { boardCustomizationSchema } from '~/validations/dashboards';
import { boardCustomizationSchema } from '~/validations/boards';
import { IRssWidget } from '~/widgets/rss/RssWidgetTile';
import { getConfig } from '../../../tools/config/getConfig';

View File

@@ -28,7 +28,7 @@ export const userRouter = createTRPCRouter({
});
}
await createUserInNotExist(ctx, input, {
await createUserIfNotPresent(ctx, input, {
defaultSettings: {
colorScheme: colorSchemeParser.parse(ctx.cookies[COOKIE_COLOR_SCHEME_KEY]),
language: ctx.cookies[COOKIE_LOCALE_KEY] ?? 'en',
@@ -62,7 +62,7 @@ export const userRouter = createTRPCRouter({
});
}
await createUserInNotExist(ctx, input, {
await createUserIfNotPresent(ctx, input, {
defaultSettings: {
colorScheme: colorSchemeParser.parse(ctx.cookies[COOKIE_COLOR_SCHEME_KEY]),
language: ctx.cookies[COOKIE_LOCALE_KEY] ?? 'en',
@@ -235,7 +235,7 @@ export const userRouter = createTRPCRouter({
return {
users: users.map((user) => ({
id: user.id,
name: user.name,
name: user.name!,
email: user.email,
emailVerified: user.emailVerified,
})),
@@ -243,25 +243,25 @@ export const userRouter = createTRPCRouter({
};
}),
create: adminProcedure.input(createNewUserSchema).mutation(async ({ ctx, input }) => {
await createUserInNotExist(ctx, input);
await createUserIfNotPresent(ctx, input);
}),
deleteUser: adminProcedure
.input(
z.object({
userId: z.string(),
id: z.string(),
})
)
.mutation(async ({ ctx, input }) => {
await ctx.prisma.user.delete({
where: {
id: input.userId,
id: input.id,
},
});
}),
});
const createUserInNotExist = async (
const createUserIfNotPresent = async (
ctx: TRPCContext,
input: z.infer<typeof createNewUserSchema>,
options: {

View File

@@ -1,5 +1,6 @@
import { PrismaAdapter } from '@next-auth/prisma-adapter';
import bcrypt from 'bcryptjs';
import Consola from 'consola';
import Cookies from 'cookies';
import { type GetServerSidePropsContext, type NextApiRequest, type NextApiResponse } from 'next';
import { type DefaultSession, type NextAuthOptions, getServerSession } from 'next-auth';
@@ -150,15 +151,15 @@ export const constructAuthOptions = (
return null;
}
console.log(`user ${user.id} is trying to log in. checking password...`);
Consola.log(`user ${user.id} is trying to log in. checking password...`);
const isValidPassword = await bcrypt.compare(data.password, user.password);
if (!isValidPassword) {
console.log(`password for user ${user.id} was incorrect`);
Consola.log(`password for user ${user.id} was incorrect`);
return null;
}
console.log(`user ${user.id} successfully authorized`);
Consola.log(`user ${user.id} successfully authorized`);
return {
id: user.id,