diff --git a/bun.lockb b/bun.lockb
index 6b051cc..0be0cfd 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/package.json b/package.json
index 8e5a339..6d347d7 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
"lint": "next lint"
},
"dependencies": {
- "@auth0/nextjs-auth0": "^3.5.0",
+ "@auth0/nextjs-auth0": "^4.1.0",
"@hookform/resolvers": "^3.9.1",
"@prisma/client": "^6.1.0",
"@radix-ui/react-alert-dialog": "^1.1.4",
diff --git a/src/app/account/page.tsx b/src/app/account/page.tsx
index fe65f5b..8a8a64e 100644
--- a/src/app/account/page.tsx
+++ b/src/app/account/page.tsx
@@ -7,12 +7,17 @@ import prisma from '@/prisma';
import { ServerActionTrigger } from '@/components/form/serverActionTrigger';
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';
+import { auth0 } from '@/lib/auth';
+import { redirect } from 'next/navigation';
export default async function AccountPage() {
- const {user} = await getSession() as Session;
+ const session = await auth0.getSession();
+ if (!session) {
+ return redirect('/auth/login');
+ }
+ const user = session.user;
let paymentCount = 0;
paymentCount = await prisma.payment.count({
diff --git a/src/app/api/auth/[auth0]/route.js b/src/app/api/auth/[auth0]/route.js
deleted file mode 100644
index 1d2e4e4..0000000
--- a/src/app/api/auth/[auth0]/route.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { handleAuth } from '@auth0/nextjs-auth0';
-
-export const GET = handleAuth();
diff --git a/src/app/categories/page.tsx b/src/app/categories/page.tsx
index e565f55..c2d9334 100644
--- a/src/app/categories/page.tsx
+++ b/src/app/categories/page.tsx
@@ -3,11 +3,16 @@ 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';
+import { auth0 } from '@/lib/auth';
+import { redirect } from 'next/navigation';
export default async function CategoriesPage() {
- const {user} = await getSession() as Session;
+ const session = await auth0.getSession();
+ if (!session) {
+ return redirect('/auth/login');
+ }
+ const user = session.user;
const categories = await prisma.category.findMany({
where: {
diff --git a/src/app/entities/page.tsx b/src/app/entities/page.tsx
index 77e694d..660390d 100644
--- a/src/app/entities/page.tsx
+++ b/src/app/entities/page.tsx
@@ -3,11 +3,16 @@ 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';
+import { auth0 } from '@/lib/auth';
+import { redirect } from 'next/navigation';
export default async function EntitiesPage() {
- const {user} = await getSession() as Session;
+ const session = await auth0.getSession();
+ if (!session) {
+ return redirect('/auth/login');
+ }
+ const user = session.user;
const entities = await prisma.entity.findMany({
where: {
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 3c90089..fc2e150 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -5,7 +5,6 @@ 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']});
@@ -50,7 +49,6 @@ export default function RootLayout({
href="/logo_white.png"
/>
</head>
- <UserProvider>
<body className={cn('dark', inter.className)}>
<Navigation/>
<main className="p-4 sm:p-8">
@@ -58,7 +56,6 @@ export default function RootLayout({
</main>
<Toaster/>
</body>
- </UserProvider>
</html>
);
}
diff --git a/src/app/page.tsx b/src/app/page.tsx
index bfdb07d..c7b710e 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -3,7 +3,8 @@ import { Category, Entity, EntityType } from '@prisma/client';
import { Scope, ScopeType } from '@/lib/types/scope';
import prisma from '@/prisma';
import DashboardPageClient from '@/components/dashboardPageClientComponents';
-import { getSession, Session } from '@auth0/nextjs-auth0';
+import { auth0 } from '@/lib/auth';
+import { redirect } from 'next/navigation';
export type CategoryNumber = {
category: Category,
@@ -17,7 +18,11 @@ export type EntityNumber = {
export default async function DashboardPage(props: { searchParams?: Promise<{ scope: ScopeType }> }) {
- const {user} = await getSession() as Session;
+ const session = await auth0.getSession();
+ if (!session) {
+ return redirect('/auth/login');
+ }
+ const user = session.user;
const scope = Scope.of((await props.searchParams)?.scope || ScopeType.ThisMonth);
diff --git a/src/app/payments/page.tsx b/src/app/payments/page.tsx
index be795bd..e34a96a 100644
--- a/src/app/payments/page.tsx
+++ b/src/app/payments/page.tsx
@@ -3,11 +3,16 @@ 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';
+import { auth0 } from '@/lib/auth';
+import { redirect } from 'next/navigation';
export default async function PaymentsPage() {
- const {user} = await getSession() as Session;
+ const session = await auth0.getSession();
+ if (!session) {
+ return redirect('/auth/login');
+ }
+ const user = session.user;
const payments = await prisma.payment.findMany({
where: {
diff --git a/src/lib/actions/categoryCreateUpdate.ts b/src/lib/actions/categoryCreateUpdate.ts
index aebadc8..0c6759d 100644
--- a/src/lib/actions/categoryCreateUpdate.ts
+++ b/src/lib/actions/categoryCreateUpdate.ts
@@ -3,7 +3,7 @@ import { ActionResponse } from '@/lib/types/actionResponse';
import prisma from '@/prisma';
import { URL_SIGN_IN } from '@/lib/constants';
import { categoryFormSchema } from '@/lib/form-schemas/categoryFormSchema';
-import { getSession } from '@auth0/nextjs-auth0';
+import { auth0 } from '@/lib/auth';
export default async function categoryCreateUpdate({
id,
@@ -12,7 +12,7 @@ export default async function categoryCreateUpdate({
}: z.infer<typeof categoryFormSchema>): Promise<ActionResponse> {
'use server';
- const session = await getSession();
+ const session = await auth0.getSession();
if (!session) {
return {
type: 'error',
diff --git a/src/lib/actions/categoryDelete.ts b/src/lib/actions/categoryDelete.ts
index ba0e9d6..0103892 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 { URL_SIGN_IN } from '@/lib/constants';
-import { getSession } from '@auth0/nextjs-auth0';
+import { auth0 } from '@/lib/auth';
export default async function categoryDelete(id: number): Promise<ActionResponse> {
'use server';
@@ -14,7 +14,7 @@ export default async function categoryDelete(id: number): Promise<ActionResponse
};
}
- const session = await getSession();
+ const session = await auth0.getSession();
if (!session) {
return {
type: 'error',
diff --git a/src/lib/actions/clearAccountData.ts b/src/lib/actions/clearAccountData.ts
index 9ee448a..778a23e 100644
--- a/src/lib/actions/clearAccountData.ts
+++ b/src/lib/actions/clearAccountData.ts
@@ -1,12 +1,12 @@
import { ActionResponse } from '@/lib/types/actionResponse';
import { URL_SIGN_IN } from '@/lib/constants';
import prisma from '@/prisma';
-import { getSession } from '@auth0/nextjs-auth0';
+import { auth0 } from '@/lib/auth';
export default async function clearAccountData(): Promise<ActionResponse> {
'use server';
- const session = await getSession();
+ const session = await auth0.getSession();
if (!session) {
return {
type: 'error',
diff --git a/src/lib/actions/entityCreateUpdate.ts b/src/lib/actions/entityCreateUpdate.ts
index d8c15fe..7739a43 100644
--- a/src/lib/actions/entityCreateUpdate.ts
+++ b/src/lib/actions/entityCreateUpdate.ts
@@ -3,7 +3,7 @@ import { ActionResponse } from '@/lib/types/actionResponse';
import { entityFormSchema } from '@/lib/form-schemas/entityFormSchema';
import prisma from '@/prisma';
import { URL_SIGN_IN } from '@/lib/constants';
-import { getSession } from '@auth0/nextjs-auth0';
+import { auth0 } from '@/lib/auth';
export default async function entityCreateUpdate({
id,
@@ -13,7 +13,7 @@ export default async function entityCreateUpdate({
}: z.infer<typeof entityFormSchema>): Promise<ActionResponse> {
'use server';
- const session = await getSession();
+ const session = await auth0.getSession();
if (!session) {
return {
type: 'error',
diff --git a/src/lib/actions/entityDelete.ts b/src/lib/actions/entityDelete.ts
index fccc6fd..aea38f1 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 { URL_SIGN_IN } from '@/lib/constants';
-import { getSession } from '@auth0/nextjs-auth0';
+import { auth0 } from '@/lib/auth';
export default async function entityDelete(id: number): Promise<ActionResponse> {
'use server';
@@ -14,7 +14,7 @@ export default async function entityDelete(id: number): Promise<ActionResponse>
};
}
- const session = await getSession();
+ const session = await auth0.getSession();
if (!session) {
return {
type: 'error',
diff --git a/src/lib/actions/generateSampleData.ts b/src/lib/actions/generateSampleData.ts
index 37cc53d..a0af523 100644
--- a/src/lib/actions/generateSampleData.ts
+++ b/src/lib/actions/generateSampleData.ts
@@ -3,12 +3,12 @@ import type { Category, Entity } from '@prisma/client';
import { EntityType } from '@prisma/client';
import { URL_SIGN_IN } from '@/lib/constants';
import { ActionResponse } from '@/lib/types/actionResponse';
-import { getSession } from '@auth0/nextjs-auth0';
+import { auth0 } from '@/lib/auth';
export default async function generateSampleData(): Promise<ActionResponse> {
'use server';
- const session = await getSession();
+ const session = await auth0.getSession();
if (!session) {
return {
type: 'error',
diff --git a/src/lib/actions/paymentCreateUpdate.ts b/src/lib/actions/paymentCreateUpdate.ts
index 4c304a9..c28285f 100644
--- a/src/lib/actions/paymentCreateUpdate.ts
+++ b/src/lib/actions/paymentCreateUpdate.ts
@@ -3,7 +3,7 @@ import { ActionResponse } from '@/lib/types/actionResponse';
import prisma from '@/prisma';
import { URL_SIGN_IN } from '@/lib/constants';
import { paymentFormSchema } from '@/lib/form-schemas/paymentFormSchema';
-import { getSession } from '@auth0/nextjs-auth0';
+import { auth0 } from '@/lib/auth';
export default async function paymentCreateUpdate({
id,
@@ -16,7 +16,7 @@ export default async function paymentCreateUpdate({
}: z.infer<typeof paymentFormSchema>): Promise<ActionResponse> {
'use server';
- const session = await getSession();
+ const session = await auth0.getSession();
if (!session) {
return {
type: 'error',
diff --git a/src/lib/actions/paymentDelete.ts b/src/lib/actions/paymentDelete.ts
index dab905c..19df372 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 { URL_SIGN_IN } from '@/lib/constants';
-import { getSession } from '@auth0/nextjs-auth0';
+import { auth0 } from '@/lib/auth';
export default async function paymentDelete(id: number): Promise<ActionResponse> {
'use server';
@@ -14,7 +14,7 @@ export default async function paymentDelete(id: number): Promise<ActionResponse>
};
}
- const session = await getSession();
+ const session = await auth0.getSession();
if (!session) {
return {
type: 'error',
diff --git a/src/lib/auth.ts b/src/lib/auth.ts
new file mode 100644
index 0000000..63457d2
--- /dev/null
+++ b/src/lib/auth.ts
@@ -0,0 +1,9 @@
+import { Auth0Client } from "@auth0/nextjs-auth0/server"
+
+export const auth0 = new Auth0Client({
+ appBaseUrl: process.env.AUTH0_BASE_URL,
+ domain: process.env.AUTH0_ISSUER_BASE_URL,
+ secret: process.env.AUTH0_SECRET,
+ clientId: process.env.AUTH0_CLIENT_ID,
+ clientSecret: process.env.AUTH0_CLIENT_SECRET,
+})
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index c88c2ee..537af23 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -1,5 +1,5 @@
-export const URL_SIGN_IN = `/api/auth/login`;
-export const URL_SIGN_OUT = `/api/auth/logout`;
+export const URL_SIGN_IN = `/auth/login`;
+export const URL_SIGN_OUT = `/auth/logout`;
// main urls
diff --git a/src/middleware.ts b/src/middleware.ts
index c4d94f5..766325e 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -1,3 +1,22 @@
-import { withMiddlewareAuthRequired } from '@auth0/nextjs-auth0/edge';
+import { NextRequest } from 'next/server';
+import { auth0 } from '@/lib/auth';
-export default withMiddlewareAuthRequired();
+export async function middleware(request: NextRequest) {
+ try {
+ return await auth0.middleware(request);
+ } catch (error) {
+ console.error("Auth0 middleware error:", error);
+ }
+}
+
+export const config = {
+ matcher: [
+ /*
+ * Match all request paths except for the ones starting with:
+ * - _next/static (static files)
+ * - _next/image (image optimization files)
+ * - favicon.ico, sitemap.xml, robots.txt (metadata files)
+ */
+ "/((?!_next/static|_next/image|favicon.ico|sitemap.xml|robots.txt).*)",
+ ],
+}