diff --git a/.env.example b/.env.example index ace6820..07d27ba 100644 --- a/.env.example +++ b/.env.example @@ -5,4 +5,10 @@ # # prisma database url -DATABASE_URL="postgresql://prisma:prisma@localhost:5432/finances?schema=public" +DATABASE_URL='postgresql://prisma:prisma@localhost:5432/finances?schema=public' + +AUTH0_SECRET='' +AUTH0_BASE_URL='http://localhost:3000' +AUTH0_ISSUER_BASE_URL='' +AUTH0_CLIENT_ID='' +AUTH0_CLIENT_SECRET='' diff --git a/package-lock.json b/package-lock.json index 6f29471..adf3816 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,7 @@ "name": "next-finances", "version": "1.2.0", "dependencies": { + "@auth0/nextjs-auth0": "^3.5.0", "@hookform/resolvers": "^3.3.4", "@lucia-auth/adapter-prisma": "^4.0.0", "@prisma/client": "^5.10.2", @@ -79,6 +80,28 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@auth0/nextjs-auth0": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@auth0/nextjs-auth0/-/nextjs-auth0-3.5.0.tgz", + "integrity": "sha512-uFZEE2QQf1zU+jRK2fwqxRQt+WSqDPYF2tnr7d6BEa7b6L6tpPJ3evzoImbWSY1a7gFdvD7RD/Rvrsx7B5CKVg==", + "dependencies": { + "@panva/hkdf": "^1.0.2", + "cookie": "^0.6.0", + "debug": "^4.3.4", + "joi": "^17.6.0", + "jose": "^4.9.2", + "oauth4webapi": "^2.3.0", + "openid-client": "^5.2.1", + "tslib": "^2.4.0", + "url-join": "^4.0.1" + }, + "engines": { + "node": ">=16" + }, + "peerDependencies": { + "next": ">=10" + } + }, "node_modules/@babel/runtime": { "version": "7.24.0", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.0.tgz", @@ -202,6 +225,19 @@ "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.1.tgz", "integrity": "sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==" }, + "node_modules/@hapi/hoek": { + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz", + "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==" + }, + "node_modules/@hapi/topo": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz", + "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==", + "dependencies": { + "@hapi/hoek": "^9.0.0" + } + }, "node_modules/@hookform/resolvers": { "version": "3.3.4", "resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-3.3.4.tgz", @@ -609,6 +645,14 @@ "node": ">= 8" } }, + "node_modules/@panva/hkdf": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@panva/hkdf/-/hkdf-1.1.1.tgz", + "integrity": "sha512-dhPeilub1NuIG0X5Kvhh9lH4iW3ZsHlnzwgwbOlgwQ2wG1IqFzsgHqmKPk3WzsdWAeaxKJxgM0+W433RmN45GA==", + "funding": { + "url": "https://github.com/sponsors/panva" + } + }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", @@ -1890,6 +1934,24 @@ "@types/trusted-types": "2.0.7" } }, + "node_modules/@sideway/address": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz", + "integrity": "sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==", + "dependencies": { + "@hapi/hoek": "^9.0.0" + } + }, + "node_modules/@sideway/formula": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz", + "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==" + }, + "node_modules/@sideway/pinpoint": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz", + "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==" + }, "node_modules/@swc/helpers": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.2.tgz", @@ -3041,6 +3103,14 @@ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, + "node_modules/cookie": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/create-require": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", @@ -3096,7 +3166,6 @@ "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, "dependencies": { "ms": "2.1.2" }, @@ -4912,6 +4981,26 @@ "jiti": "bin/jiti.js" } }, + "node_modules/joi": { + "version": "17.12.3", + "resolved": "https://registry.npmjs.org/joi/-/joi-17.12.3.tgz", + "integrity": "sha512-2RRziagf555owrm9IRVtdKynOBeITiDpuZqIpgwqXShPncPKNiRQoiGsl/T8SQdq+8ugRzH2LqY67irr2y/d+g==", + "dependencies": { + "@hapi/hoek": "^9.3.0", + "@hapi/topo": "^5.1.0", + "@sideway/address": "^4.1.5", + "@sideway/formula": "^3.0.1", + "@sideway/pinpoint": "^2.0.0" + } + }, + "node_modules/jose": { + "version": "4.15.5", + "resolved": "https://registry.npmjs.org/jose/-/jose-4.15.5.tgz", + "integrity": "sha512-jc7BFxgKPKi94uOvEmzlSWFFe2+vASyXaKUpdQKatWAESU2MWjDfFf0fdfc83CDKcA5QecabZeNLyfhe3yKNkg==", + "funding": { + "url": "https://github.com/sponsors/panva" + } + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -5309,8 +5398,7 @@ "node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node_modules/mz": { "version": "2.7.0", @@ -5455,6 +5543,14 @@ "node": ">=0.10.0" } }, + "node_modules/oauth4webapi": { + "version": "2.10.4", + "resolved": "https://registry.npmjs.org/oauth4webapi/-/oauth4webapi-2.10.4.tgz", + "integrity": "sha512-DSoj8QoChzOCQlJkRmYxAJCIpnXFW32R0Uq7avyghIeB6iJq0XAblOD7pcq3mx4WEBDwMuKr0Y1qveCBleG2Xw==", + "funding": { + "url": "https://github.com/sponsors/panva" + } + }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -5581,6 +5677,14 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/oidc-token-hash": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/oidc-token-hash/-/oidc-token-hash-5.0.3.tgz", + "integrity": "sha512-IF4PcGgzAr6XXSff26Sk/+P4KZFJVuHAJZj3wgO3vX2bMdNVp/QXTP3P7CEm9V1IdG8lDLY3HhiqpsE/nOwpPw==", + "engines": { + "node": "^10.13.0 || >=12.0.0" + } + }, "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -5589,6 +5693,39 @@ "wrappy": "1" } }, + "node_modules/openid-client": { + "version": "5.6.5", + "resolved": "https://registry.npmjs.org/openid-client/-/openid-client-5.6.5.tgz", + "integrity": "sha512-5P4qO9nGJzB5PI0LFlhj4Dzg3m4odt0qsJTfyEtZyOlkgpILwEioOhVVJOrS1iVH494S4Ee5OCjjg6Bf5WOj3w==", + "dependencies": { + "jose": "^4.15.5", + "lru-cache": "^6.0.0", + "object-hash": "^2.2.0", + "oidc-token-hash": "^5.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/panva" + } + }, + "node_modules/openid-client/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/openid-client/node_modules/object-hash": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz", + "integrity": "sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==", + "engines": { + "node": ">= 6" + } + }, "node_modules/optionator": { "version": "0.9.3", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", @@ -7261,6 +7398,11 @@ "punycode": "^2.1.0" } }, + "node_modules/url-join": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz", + "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==" + }, "node_modules/use-callback-ref": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.1.tgz", @@ -7624,8 +7766,7 @@ "node_modules/yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/yaml": { "version": "2.4.1", diff --git a/package.json b/package.json index a503c4d..4b40740 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "lint": "next lint" }, "dependencies": { + "@auth0/nextjs-auth0": "^3.5.0", "@hookform/resolvers": "^3.3.4", "@lucia-auth/adapter-prisma": "^4.0.0", "@prisma/client": "^5.10.2", diff --git a/prisma/migrations/20240403224427_remove_lucia_authentication/migration.sql b/prisma/migrations/20240403224427_remove_lucia_authentication/migration.sql new file mode 100644 index 0000000..1063886 --- /dev/null +++ b/prisma/migrations/20240403224427_remove_lucia_authentication/migration.sql @@ -0,0 +1,28 @@ +/* + Warnings: + + - You are about to drop the `lucia_session` table. If the table is not empty, all the data it contains will be lost. + - You are about to drop the `lucia_user` table. If the table is not empty, all the data it contains will be lost. + +*/ +-- DropForeignKey +ALTER TABLE "categories" + DROP CONSTRAINT "categories_user_id_fkey"; + +-- DropForeignKey +ALTER TABLE "entities" + DROP CONSTRAINT "entities_user_id_fkey"; + +-- DropForeignKey +ALTER TABLE "lucia_session" + DROP CONSTRAINT "lucia_session_userId_fkey"; + +-- DropForeignKey +ALTER TABLE "payments" + DROP CONSTRAINT "payments_user_id_fkey"; + +-- DropTable +DROP TABLE "lucia_session"; + +-- DropTable +DROP TABLE "lucia_user"; diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 1e9f6e1..9b12a90 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -7,36 +7,9 @@ datasource db { url = env("DATABASE_URL") } -model User { - // lucia internal fields - id String @id - sessions Session[] - - // custom fields - username String @unique - password String - - entities Entity[] - payments Payment[] - categories Category[] - - @@map("lucia_user") -} - -model Session { - // lucia internal fields - id String @id - userId String - expiresAt DateTime - user User @relation(references: [id], fields: [userId], onDelete: Cascade) - - @@map("lucia_session") -} - model Entity { id Int @id @default(autoincrement()) userId String @map("user_id") - user User @relation(fields: [userId], references: [id]) name String type EntityType defaultCategory Category? @relation(fields: [defaultCategoryId], references: [id]) @@ -59,7 +32,6 @@ enum EntityType { model Payment { id Int @id @default(autoincrement()) userId String @map("user_id") - user User @relation(fields: [userId], references: [id]) amount Int currency String @default("EUR") date DateTime @default(now()) @@ -79,7 +51,6 @@ model Payment { model Category { id Int @id @default(autoincrement()) userId String @map("user_id") - user User @relation(fields: [userId], references: [id]) name String color String createdAt DateTime @default(now()) @map("created_at") diff --git a/src/app/account/page.tsx b/src/app/account/page.tsx index 0023029..fe65f5b 100644 --- a/src/app/account/page.tsx +++ b/src/app/account/page.tsx @@ -1,42 +1,37 @@ import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from '@/components/ui/card'; import React from 'react'; -import { getUser } from '@/auth'; -import { redirect } from 'next/navigation'; -import signOut from '@/lib/actions/signOut'; import { Label } from '@/components/ui/label'; import { Input } from '@/components/ui/input'; -import { URL_SIGN_IN } from '@/lib/constants'; import generateSampleData from '@/lib/actions/generateSampleData'; import prisma from '@/prisma'; import { ServerActionTrigger } from '@/components/form/serverActionTrigger'; -import accountDelete from '@/lib/actions/accountDelete'; +import clearAccountData from '@/lib/actions/clearAccountData'; +import { Button } from '@/components/ui/button'; +import { getSession, Session } from '@auth0/nextjs-auth0'; +import { URL_SIGN_OUT } from '@/lib/constants'; export default async function AccountPage() { - const user = await getUser(); - - if (!user) { - redirect(URL_SIGN_IN); - } + const {user} = await getSession() as Session; let paymentCount = 0; paymentCount = await prisma.payment.count({ where: { - userId: user.id, + userId: user.sub, }, }); let entityCount = 0; entityCount = await prisma.entity.count({ where: { - userId: user.id, + userId: user.sub, }, }); let categoryCount = 0; categoryCount = await prisma.category.count({ where: { - userId: user.id, + userId: user.sub, }, }); @@ -44,7 +39,7 @@ export default async function AccountPage() {
- Hey, {user?.username}! + Hey, {user.name}! This is your account overview. @@ -52,13 +47,13 @@ export default async function AccountPage() { + value={user.sub}/>
+ value={user.name}/>
@@ -83,19 +78,21 @@ export default async function AccountPage() { - Delete Account - - - Sign Out + Clear data + + + { process.env.NODE_ENV === 'development' && ( ) { - return ( -
- {children} -
- ); -} diff --git a/src/app/auth/signin/page.tsx b/src/app/auth/signin/page.tsx deleted file mode 100644 index 2660cbe..0000000 --- a/src/app/auth/signin/page.tsx +++ /dev/null @@ -1,25 +0,0 @@ -import React from 'react'; -import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from '@/components/ui/card'; -import SignInForm from '@/components/form/signInForm'; -import signIn from '@/lib/actions/signIn'; -import Link from 'next/link'; -import { URL_SIGN_UP } from '@/lib/constants'; - -export default async function SignInPage() { - return ( - - - Sign in - Sign into your existing account - - - - - - - Don't have an account? Sign up - - - - ); -} diff --git a/src/app/auth/signup/page.tsx b/src/app/auth/signup/page.tsx deleted file mode 100644 index 33ef08d..0000000 --- a/src/app/auth/signup/page.tsx +++ /dev/null @@ -1,25 +0,0 @@ -import React from 'react'; -import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from '@/components/ui/card'; -import signUp from '@/lib/actions/signUp'; -import SignUpForm from '@/components/form/signUpForm'; -import Link from 'next/link'; -import { URL_SIGN_IN } from '@/lib/constants'; - -export default async function SignUpPage() { - return ( - - - Sign up - Create a new account. - - - - - - - Already have an account? Sign in - - - - ); -} diff --git a/src/app/categories/page.tsx b/src/app/categories/page.tsx index 73c6251..e565f55 100644 --- a/src/app/categories/page.tsx +++ b/src/app/categories/page.tsx @@ -1,13 +1,13 @@ -import { getUser } from '@/auth'; import prisma from '@/prisma'; import React from 'react'; import CategoryPageClientContent from '@/components/categoryPageClientComponents'; import categoryCreateUpdate from '@/lib/actions/categoryCreateUpdate'; import categoryDelete from '@/lib/actions/categoryDelete'; +import { getSession, Session } from '@auth0/nextjs-auth0'; export default async function CategoriesPage() { - const user = await getUser(); + const {user} = await getSession() as Session; const categories = await prisma.category.findMany({ where: { diff --git a/src/app/entities/page.tsx b/src/app/entities/page.tsx index e39176c..77e694d 100644 --- a/src/app/entities/page.tsx +++ b/src/app/entities/page.tsx @@ -1,13 +1,13 @@ import prisma from '@/prisma'; -import { getUser } from '@/auth'; import React from 'react'; import EntityPageClientContent from '@/components/entityPageClientComponents'; import entityCreateUpdate from '@/lib/actions/entityCreateUpdate'; import entityDelete from '@/lib/actions/entityDelete'; +import { getSession, Session } from '@auth0/nextjs-auth0'; export default async function EntitiesPage() { - const user = await getUser(); + const {user} = await getSession() as Session; const entities = await prisma.entity.findMany({ where: { diff --git a/src/app/layout.tsx b/src/app/layout.tsx index fc2e150..3c90089 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -5,6 +5,7 @@ import { cn } from '@/lib/utils'; import { Toaster } from '@/components/ui/sonner'; import React from 'react'; import Navigation from '@/components/navigation'; +import { UserProvider } from '@auth0/nextjs-auth0/client'; const inter = Inter({subsets: ['latin']}); @@ -49,6 +50,7 @@ export default function RootLayout({ href="/logo_white.png" /> +
@@ -56,6 +58,7 @@ export default function RootLayout({
+ ); } diff --git a/src/app/page.tsx b/src/app/page.tsx index 72c34da..ace7b66 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -2,8 +2,8 @@ import React from 'react'; import { Category, Entity, EntityType } from '@prisma/client'; import { Scope, ScopeType } from '@/lib/types/scope'; import prisma from '@/prisma'; -import { getUser } from '@/auth'; import DashboardPageClient from '@/components/dashboardPageClientComponents'; +import { getSession, Session } from '@auth0/nextjs-auth0'; export type CategoryNumber = { category: Category, @@ -17,17 +17,14 @@ export type EntityNumber = { export default async function DashboardPage(props: { searchParams?: { scope: ScopeType } }) { - const user = await getUser(); - if (!user) { - return; - } + const {user} = await getSession() as Session; const scope = Scope.of(props.searchParams?.scope || ScopeType.ThisMonth); // get all payments in the current scope const payments = await prisma.payment.findMany({ where: { - userId: user?.id, + userId: user.sub, date: { gte: scope.start, lte: scope.end, diff --git a/src/app/payments/page.tsx b/src/app/payments/page.tsx index f1ffa66..be795bd 100644 --- a/src/app/payments/page.tsx +++ b/src/app/payments/page.tsx @@ -1,17 +1,17 @@ -import { getUser } from '@/auth'; import prisma from '@/prisma'; import React from 'react'; import PaymentPageClientContent from '@/components/paymentPageClientComponents'; import paymentCreateUpdate from '@/lib/actions/paymentCreateUpdate'; import paymentDelete from '@/lib/actions/paymentDelete'; +import { getSession, Session } from '@auth0/nextjs-auth0'; export default async function PaymentsPage() { - const user = await getUser(); + const {user} = await getSession() as Session; const payments = await prisma.payment.findMany({ where: { - userId: user?.id, + userId: user.sub, }, orderBy: [ { @@ -25,7 +25,7 @@ export default async function PaymentsPage() { const entities = await prisma.entity.findMany({ where: { - userId: user?.id, + userId: user.sub, }, orderBy: [ { @@ -39,7 +39,7 @@ export default async function PaymentsPage() { const categories = await prisma.category.findMany({ where: { - userId: user?.id, + userId: user.sub, }, orderBy: [ { diff --git a/src/auth.ts b/src/auth.ts deleted file mode 100644 index ae752a6..0000000 --- a/src/auth.ts +++ /dev/null @@ -1,67 +0,0 @@ -import { Lucia } from 'lucia'; -import { PrismaAdapter } from '@lucia-auth/adapter-prisma'; -import { cookies } from 'next/headers'; -import prisma from '@/prisma'; - -const adapter = new PrismaAdapter(prisma.session, prisma.user); - -export const lucia = new Lucia(adapter, { - sessionCookie: { - expires: false, - attributes: { - sameSite: 'strict', - domain: process.env.NODE_ENV === 'production' ? process.env.COOKIE_DOMAIN : undefined, - secure: process.env.NODE_ENV === 'production', - }, - }, - getUserAttributes: (attributes) => { - return { - username: attributes.username, - }; - }, -}); - -declare module 'lucia' { - interface Register { - Lucia: typeof lucia; - DatabaseUserAttributes: DatabaseUserAttributes; - } -} - -interface DatabaseUserAttributes { - username: string; -} - -export function getSessionId() { - return cookies().get(lucia.sessionCookieName)?.value ?? null; -} - -export async function getSession() { - const sessionId = getSessionId(); - if (!sessionId) { - return null; - } - const {session} = await lucia.validateSession(sessionId); - return session; -} - -export async function getUser() { - const sessionId = getSessionId(); - if (!sessionId) { - return null; - } - const {user, session} = await lucia.validateSession(sessionId); - try { - if (session && session.fresh) { - const sessionCookie = lucia.createSessionCookie(session.id); - cookies().set(sessionCookie.name, sessionCookie.value, sessionCookie.attributes); - } - if (!session) { - const sessionCookie = lucia.createBlankSessionCookie(); - cookies().set(sessionCookie.name, sessionCookie.value, sessionCookie.attributes); - } - } catch { - // Next.js throws error when attempting to set cookies when rendering page - } - return user; -} diff --git a/src/components/form/serverActionTrigger.tsx b/src/components/form/serverActionTrigger.tsx index 5fe03da..7f21415 100644 --- a/src/components/form/serverActionTrigger.tsx +++ b/src/components/form/serverActionTrigger.tsx @@ -1,6 +1,6 @@ 'use client'; -import { buttonVariants } from '@/components/ui/button'; +import { Button, buttonVariants } from '@/components/ui/button'; import React from 'react'; import { Slot } from '@radix-ui/react-slot'; import { cn } from '@/lib/utils'; @@ -25,6 +25,7 @@ export interface ConfirmationDialogProps { title: string; description?: string; actionText?: string; + actionVariant?: 'default' | 'destructive' | 'outline' | 'secondary' | 'ghost' | 'link'; } export interface ButtonWithActionProps @@ -76,9 +77,11 @@ const ServerActionTrigger = React.forwardRef Cancel - - {props.dialog.actionText || 'Confirm'} - + diff --git a/src/components/form/signInForm.tsx b/src/components/form/signInForm.tsx deleted file mode 100644 index e4e96fa..0000000 --- a/src/components/form/signInForm.tsx +++ /dev/null @@ -1,71 +0,0 @@ -'use client'; - -import { zodResolver } from '@hookform/resolvers/zod'; -import { useForm } from 'react-hook-form'; -import { z } from 'zod'; -import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from '@/components/ui/form'; -import { Input } from '@/components/ui/input'; -import React from 'react'; -import { Button } from '@/components/ui/button'; -import { signInFormSchema } from '@/lib/form-schemas/signInFormSchema'; -import { ActionResponse } from '@/lib/types/actionResponse'; -import { useRouter } from 'next/navigation'; -import { toast } from 'sonner'; -import { sonnerContent } from '@/components/ui/sonner'; - -export default function SignInForm({onSubmit}: { - onSubmit: (data: z.infer) => Promise -}) { - - const router = useRouter(); - - const form = useForm>({ - resolver: zodResolver(signInFormSchema), - defaultValues: { - username: '', - password: '', - }, - }); - - const handleSubmit = async (data: z.infer) => { - const response = await onSubmit(data); - toast(sonnerContent(response)); - if (response.redirect) { - router.push(response.redirect); - } - }; - - return ( -
- - ( - - Username - - - - - - )} - /> - ( - - Password - - - - - - )} - /> - - - - ); -} diff --git a/src/components/form/signUpForm.tsx b/src/components/form/signUpForm.tsx deleted file mode 100644 index 2898733..0000000 --- a/src/components/form/signUpForm.tsx +++ /dev/null @@ -1,84 +0,0 @@ -'use client'; - -import { zodResolver } from '@hookform/resolvers/zod'; -import { useForm } from 'react-hook-form'; -import { z } from 'zod'; -import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from '@/components/ui/form'; -import { Input } from '@/components/ui/input'; -import React from 'react'; -import { Button } from '@/components/ui/button'; -import { signUpFormSchema } from '@/lib/form-schemas/signUpFormSchema'; -import { ActionResponse } from '@/lib/types/actionResponse'; -import { useRouter } from 'next/navigation'; -import { toast } from 'sonner'; -import { sonnerContent } from '@/components/ui/sonner'; - -export default function SignUpForm({onSubmit}: { - onSubmit: (data: z.infer) => Promise -}) { - - const router = useRouter(); - - const form = useForm>({ - resolver: zodResolver(signUpFormSchema), - defaultValues: { - username: '', - password: '', - }, - }); - - const handleSubmit = async (data: z.infer) => { - const response = await onSubmit(data); - toast(sonnerContent(response)); - if (response.redirect) { - router.push(response.redirect); - } - }; - - return ( -
- - ( - - Username - - - - - - )} - /> - ( - - Password - - - - - - )} - /> - ( - - Confirm password - - - - - - )} - /> - - - - ); -} diff --git a/src/lib/actions/accountDelete.ts b/src/lib/actions/accountDelete.ts deleted file mode 100644 index 952e31c..0000000 --- a/src/lib/actions/accountDelete.ts +++ /dev/null @@ -1,58 +0,0 @@ -import { ActionResponse } from '@/lib/types/actionResponse'; -import { URL_SIGN_IN } from '@/lib/constants'; -import { getUser, lucia } from '@/auth'; -import prisma from '@/prisma'; -import { cookies } from 'next/headers'; - -export default async function accountDelete(): Promise { - 'use server'; - - const user = await getUser(); - - if (!user) { - return { - type: 'error', - message: 'You aren\'t signed in.', - redirect: URL_SIGN_IN, - }; - } - - await prisma.payment.deleteMany({ - where: { - userId: user.id, - }, - }); - - await prisma.entity.deleteMany({ - where: { - userId: user.id, - }, - }); - - await prisma.category.deleteMany({ - where: { - userId: user.id, - }, - }); - - await prisma.session.deleteMany({ - where: { - userId: user.id, - }, - }); - - await prisma.user.delete({ - where: { - id: user.id, - }, - }); - - const sessionCookie = lucia.createBlankSessionCookie(); - cookies().set(sessionCookie.name, sessionCookie.value, sessionCookie.attributes); - - return { - type: 'success', - message: 'Your account was removed.', - redirect: URL_SIGN_IN, - }; -} diff --git a/src/lib/actions/categoryCreateUpdate.ts b/src/lib/actions/categoryCreateUpdate.ts index 11bdd5f..aebadc8 100644 --- a/src/lib/actions/categoryCreateUpdate.ts +++ b/src/lib/actions/categoryCreateUpdate.ts @@ -1,9 +1,9 @@ import { z } from 'zod'; import { ActionResponse } from '@/lib/types/actionResponse'; import prisma from '@/prisma'; -import { getUser } from '@/auth'; import { URL_SIGN_IN } from '@/lib/constants'; import { categoryFormSchema } from '@/lib/form-schemas/categoryFormSchema'; +import { getSession } from '@auth0/nextjs-auth0'; export default async function categoryCreateUpdate({ id, @@ -12,15 +12,15 @@ export default async function categoryCreateUpdate({ }: z.infer): Promise { 'use server'; - // check that user is logged in - const user = await getUser(); - if (!user) { + const session = await getSession(); + if (!session) { return { type: 'error', - message: 'You must be logged in to create/update an category.', + message: 'You aren\'t signed in.', redirect: URL_SIGN_IN, }; } + const user = session.user; // create/update category try { @@ -44,7 +44,7 @@ export default async function categoryCreateUpdate({ } else { await prisma.category.create({ data: { - userId: user.id, + userId: user.sub, name: name, color: color, }, diff --git a/src/lib/actions/categoryDelete.ts b/src/lib/actions/categoryDelete.ts index 8773fe3..24832ff 100644 --- a/src/lib/actions/categoryDelete.ts +++ b/src/lib/actions/categoryDelete.ts @@ -1,7 +1,7 @@ import { ActionResponse } from '@/lib/types/actionResponse'; import prisma from '@/prisma'; -import { getUser } from '@/auth'; import { URL_SIGN_IN } from '@/lib/constants'; +import { getSession } from '@auth0/nextjs-auth0'; export default async function categoryDelete(id: number): Promise { 'use server'; @@ -14,21 +14,21 @@ export default async function categoryDelete(id: number): Promise { + 'use server'; + + const session = await getSession(); + if (!session) { + return { + type: 'error', + message: 'You aren\'t signed in.', + redirect: URL_SIGN_IN, + }; + } + + await prisma.payment.deleteMany({ + where: { + userId: session.user.sub, + }, + }); + + await prisma.entity.deleteMany({ + where: { + userId: session.user.sub, + }, + }); + + await prisma.category.deleteMany({ + where: { + userId: session.user.sub, + }, + }); + + return { + type: 'success', + message: 'Your account data was cleared.', + }; +} diff --git a/src/lib/actions/entityCreateUpdate.ts b/src/lib/actions/entityCreateUpdate.ts index 465c567..d8c15fe 100644 --- a/src/lib/actions/entityCreateUpdate.ts +++ b/src/lib/actions/entityCreateUpdate.ts @@ -2,8 +2,8 @@ import { z } from 'zod'; import { ActionResponse } from '@/lib/types/actionResponse'; import { entityFormSchema } from '@/lib/form-schemas/entityFormSchema'; import prisma from '@/prisma'; -import { getUser } from '@/auth'; import { URL_SIGN_IN } from '@/lib/constants'; +import { getSession } from '@auth0/nextjs-auth0'; export default async function entityCreateUpdate({ id, @@ -13,15 +13,15 @@ export default async function entityCreateUpdate({ }: z.infer): Promise { 'use server'; - // check that user is logged in - const user = await getUser(); - if (!user) { + const session = await getSession(); + if (!session) { return { type: 'error', - message: 'You must be logged in to create/update an entity.', + message: 'You aren\'t signed in.', redirect: URL_SIGN_IN, }; } + const user = session.user; // create/update entity try { @@ -46,7 +46,7 @@ export default async function entityCreateUpdate({ } else { await prisma.entity.create({ data: { - userId: user.id, + userId: user.sub, name: name, type: type, defaultCategoryId: defaultCategoryId ?? null, diff --git a/src/lib/actions/entityDelete.ts b/src/lib/actions/entityDelete.ts index 2e0e3eb..fccc6fd 100644 --- a/src/lib/actions/entityDelete.ts +++ b/src/lib/actions/entityDelete.ts @@ -1,7 +1,7 @@ import { ActionResponse } from '@/lib/types/actionResponse'; import prisma from '@/prisma'; -import { getUser } from '@/auth'; import { URL_SIGN_IN } from '@/lib/constants'; +import { getSession } from '@auth0/nextjs-auth0'; export default async function entityDelete(id: number): Promise { 'use server'; @@ -14,21 +14,21 @@ export default async function entityDelete(id: number): Promise }; } - // check that user is logged in - const user = await getUser(); - if (!user) { + const session = await getSession(); + if (!session) { return { type: 'error', - message: 'You must be logged in to delete an entity.', + message: 'You aren\'t signed in.', redirect: URL_SIGN_IN, }; } + const user = session.user; // check that entity is associated with user const entity = await prisma.entity.findFirst({ where: { id: id, - userId: user.id, + userId: user.sub, }, }); if (!entity) { @@ -43,7 +43,7 @@ export default async function entityDelete(id: number): Promise await prisma.entity.delete({ where: { id: entity.id, - userId: user.id, + userId: user.sub, }, }, ); diff --git a/src/lib/actions/generateSampleData.ts b/src/lib/actions/generateSampleData.ts index 09ea36b..37cc53d 100644 --- a/src/lib/actions/generateSampleData.ts +++ b/src/lib/actions/generateSampleData.ts @@ -1,32 +1,32 @@ import prisma from '@/prisma'; import type { Category, Entity } from '@prisma/client'; import { EntityType } from '@prisma/client'; -import { getUser } from '@/auth'; import { URL_SIGN_IN } from '@/lib/constants'; import { ActionResponse } from '@/lib/types/actionResponse'; +import { getSession } from '@auth0/nextjs-auth0'; export default async function generateSampleData(): Promise { 'use server'; - const user = await getUser(); - - if (!user) { + const session = await getSession(); + if (!session) { return { type: 'error', - message: 'You must be logged in to create/update an category.', + message: 'You aren\'t signed in.', redirect: URL_SIGN_IN, }; } + const user = session.user; // Categories: create sample data - const categories: Category[] = await prisma.category.findMany({where: {userId: user.id}}); - if (await prisma.category.count({where: {userId: user.id}}) == 0) { + const categories: Category[] = await prisma.category.findMany({where: {userId: user.sub}}); + if (await prisma.category.count({where: {userId: user.sub}}) == 0) { console.log('Creating sample categories...'); categories.push(await prisma.category.create({ data: { - userId: user.id, + userId: user.sub, name: 'Groceries', color: '#FFBEAC', }, @@ -34,7 +34,7 @@ export default async function generateSampleData(): Promise { categories.push(await prisma.category.create({ data: { - userId: user.id, + userId: user.sub, name: 'Drugstore items', color: '#9CBCFF', }, @@ -42,7 +42,7 @@ export default async function generateSampleData(): Promise { categories.push(await prisma.category.create({ data: { - userId: user.id, + userId: user.sub, name: 'Going out', color: '#F1ADFF', }, @@ -50,7 +50,7 @@ export default async function generateSampleData(): Promise { categories.push(await prisma.category.create({ data: { - userId: user.id, + userId: user.sub, name: 'Random stuff', color: '#C1FFA9', }, @@ -58,7 +58,7 @@ export default async function generateSampleData(): Promise { categories.push(await prisma.category.create({ data: { - userId: user.id, + userId: user.sub, name: 'Salary', color: '#FFF787', }, @@ -69,14 +69,14 @@ export default async function generateSampleData(): Promise { console.log(categories); // Entities: create sample data - const entities: Entity[] = await prisma.entity.findMany({where: {userId: user.id}}); - if (await prisma.entity.count({where: {userId: user.id}}) == 0) { + const entities: Entity[] = await prisma.entity.findMany({where: {userId: user.sub}}); + if (await prisma.entity.count({where: {userId: user.sub}}) == 0) { console.log('Creating sample entities...'); entities.push(await prisma.entity.create({ data: { - userId: user.id, + userId: user.sub, name: 'Main Account', type: EntityType.Account, }, @@ -84,7 +84,7 @@ export default async function generateSampleData(): Promise { entities.push(await prisma.entity.create({ data: { - userId: user.id, + userId: user.sub, name: 'Company', type: EntityType.Entity, }, @@ -92,7 +92,7 @@ export default async function generateSampleData(): Promise { entities.push(await prisma.entity.create({ data: { - userId: user.id, + userId: user.sub, name: 'Supermarket 1', type: EntityType.Entity, }, @@ -100,7 +100,7 @@ export default async function generateSampleData(): Promise { entities.push(await prisma.entity.create({ data: { - userId: user.id, + userId: user.sub, name: 'Supermarket 2', type: EntityType.Entity, }, @@ -108,7 +108,7 @@ export default async function generateSampleData(): Promise { entities.push(await prisma.entity.create({ data: { - userId: user.id, + userId: user.sub, name: 'Supermarket 3', type: EntityType.Entity, }, @@ -116,7 +116,7 @@ export default async function generateSampleData(): Promise { entities.push(await prisma.entity.create({ data: { - userId: user.id, + userId: user.sub, name: 'Supermarket 4', type: EntityType.Entity, }, @@ -129,21 +129,24 @@ export default async function generateSampleData(): Promise { // Payments: create sample data console.log('Creating sample payments...'); - if (await prisma.payment.count({where: {userId: user.id}}) == 0) { + if (await prisma.payment.count({where: {userId: user.sub}}) == 0) { for (let i = 0; i < 4; i++) { const date = new Date(); date.setDate(1); date.setMonth(date.getMonth() - i); + const categoryId = + categories.find((it) => it.name === 'Salary')?.id!; + await prisma.payment.create({ data: { - userId: user.id, + userId: user.sub, amount: 200000, date: date, payorId: entities[1].id, payeeId: entities[0].id, - categoryId: 5, + categoryId: categoryId, createdAt: date, updatedAt: date, }, @@ -166,7 +169,7 @@ export default async function generateSampleData(): Promise { await prisma.payment.create({ data: { - userId: user.id, + userId: user.sub, amount: Math.floor( Math.random() * (maxAmount - minAmount) + minAmount), date: date, diff --git a/src/lib/actions/paymentCreateUpdate.ts b/src/lib/actions/paymentCreateUpdate.ts index 4a66d33..4c304a9 100644 --- a/src/lib/actions/paymentCreateUpdate.ts +++ b/src/lib/actions/paymentCreateUpdate.ts @@ -1,9 +1,9 @@ import { z } from 'zod'; import { ActionResponse } from '@/lib/types/actionResponse'; import prisma from '@/prisma'; -import { getUser } from '@/auth'; import { URL_SIGN_IN } from '@/lib/constants'; import { paymentFormSchema } from '@/lib/form-schemas/paymentFormSchema'; +import { getSession } from '@auth0/nextjs-auth0'; export default async function paymentCreateUpdate({ id, @@ -16,15 +16,15 @@ export default async function paymentCreateUpdate({ }: z.infer): Promise { 'use server'; - // check that user is logged in - const user = await getUser(); - if (!user) { + const session = await getSession(); + if (!session) { return { type: 'error', - message: 'You must be logged in to create/update a payment.', + message: 'You aren\'t signed in.', redirect: URL_SIGN_IN, }; } + const user = session.user; // create/update payment try { @@ -52,7 +52,7 @@ export default async function paymentCreateUpdate({ } else { await prisma.payment.create({ data: { - userId: user.id, + userId: user.sub, amount: amount, date: date, payorId: payorId, diff --git a/src/lib/actions/paymentDelete.ts b/src/lib/actions/paymentDelete.ts index a3bfd16..dab905c 100644 --- a/src/lib/actions/paymentDelete.ts +++ b/src/lib/actions/paymentDelete.ts @@ -1,7 +1,7 @@ import { ActionResponse } from '@/lib/types/actionResponse'; import prisma from '@/prisma'; -import { getUser } from '@/auth'; import { URL_SIGN_IN } from '@/lib/constants'; +import { getSession } from '@auth0/nextjs-auth0'; export default async function paymentDelete(id: number): Promise { 'use server'; @@ -14,21 +14,21 @@ export default async function paymentDelete(id: number): Promise }; } - // check that user is logged in - const user = await getUser(); - if (!user) { + const session = await getSession(); + if (!session) { return { type: 'error', - message: 'You must be logged in to delete a payment.', + message: 'You aren\'t signed in.', redirect: URL_SIGN_IN, }; } + const user = session.user; // check that payment is associated with user const payment = await prisma.payment.findFirst({ where: { id: id, - userId: user.id, + userId: user.sub, }, }); if (!payment) { @@ -43,7 +43,7 @@ export default async function paymentDelete(id: number): Promise await prisma.payment.delete({ where: { id: payment.id, - userId: user.id, + userId: user.sub, }, }, ); diff --git a/src/lib/actions/signIn.ts b/src/lib/actions/signIn.ts deleted file mode 100644 index 0e34e3d..0000000 --- a/src/lib/actions/signIn.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { z } from 'zod'; -import { Argon2id } from 'oslo/password'; -import { lucia } from '@/auth'; -import { cookies } from 'next/headers'; -import { signInFormSchema } from '@/lib/form-schemas/signInFormSchema'; -import { ActionResponse } from '@/lib/types/actionResponse'; -import { URL_HOME } from '@/lib/constants'; -import prisma from '@/prisma'; - -export default async function signIn({username, password}: z.infer): Promise { - 'use server'; - - const existingUser = await prisma.user.findFirst({ - where: { - username: username.toLowerCase(), - }, - }); - if (!existingUser) { - return { - type: 'error', - message: 'Incorrect username or password', - }; - } - - const validPassword = await new Argon2id().verify(existingUser.password, password); - if (!validPassword) { - return { - type: 'error', - message: 'Incorrect username or password', - }; - } - - const session = await lucia.createSession(existingUser.id, {}); - const sessionCookie = lucia.createSessionCookie(session.id); - cookies().set(sessionCookie.name, sessionCookie.value, sessionCookie.attributes); - return { - type: 'success', - message: 'Signed in successfully', - redirect: URL_HOME, - }; -} diff --git a/src/lib/actions/signOut.ts b/src/lib/actions/signOut.ts deleted file mode 100644 index de58559..0000000 --- a/src/lib/actions/signOut.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { getSession, lucia } from '@/auth'; -import { cookies } from 'next/headers'; -import { ActionResponse } from '@/lib/types/actionResponse'; -import { URL_SIGN_IN } from '@/lib/constants'; - -export default async function signOut(): Promise { - 'use server'; - - const session = await getSession(); - if (!session) { - return { - type: 'error', - message: 'You aren\'t signed in', - }; - } - - await lucia.invalidateSession(session.id); - - const sessionCookie = lucia.createBlankSessionCookie(); - cookies().set(sessionCookie.name, sessionCookie.value, sessionCookie.attributes); - return { - type: 'success', - message: 'Signed out successfully', - redirect: URL_SIGN_IN, - }; -} diff --git a/src/lib/actions/signUp.ts b/src/lib/actions/signUp.ts deleted file mode 100644 index d7ea888..0000000 --- a/src/lib/actions/signUp.ts +++ /dev/null @@ -1,46 +0,0 @@ -import { z } from 'zod'; -import { Argon2id } from 'oslo/password'; -import { generateId } from 'lucia'; -import { lucia } from '@/auth'; -import { cookies } from 'next/headers'; -import { signUpFormSchema } from '@/lib/form-schemas/signUpFormSchema'; -import { ActionResponse } from '@/lib/types/actionResponse'; -import { URL_HOME } from '@/lib/constants'; -import prisma from '@/prisma'; - -export default async function signUp({username, password}: z.infer): Promise { - 'use server'; - - const hashedPassword = await new Argon2id().hash(password); - const userId = generateId(15); - - const existingUser = await prisma.user.findFirst({ - where: { - username: username.toLowerCase(), - }, - }); - - if (existingUser) { - return { - type: 'error', - message: 'Username already exists', - }; - } - - await prisma.user.create({ - data: { - id: userId, - username: username, - password: hashedPassword, - }, - }); - - const session = await lucia.createSession(userId, {}); - const sessionCookie = lucia.createSessionCookie(session.id); - cookies().set(sessionCookie.name, sessionCookie.value, sessionCookie.attributes); - return { - type: 'success', - message: 'Signed up successfully', - redirect: URL_HOME, - }; -} diff --git a/src/lib/constants.ts b/src/lib/constants.ts index b7548a5..c88c2ee 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -1,7 +1,6 @@ -// auth urls -export const URL_AUTH = '/auth'; -export const URL_SIGN_IN = `${URL_AUTH}/signin`; -export const URL_SIGN_UP = `${URL_AUTH}/signup`; +export const URL_SIGN_IN = `/api/auth/login`; +export const URL_SIGN_OUT = `/api/auth/logout`; + // main urls export const URL_HOME = '/'; diff --git a/src/lib/form-schemas/signInFormSchema.ts b/src/lib/form-schemas/signInFormSchema.ts deleted file mode 100644 index 0d5f458..0000000 --- a/src/lib/form-schemas/signInFormSchema.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { z } from 'zod'; - -export const signInFormSchema = z.object({ - username: z.string().min(3).max(16), - password: z.string().min(8).max(255), -}); diff --git a/src/lib/form-schemas/signUpFormSchema.ts b/src/lib/form-schemas/signUpFormSchema.ts deleted file mode 100644 index b66d6db..0000000 --- a/src/lib/form-schemas/signUpFormSchema.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { z } from 'zod'; - -export const signUpFormSchema = z.object({ - username: z.string().min(3).max(16), - password: z.string().min(8).max(255), - confirm: z.string().min(8).max(255), -}).refine(data => data.password === data.confirm, { - message: 'Passwords do not match', - path: ['confirm'], -}); diff --git a/src/middleware.ts b/src/middleware.ts index 0f6028a..c4d94f5 100644 --- a/src/middleware.ts +++ b/src/middleware.ts @@ -1,27 +1,3 @@ -import type { NextRequest } from 'next/server'; -import { NextResponse } from 'next/server'; -import { URL_AUTH, URL_HOME, URL_SIGN_IN } from './lib/constants'; +import { withMiddlewareAuthRequired } from '@auth0/nextjs-auth0/edge'; -export async function middleware(request: NextRequest) { - - // get session id from cookies - const sessionId = request.cookies.get('auth_session')?.value ?? null; - - // redirect to home if user is already authenticated - if (request.nextUrl.pathname.startsWith(URL_AUTH) && sessionId) { - return NextResponse.redirect(new URL(URL_HOME, request.url)); - } - - // redirect to sign in if user is not authenticated - if (!request.nextUrl.pathname.startsWith(URL_AUTH) && !sessionId) { - return NextResponse.redirect(new URL(URL_SIGN_IN, request.url)); - } - - return NextResponse.next(); -} - -export const config = { - matcher: [ - '/((?!api|_next/static|_next/image|favicon.ico).*)', - ], -}; +export default withMiddlewareAuthRequired();