easy

server/prisma/migrations/20240221204730_init/migration.sql → server/prisma/migrations/20240226000444_init/migration.sql

@@ -1,5 +1,5 @@
 -- CreateEnum
-CREATE TYPE "UserRoleName" AS ENUM ('ADMIN', 'MOD', 'USER', 'GUEST');
+CREATE TYPE "UserRoleName" AS ENUM ('Admin', 'Mod', 'User', 'Guest');
 
 -- CreateEnum
 CREATE TYPE "Unit" AS ENUM ('G', 'L', 'ML', 'KG');

server/prisma/schema.prisma

@@ -591,10 +591,10 @@ model WeeklyMealGroup {
 }
 
 enum UserRoleName {
-  ADMIN
-  MOD
-  USER
-  GUEST
+  Admin
+  Mod
+  User
+  Guest
 }
 
 enum Unit {

server/prisma/seed.ts

@@ -63,7 +63,7 @@ const seed = async () => {
   await createUser({
     email: EMAIL,
     password: await argon2.hash("!admin"),
-    roles: ["USER", "ADMIN"],
+    roles: ["User", "Admin"],
   });
 
   await seedSettings();
@@ -127,7 +127,7 @@ const seedUsers = async () => {
     const user = await createUser({
       email: faker.internet.email(),
       password: await argon2.hash("test"),
-      roles: ["USER"],
+      roles: ["User"],
     });
     await mealLocationsAndAllergens(user.id);
   }
@@ -715,7 +715,7 @@ const seedWeeklyMealGroups = async () => {
   for (const mealBoardPlan of mealBoardPlans) {
     for (let year = startYear; year <= currentYear; year++) {
       // For past years use all weeks, for the current year only up to the current week
-      let lastWeek = year < currentYear ? 52 : currentWeekNumber;
+      const lastWeek = year < currentYear ? 52 : currentWeekNumber;
 
       for (let week = 1; week <= lastWeek; week++) {
         for (let groupIndex = 0; groupIndex < 3; groupIndex++) {

server/schema.graphql

@@ -429,10 +429,10 @@ type UserRole {
 }
 
 enum UserRoleName {
-  ADMIN
-  MOD
-  USER
-  GUEST
+  Admin
+  Mod
+  User
+  Guest
 }
 
 type Settings {

server/src/app_modules/guards/roles.guard.ts

@@ -30,7 +30,7 @@ export class RolesGuard implements CanActivate {
 
     if (!rules.length) throw new UnauthorizedException(["enpoint has no role"]);
 
-    if (rules.includes("GUEST")) return true;
+    if (rules.includes("Guest")) return true;
 
     const ctx = GqlExecutionContext.create(context).getContext();
 
@@ -44,7 +44,7 @@ export class RolesGuard implements CanActivate {
       }) as JwtUser;
       await this.prisma.token.findFirstOrThrow({ where: { token } });
 
-      if (user.roles.includes("ADMIN")) return true;
+      if (user.roles.includes("Admin")) return true;
 
       return rules.some((rule) => user.roles.includes(rule));
     } catch (_) {

server/src/auth/auth.service.ts

@@ -30,10 +30,7 @@ export class AuthService {
     });
 
     try {
-      if (
-        user &&
-        (await argon2.verify(user.password, data.password))
-      ) {
+      if (user && (await argon2.verify(user.password, data.password))) {
         const { password, ...result } = user;
         return result as User & {
           userRole: UserRole[];
@@ -66,7 +63,7 @@ export class AuthService {
     await this.prisma.userRole.create({
       data: {
         userId: user.id,
-        name: "USER",
+        name: "User",
         createdBy: user.id,
         updatedBy: user.id,
       },

server/src/auth/resolver/auth-user.resolver.ts

@@ -15,15 +15,15 @@ export class AuthUserResolver {
   ) {}
 
   @Mutation(() => Boolean, { nullable: true })
-  @Roles("USER", "MOD")
+  @Roles("User", "Mod")
   async logout(@Context() ctx: GraphQLContext, @CurrentUser() me?: JwtUser) {
     if (!me) return null;
 
     return await this.authService.logout(ctx);
   }
 
   @Mutation(() => Boolean, { nullable: true })
-  @Roles("USER", "MOD")
+  @Roles("User", "Mod")
   async changePasswordUser(
     @Args("password") password: string,
     @Args("newPassword") newPassword: string,
@@ -42,7 +42,7 @@ export class AuthUserResolver {
   }
 
   @Mutation(() => Boolean)
-  @Roles("USER", "MOD")
+  @Roles("User", "Mod")
   async deleteAccountTokensUser(
     @Context() ctx: GraphQLContext,
     @CurrentUser() me?: JwtUser,

server/src/auth/resolver/auth.resolver.ts

@@ -17,7 +17,7 @@ export class AuthResolver {
   ) {}
 
   @Query(() => User, { nullable: true })
-  @Roles("USER", "MOD")
+  @Roles("User", "Mod")
   async me(@CurrentUser() me?: JwtUser) {
     if (!me) return null;
 
@@ -58,7 +58,7 @@ export class AuthResolver {
   }
 
   @Mutation(() => User, { nullable: true })
-  @Roles("GUEST")
+  @Roles("Guest")
   async registerUser(
     @Args("data") data: RegisterUserInput,
     @Context() ctx: GraphQLContext,
@@ -82,7 +82,7 @@ export class AuthResolver {
   }
 
   @Mutation(() => User, { nullable: true })
-  @Roles("GUEST")
+  @Roles("Guest")
   async loginUser(
     @Args("data") data: LoginUserInput,
     @Context() ctx: GraphQLContext,

server/src/ingredient-properties/allergens/resolver/allergens-user.resolver.ts

@@ -17,7 +17,7 @@ export class AllergensUserResolver {
   ) {}
 
   @Query(() => [Allergens], { nullable: true })
-  @Roles("USER", "MOD")
+  @Roles("User", "Mod")
   async getAllAllergensUser(
     @Args() args: FindManyAllergensArgs,
     @Info() info: GraphQLResolveInfo,

server/src/ingredient/resolver/ingredient-admin.resolver.ts

@@ -25,7 +25,7 @@ export class IngredientAdminResolver {
   ) {}
 
   @Query(() => [Ingredient], { nullable: true })
-  @Roles("ADMIN")
+  @Roles("Admin")
   async getAllIngredientsAdmin(
     @Args() args: FindManyIngredientArgs,
     @Info() info: GraphQLResolveInfo,
@@ -41,7 +41,7 @@ export class IngredientAdminResolver {
   }
 
   @Query(() => Ingredient, { nullable: true })
-  @Roles("ADMIN")
+  @Roles("Admin")
   async getIngredientAdmin(
     @Args() args: FindFirstIngredientArgs,
     @Info() info: GraphQLResolveInfo,
@@ -57,7 +57,7 @@ export class IngredientAdminResolver {
   }
 
   @Mutation(() => Ingredient, { nullable: true })
-  @Roles("ADMIN")
+  @Roles("Admin")
   async createIngredientAdmin(
     @Args() args: CreateOneIngredientArgs,
     @Info() info: GraphQLResolveInfo,
@@ -73,7 +73,7 @@ export class IngredientAdminResolver {
   }
 
   @Mutation(() => [Ingredient], { nullable: true })
-  @Roles("ADMIN")
+  @Roles("Admin")
   async createManyIngredientsAdmin(
     @Args() args: CreateManyIngredientArgs,
     @Info() info: GraphQLResolveInfo,
@@ -92,7 +92,7 @@ export class IngredientAdminResolver {
   }
 
   @Mutation(() => Ingredient, { nullable: true })
-  @Roles("ADMIN")
+  @Roles("Admin")
   async deleteIngredientAdmin(
     @Args() args: DeleteOneIngredientArgs,
     @Info() info: GraphQLResolveInfo,
@@ -108,7 +108,7 @@ export class IngredientAdminResolver {
   }
 
   @Mutation(() => Int, { nullable: true })
-  @Roles("ADMIN")
+  @Roles("Admin")
   async deleteManyIngredientsAdmin(@Args() args: DeleteManyIngredientArgs) {
     try {
       return (await this.prisma.ingredient.deleteMany({ ...args })).count;
@@ -119,7 +119,7 @@ export class IngredientAdminResolver {
   }
 
   @Mutation(() => Ingredient, { nullable: true })
-  @Roles("ADMIN")
+  @Roles("Admin")
   async updateIngredientAdmin(
     @Args() args: UpdateOneIngredientArgs,
     @Info() info: GraphQLResolveInfo,
@@ -135,7 +135,7 @@ export class IngredientAdminResolver {
   }
 
   @Mutation(() => [Ingredient], { nullable: true })
-  @Roles("ADMIN")
+  @Roles("Admin")
   async updateManyIngredientsAdmin(
     @Args() args: UpdateManyIngredientArgs,
     @Info() info: GraphQLResolveInfo,
@@ -163,7 +163,7 @@ export class IngredientAdminResolver {
   }
 
   @Mutation(() => Ingredient, { nullable: true })
-  @Roles("ADMIN")
+  @Roles("Admin")
   async upsertIngredientAdmin(
     @Args() args: UpsertOneIngredientArgs,
     @Info() info: GraphQLResolveInfo,

server/src/meal-board-plan/resolver/meal-board-plan-admin.resolver.ts

@@ -26,7 +26,7 @@ export class MealBoardPlanAdminResolver {
   ) {}
 
   @Query(() => [MealBoardPlan], { nullable: true })
-  @Roles("ADMIN")
+  @Roles("Admin")
   async getAllMealBoardPlansAdmin(
     @Args() args: FindManyMealBoardPlanArgs,
     @Info() info: GraphQLResolveInfo,
@@ -42,7 +42,7 @@ export class MealBoardPlanAdminResolver {
   }
 
   @Query(() => MealBoardPlan, { nullable: true })
-  @Roles("ADMIN")
+  @Roles("Admin")
   async getMealBoardPlanAdmin(
     @Args() args: FindFirstMealBoardPlanArgs,
     @Info() info: GraphQLResolveInfo,
@@ -58,7 +58,7 @@ export class MealBoardPlanAdminResolver {
   }
 
   @Mutation(() => MealBoardPlan, { nullable: true })
-  @Roles("ADMIN")
+  @Roles("Admin")
   async createMealBoardPlanAdmin(
     @Args() args: CreateOneMealBoardPlanArgs,
     @Info() info: GraphQLResolveInfo,
@@ -77,7 +77,7 @@ export class MealBoardPlanAdminResolver {
   }
 
   @Mutation(() => [MealBoardPlan], { nullable: true })
-  @Roles("ADMIN")
+  @Roles("Admin")
   async createManyMealBoardPlansAdmin(
     @Args() args: CreateManyMealBoardPlanArgs,
     @Info() info: GraphQLResolveInfo,
@@ -101,7 +101,7 @@ export class MealBoardPlanAdminResolver {
   }
 
   @Mutation(() => MealBoardPlan, { nullable: true })
-  @Roles("ADMIN")
+  @Roles("Admin")
   async deleteMealBoardPlanAdmin(
     @Args() args: DeleteOneMealBoardPlanArgs,
     @Info() info: GraphQLResolveInfo,
@@ -117,7 +117,7 @@ export class MealBoardPlanAdminResolver {
   }
 
   @Mutation(() => Int, { nullable: true })
-  @Roles("ADMIN")
+  @Roles("Admin")
   async deleteManyMealBoardPlansAdmin(
     @Args() args: DeleteManyMealBoardPlanArgs,
   ) {
@@ -130,7 +130,7 @@ export class MealBoardPlanAdminResolver {
   }
 
   @Mutation(() => MealBoardPlan, { nullable: true })
-  @Roles("ADMIN")
+  @Roles("Admin")
   async updateMealBoardPlanAdmin(
     @Args("data") data: MealBoardPlanUncheckedUpdateInput,
     @Args({ name: "where", type: () => WeeklyMealGroupWhereUniqueInput })
@@ -152,7 +152,7 @@ export class MealBoardPlanAdminResolver {
   }
 
   @Mutation(() => [MealBoardPlan], { nullable: true })
-  @Roles("ADMIN")
+  @Roles("Admin")
   async updateManyMealBoardPlansAdmin(
     @Args() args: UpdateManyMealBoardPlanArgs,
     @Info() info: GraphQLResolveInfo,
@@ -182,7 +182,7 @@ export class MealBoardPlanAdminResolver {
   }
 
   @Mutation(() => MealBoardPlan, { nullable: true })
-  @Roles("ADMIN")
+  @Roles("Admin")
   async upsertMealBoardPlanAdmin(
     @Args() args: UpsertOneMealBoardPlanArgs,
     @Info() info: GraphQLResolveInfo,

server/src/meal-board-plan/resolver/meal-board-plan-user.resolver.ts

@@ -17,7 +17,7 @@ export class MealBoardPlanUserResolver {
   ) {}
 
   @Query(() => [MealBoardPlan], { nullable: true })
-  @Roles("USER", "MOD", "ADMIN")
+  @Roles("User", "Mod", "Admin")
   async getAllMealBoardPlansUser(
     @Args() args: FindManyMealBoardPlanArgs,
     @Info() info: GraphQLResolveInfo,