Merge pull request #603 from rharkor/rec

Rec

package.json

@@ -39,5 +39,5 @@
     "only-allow-many": "^1.2.2",
     "semantic-release": "^23.0.0"
   },
-  "version": "3.6.0"
+  "version": "3.6.1-rec.1"
 }

packages/app/.env.example

@@ -4,9 +4,9 @@ ENV=development
 NEXT_PUBLIC_BASE_URL=http://localhost:3000
 DATABASE_PRISMA_URL="postgresql://postgres:postgres@localhost:5432/postgres?schema=public"
 DATABASE_URL_NON_POOLING="postgresql://postgres:postgres@localhost:5432/postgres?schema=public"
-PASSWORD_HASHER_SECRET=QltDSmVBMDhHKENWcjFgN3J1Vmw=
+PASSWORD_HASHER_SECRET=secret
 NEXTAUTH_URL=http://localhost:3000
-NEXTAUTH_SECRET=PGJwbCE+WiJILGZ+K1ZqU24mIX5tVH0=
+NEXTAUTH_SECRET=secret
 GITHUB_CLIENT_ID=secret
 GITHUB_CLIENT_SECRET=secret
 AUTH_ADMIN_EMAIL=[email protected]

packages/app/env.mjs

@@ -13,10 +13,10 @@ export const env = createEnv({
       .enum(["true", "false"])
       .optional()
       .transform((value) => value === "true"),
-    PASSWORD_HASHER_SECRET: z.string().min(16),
+    PASSWORD_HASHER_SECRET: z.string(),
     DATABASE_PRISMA_URL: z.string().min(1),
     DATABASE_URL_NON_POOLING: z.string().optional(),
-    NEXTAUTH_SECRET: z.string().min(16),
+    NEXTAUTH_SECRET: z.string(),
     NEXTAUTH_URL: z.string().optional(),
     GITHUB_CLIENT_ID: z.string().min(1),
     GITHUB_CLIENT_SECRET: z.string().min(1),

packages/app/package.json

@@ -20,7 +20,7 @@
     "@next-auth/prisma-adapter": "^1.0.7",
     "@nextui-org/react": "^2.2.9",
     "@prisma/client": "^5.6.0",
-    "@t3-oss/env-nextjs": "^0.9.0",
+    "@t3-oss/env-nextjs": "^0.9.2",
     "@tanstack/react-query": "^4.36.1",
     "@total-typescript/ts-reset": "^0.5.0",
     "@trpc/client": "^10.43.0",
@@ -56,7 +56,7 @@
     "eslint-plugin-unused-imports": "^3.0.0",
     "framer-motion": "^11.0.0",
     "ioredis": "^5.3.2",
-    "lucide-react": "^0.331.0",
+    "lucide-react": "^0.336.0",
     "negotiator": "^0.6.3",
     "next": "^14.0.0",
     "next-auth": "^4.24.5",
@@ -72,7 +72,6 @@
     "react-hook-form": "^7.45.4",
     "react-toastify": "^10.0.0",
     "request-ip": "^3.3.0",
-    "server-only": "^0.0.1",
     "sharp": "^0.33.0",
     "superjson": "^2.0.0",
     "tailwind-merge": "^2.0.0",

packages/app/prisma/seed.ts

@@ -3,12 +3,11 @@ config()
 import chalk from "chalk"
 import { Spinner } from "cli-spinner"
 
+import { rolesAsObject } from "@/constants"
 import { hash } from "@/lib/bcrypt"
 import { logger } from "@lib/logger"
 import { PrismaClient } from "@prisma/client"
 
-import { rolesAsObject } from "../src/types/constants"
-
 const env = {
   AUTH_ADMIN_EMAIL: process.env.AUTH_ADMIN_EMAIL,
   AUTH_ADMIN_PASSWORD: process.env.AUTH_ADMIN_PASSWORD,

packages/app/src/api/auth/_router.ts

@@ -8,7 +8,7 @@ import {
   signUpSchema,
   verifyTotpResponseSchema,
   verifyTotpSchema,
-} from "@/lib/schemas/auth"
+} from "@/api/auth/schemas"
 import { authenticatedProcedure, publicProcedure, router } from "@/lib/server/trpc"
 
 import { desactivateTotp, generateTotpSecret, recover2FA, register, verifyTotp } from "./mutations"

packages/app/src/api/auth/mutations.ts

@@ -4,21 +4,21 @@ import { env } from "env.mjs"
 import { authenticator } from "otplib"
 import { z } from "zod"
 
-import { hash } from "@/lib/bcrypt"
-import { sendMail } from "@/lib/mailer"
-import { prisma } from "@/lib/prisma"
-import { redis } from "@/lib/redis"
 import {
   desactivateTotpSchema,
   generateTotpSecretResponseSchema,
   recover2FASchema,
   signUpSchema,
   verifyTotpSchema,
-} from "@/lib/schemas/auth"
+} from "@/api/auth/schemas"
+import { emailVerificationExpiration, rolesAsObject } from "@/constants"
+import { hash } from "@/lib/bcrypt"
+import { sendMail } from "@/lib/mailer"
+import { prisma } from "@/lib/prisma"
+import { redis } from "@/lib/redis"
 import { html, plainText, subject } from "@/lib/templates/mail/verify-email"
 import { ApiError, ensureLoggedIn, generateRandomSecret, handleApiError } from "@/lib/utils/server-utils"
 import { apiInputFromSchema } from "@/types"
-import { emailVerificationExpiration, rolesAsObject } from "@/types/constants"
 import { logger } from "@lib/logger"
 import { Prisma } from "@prisma/client"
 

packages/app/src/lib/schemas/auth.ts → packages/app/src/api/auth/schemas.ts

@@ -1,10 +1,9 @@
 import * as z from "zod"
 
+import { maxPasswordLength, minPasswordLength } from "@/lib/auth/constants"
 import { TDictionary } from "@/lib/langs"
 
-import { maxPasswordLength, minPasswordLength } from "../auth/constants"
-
-import { userSchema } from "./user"
+import { userSchema } from "../me/schemas"
 
 export const passwordSchema = (dictionary?: TDictionary) =>
   z

packages/app/src/api/me/_router.ts

@@ -15,7 +15,7 @@ import {
   updateUserSchema,
   verifyEmailResponseSchema,
   verifyEmailSchema,
-} from "@/lib/schemas/user"
+} from "@/api/me/schemas"
 import {
   authenticatedNoEmailVerificationProcedure,
   authenticatedProcedure,

packages/app/src/api/me/email/mutations.ts

@@ -2,13 +2,13 @@ import { randomUUID } from "crypto"
 import { env } from "env.mjs"
 import { i18n } from "i18n-config"
 
+import { sendVerificationEmailSchema, verifyEmailSchema } from "@/api/me/schemas"
+import { emailVerificationExpiration, resendEmailVerificationExpiration } from "@/constants"
 import { sendMail } from "@/lib/mailer"
 import { prisma } from "@/lib/prisma"
-import { sendVerificationEmailSchema, verifyEmailSchema } from "@/lib/schemas/user"
 import { html, plainText, subject } from "@/lib/templates/mail/verify-email"
 import { ApiError, handleApiError } from "@/lib/utils/server-utils"
 import { apiInputFromSchema } from "@/types"
-import { emailVerificationExpiration, resendEmailVerificationExpiration } from "@/types/constants"
 import { logger } from "@lib/logger"
 
 export const sendVerificationEmail = async ({ input }: apiInputFromSchema<typeof sendVerificationEmailSchema>) => {

packages/app/src/api/me/mutations.ts

@@ -1,12 +1,12 @@
 import { env } from "env.mjs"
 
+import { updateUserSchema } from "@/api/me/schemas"
+import { rolesAsObject } from "@/constants"
 import { prisma } from "@/lib/prisma"
 import { s3Client } from "@/lib/s3"
-import { updateUserSchema } from "@/lib/schemas/user"
 import { ApiError } from "@/lib/utils/server-utils"
 import { ensureLoggedIn, handleApiError } from "@/lib/utils/server-utils"
 import { apiInputFromSchema } from "@/types"
-import { rolesAsObject } from "@/types/constants"
 import { DeleteObjectCommand } from "@aws-sdk/client-s3"
 import { logger } from "@lib/logger"
 import { Prisma } from "@prisma/client"

packages/app/src/api/me/password/mutations.ts

@@ -2,14 +2,14 @@ import { randomUUID } from "crypto"
 import { env } from "env.mjs"
 import { i18n } from "i18n-config"
 
+import { forgotPasswordSchema, resetPasswordSchema } from "@/api/me/schemas"
+import { resendResetPasswordExpiration, resetPasswordExpiration, rolesAsObject } from "@/constants"
 import { hash } from "@/lib/bcrypt"
 import { sendMail } from "@/lib/mailer"
 import { prisma } from "@/lib/prisma"
-import { forgotPasswordSchema, resetPasswordSchema } from "@/lib/schemas/user"
 import { html, plainText, subject } from "@/lib/templates/mail/reset-password"
 import { ApiError, handleApiError } from "@/lib/utils/server-utils"
 import { apiInputFromSchema } from "@/types"
-import { resendResetPasswordExpiration, resetPasswordExpiration, rolesAsObject } from "@/types/constants"
 import { logger } from "@lib/logger"
 
 export const forgotPassword = async ({ input }: apiInputFromSchema<typeof forgotPasswordSchema>) => {

packages/app/src/lib/schemas/user.ts → packages/app/src/api/me/schemas.ts

@@ -1,9 +1,9 @@
 import { z } from "zod"
 
-import { jsonApiQuerySchema, jsonApiResponseSchema } from "../json-api"
-import { TDictionary } from "../langs"
+import { queriesOptionPage, queriesOptionPerPage } from "@/lib/queries-options"
 
-import { emailSchema, passwordSchemaWithRegex, usernameSchema } from "./auth"
+import { TDictionary } from "../../lib/langs"
+import { emailSchema, passwordSchemaWithRegex, usernameSchema } from "../auth/schemas"
 
 export const userSchema = (dictionary?: TDictionary) =>
   z.object({
@@ -43,17 +43,20 @@ export const sessionsSchema = () =>
   })
 
 export const getActiveSessionsSchema = (dictionary?: TDictionary) =>
-  jsonApiQuerySchema(dictionary)
-    .pick({
-      page: true,
-      perPage: true,
-      sort: true,
-    })
-    .optional()
+  z.object({
+    page: queriesOptionPage(dictionary),
+    perPage: queriesOptionPerPage(dictionary),
+  })
 
 export const getActiveSessionsResponseSchema = () =>
-  jsonApiResponseSchema().extend({
+  z.object({
     data: z.array(sessionsSchema()).optional(),
+    meta: z.object({
+      total: z.number(),
+      page: z.number(),
+      perPage: z.number(),
+      totalPages: z.number(),
+    }),
   })
 
 export const deleteSessionSchema = () =>

packages/app/src/api/me/sessions/mutations.ts

@@ -1,5 +1,5 @@
+import { deleteSessionSchema } from "@/api/me/schemas"
 import { redis } from "@/lib/redis"
-import { deleteSessionSchema } from "@/lib/schemas/user"
 import { ensureLoggedIn, handleApiError } from "@/lib/utils/server-utils"
 import { apiInputFromSchema } from "@/types"
 

packages/app/src/api/me/sessions/queries.ts

@@ -1,8 +1,7 @@
 import { z } from "zod"
 
-import { getJsonApiSkip, getJsonApiTake } from "@/lib/json-api"
+import { getActiveSessionsResponseSchema, getActiveSessionsSchema, sessionsSchema } from "@/api/me/schemas"
 import { redis } from "@/lib/redis"
-import { getActiveSessionsResponseSchema, getActiveSessionsSchema, sessionsSchema } from "@/lib/schemas/user"
 import { ensureLoggedIn, handleApiError } from "@/lib/utils/server-utils"
 import { apiInputFromSchema } from "@/types"
 
@@ -13,8 +12,10 @@ export const getActiveSessions = async ({
   try {
     ensureLoggedIn(session)
 
-    const skip = getJsonApiSkip(input)
-    const take = getJsonApiTake(input)
+    const { page, perPage } = input
+
+    const skip = (page - 1) * perPage
+    const take = perPage
     const allSessionsKeys = await redis.keys(`session:${session.user.id}:*`)
     const allSessions = await redis.mget(allSessionsKeys)
     const activeSessions = allSessions

packages/app/src/api/upload/_router.ts

@@ -1,7 +1,7 @@
-import { presignedUrlResponseSchema, presignedUrlSchema } from "@/lib/schemas/upload"
 import { authenticatedProcedure, router } from "@/lib/server/trpc"
 
 import { presignedUrl } from "./mutations"
+import { presignedUrlResponseSchema, presignedUrlSchema } from "./schemas"
 
 export const uploadRouter = router({
   presignedUrl: authenticatedProcedure

packages/app/src/api/upload/mutations.ts

@@ -2,17 +2,18 @@ import { randomUUID } from "crypto"
 import { env } from "env.mjs"
 import { z } from "zod"
 
+import { maxUploadSize } from "@/constants"
 import { prisma } from "@/lib/prisma"
 import { s3Client } from "@/lib/s3"
-import { presignedUrlResponseSchema, presignedUrlSchema } from "@/lib/schemas/upload"
 import { stringToSlug } from "@/lib/utils"
 import { ApiError, ensureLoggedIn, handleApiError } from "@/lib/utils/server-utils"
 import { apiInputFromSchema } from "@/types"
-import { maxUploadSize } from "@/types/constants"
 import { DeleteObjectCommand } from "@aws-sdk/client-s3"
 import { createPresignedPost } from "@aws-sdk/s3-presigned-post"
 import { logger } from "@lib/logger"
 
+import { presignedUrlResponseSchema, presignedUrlSchema } from "./schemas"
+
 export const presignedUrl = async ({ input, ctx: { session } }: apiInputFromSchema<typeof presignedUrlSchema>) => {
   ensureLoggedIn(session)
   try {

packages/app/src/app/[lang]/(protected)/examples/profile/page.tsx

@@ -41,7 +41,7 @@ export default async function Profile({
               <SignoutButton>{dictionary.signOut}</SignoutButton>
             </div>
             <ProfileDetails dictionary={dictionary} hasVerifiedEmail={hasVerifiedEmail} />
-            <UserActiveSessions dictionary={dictionary} session={session} />
+            <UserActiveSessions dictionary={dictionary} />
           </CardBody>
         </Card>
       </div>

packages/app/src/app/[lang]/(sys-auth)/forgot-password/form.tsx

@@ -6,12 +6,12 @@ import { useForm } from "react-hook-form"
 import { toast } from "react-toastify"
 import { z } from "zod"
 
+import { forgotPasswordSchema } from "@/api/me/schemas"
 import AutoRefresh from "@/components/auto-refresh"
 import FormField from "@/components/ui/form"
+import { resendResetPasswordExpiration } from "@/constants"
 import { useDictionary } from "@/contexts/dictionary/utils"
-import { forgotPasswordSchema } from "@/lib/schemas/user"
 import { trpc } from "@/lib/trpc/client"
-import { resendResetPasswordExpiration } from "@/types/constants"
 import { zodResolver } from "@hookform/resolvers/zod"
 import { Button, Tooltip } from "@nextui-org/react"
 

packages/app/src/app/[lang]/(sys-auth)/recover-2fa/form.tsx

@@ -6,10 +6,10 @@ import { useForm } from "react-hook-form"
 import { toast } from "react-toastify"
 import { z } from "zod"
 
+import { recover2FASchema } from "@/api/auth/schemas"
 import FormField from "@/components/ui/form"
 import { useDictionary } from "@/contexts/dictionary/utils"
 import { authRoutes } from "@/lib/auth/constants"
-import { recover2FASchema } from "@/lib/schemas/auth"
 import { trpc } from "@/lib/trpc/client"
 import { cn } from "@/lib/utils"
 import { zodResolver } from "@hookform/resolvers/zod"

packages/app/src/app/[lang]/(sys-auth)/reset-password/[token]/form.tsx

@@ -5,10 +5,10 @@ import { useForm } from "react-hook-form"
 import { toast } from "react-toastify"
 import { z } from "zod"
 
+import { resetPasswordSchema } from "@/api/me/schemas"
 import FormField from "@/components/ui/form"
 import { useDictionary } from "@/contexts/dictionary/utils"
 import { authRoutes } from "@/lib/auth/constants"
-import { resetPasswordSchema } from "@/lib/schemas/user"
 import { trpc } from "@/lib/trpc/client"
 import { zodResolver } from "@hookform/resolvers/zod"
 import { Button } from "@nextui-org/react"

packages/app/src/components/auth/github-sign-in.tsx

@@ -28,7 +28,7 @@ export default function GithubSignIn({
         isDisabled={isLoading}
       >
         {isLoading ? (
-          <Spinner classNames={{ base: "mr-2", wrapper: "h-4 w-4" }} color="current" size="sm" />
+          <Spinner classNames={{ base: "mr-2", wrapper: "size-4" }} color="current" size="sm" />
         ) : (
           <Icons.gitHub className="mr-2 size-4" />
         )}

packages/app/src/components/auth/login-user-auth-form.tsx

@@ -7,10 +7,10 @@ import { ArrowBigDown, BadgeInfo } from "lucide-react"
 import { useForm } from "react-hook-form"
 import * as z from "zod"
 
+import { signInSchema } from "@/api/auth/schemas"
 import { useDictionary } from "@/contexts/dictionary/utils"
 import { authRoutes } from "@/lib/auth/constants"
 import { handleSignError, handleSignIn } from "@/lib/auth/handle-sign"
-import { signInSchema } from "@/lib/schemas/auth"
 import { cn, ensureRelativeUrl } from "@/lib/utils"
 import { zodResolver } from "@hookform/resolvers/zod"
 import { Button, Card, CardBody, Link } from "@nextui-org/react"

packages/app/src/components/auth/register-user-auth-form.tsx

@@ -6,11 +6,11 @@ import { useRouter } from "next/navigation"
 import { useForm } from "react-hook-form"
 import * as z from "zod"
 
+import { signUpSchema } from "@/api/auth/schemas"
 import { useDictionary } from "@/contexts/dictionary/utils"
 import { authRoutes } from "@/lib/auth/constants"
 import { handleSignError, handleSignIn } from "@/lib/auth/handle-sign"
 import { TDictionary } from "@/lib/langs"
-import { signUpSchema } from "@/lib/schemas/auth"
 import { trpc } from "@/lib/trpc/client"
 import { cn } from "@/lib/utils"
 import { handleMutationError } from "@/lib/utils/client-utils"

packages/app/src/components/profile/avatar.tsx

@@ -4,12 +4,12 @@ import { useState } from "react"
 import { Camera } from "lucide-react"
 import { toast } from "react-toastify"
 
+import { maxUploadSize } from "@/constants"
 import { useAccount } from "@/contexts/account"
 import { useDictionary } from "@/contexts/dictionary/utils"
 import { trpc } from "@/lib/trpc/client"
 import { cn } from "@/lib/utils"
 import { getImageUrl } from "@/lib/utils/client-utils"
-import { maxUploadSize } from "@/types/constants"
 import { logger } from "@lib/logger"
 import { Avatar, Button, Modal, ModalBody, ModalContent, Skeleton, Spinner } from "@nextui-org/react"
 
@@ -141,7 +141,7 @@ export default function UpdateAvatar({ account }: { account: ReturnType<typeof u
           {updateUserMutation.isLoading ? (
             <Spinner
               classNames={{
-                wrapper: "h-4 w-4",
+                wrapper: "size-4",
               }}
               color="current"
               size="sm"

packages/app/src/components/profile/sessions/session-row.tsx

@@ -2,9 +2,9 @@ import { Dispatch, SetStateAction } from "react"
 import { UAParser } from "ua-parser-js"
 import { z } from "zod"
 
+import { sessionsSchema } from "@/api/me/schemas"
 import { Icons } from "@/components/icons"
 import { TDictionary } from "@/lib/langs"
-import { sessionsSchema } from "@/lib/schemas/user"
 import { cn, getTimeBetween } from "@/lib/utils"
 import { Button, Skeleton as NSkeleton } from "@nextui-org/react"