markus/finances
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases 6 Packages 1 Wiki Activity Actions

N-FIN-93: migrate the @auth0/nextjs-auth0 SDK to v4 (#94)

Browse source
This commit is contained in:
Markus Thielker 2025-03-14 13:50:01 +01:00 • committed by GitHub
commit 13fc8c1e94
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
20 changed files with 84 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
bun.lockb
View file

Binary file not shown.

2
package.json
View file

@ -18,7 +18,7 @@
"lint": "next lint" "lint": "next lint"
}, },
"dependencies": { "dependencies": {
"@auth0/nextjs-auth0": "^3.5.0", "@auth0/nextjs-auth0": "^4.1.0",
"@hookform/resolvers": "^3.9.1", "@hookform/resolvers": "^3.9.1",
"@prisma/client": "^6.1.0", "@prisma/client": "^6.1.0",
"@radix-ui/react-alert-dialog": "^1.1.4", "@radix-ui/react-alert-dialog": "^1.1.4",

9
src/app/account/page.tsx
View file

@ -7,12 +7,17 @@ import prisma from '@/prisma';
import { ServerActionTrigger } from '@/components/form/serverActionTrigger'; import { ServerActionTrigger } from '@/components/form/serverActionTrigger';
import clearAccountData from '@/lib/actions/clearAccountData'; import clearAccountData from '@/lib/actions/clearAccountData';
import { Button } from '@/components/ui/button'; import { Button } from '@/components/ui/button';
import { getSession, Session } from '@auth0/nextjs-auth0';
import { URL_SIGN_OUT } from '@/lib/constants'; import { URL_SIGN_OUT } from '@/lib/constants';
import { auth0 } from '@/lib/auth';
import { redirect } from 'next/navigation';
export default async function AccountPage() { 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; let paymentCount = 0;
paymentCount = await prisma.payment.count({ paymentCount = await prisma.payment.count({

3
src/app/api/auth/[auth0]/route.js
View file

@ -1,3 +0,0 @@
import { handleAuth } from '@auth0/nextjs-auth0';
export const GET = handleAuth();

9
src/app/categories/page.tsx
View file

@ -3,11 +3,16 @@ import React from 'react';
import CategoryPageClientContent from '@/components/categoryPageClientComponents'; import CategoryPageClientContent from '@/components/categoryPageClientComponents';
import categoryCreateUpdate from '@/lib/actions/categoryCreateUpdate'; import categoryCreateUpdate from '@/lib/actions/categoryCreateUpdate';
import categoryDelete from '@/lib/actions/categoryDelete'; 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() { 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({ const categories = await prisma.category.findMany({
where: { where: {

9
src/app/entities/page.tsx
View file

@ -3,11 +3,16 @@ import React from 'react';
import EntityPageClientContent from '@/components/entityPageClientComponents'; import EntityPageClientContent from '@/components/entityPageClientComponents';
import entityCreateUpdate from '@/lib/actions/entityCreateUpdate'; import entityCreateUpdate from '@/lib/actions/entityCreateUpdate';
import entityDelete from '@/lib/actions/entityDelete'; 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() { 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({ const entities = await prisma.entity.findMany({
where: { where: {

3
src/app/layout.tsx
View file

@ -5,7 +5,6 @@ import { cn } from '@/lib/utils';
import { Toaster } from '@/components/ui/sonner'; import { Toaster } from '@/components/ui/sonner';
import React from 'react'; import React from 'react';
import Navigation from '@/components/navigation'; import Navigation from '@/components/navigation';
import { UserProvider } from '@auth0/nextjs-auth0/client';
const inter = Inter({subsets: ['latin']}); const inter = Inter({subsets: ['latin']});
@ -50,7 +49,6 @@ export default function RootLayout({
href="/logo_white.png" href="/logo_white.png"
/> />
</head> </head>
<UserProvider>
<body className={cn('dark', inter.className)}> <body className={cn('dark', inter.className)}>
<Navigation/> <Navigation/>
<main className="p-4 sm:p-8"> <main className="p-4 sm:p-8">
@ -58,7 +56,6 @@ export default function RootLayout({
</main> </main>
<Toaster/> <Toaster/>
</body> </body>
</UserProvider>
</html> </html>
); );
} }

9
src/app/page.tsx
View file

@ -3,7 +3,8 @@ import { Category, Entity, EntityType } from '@prisma/client';
import { Scope, ScopeType } from '@/lib/types/scope'; import { Scope, ScopeType } from '@/lib/types/scope';
import prisma from '@/prisma'; import prisma from '@/prisma';
import DashboardPageClient from '@/components/dashboardPageClientComponents'; 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 = { export type CategoryNumber = {
category: Category, category: Category,
@ -17,7 +18,11 @@ export type EntityNumber = {
export default async function DashboardPage(props: { searchParams?: Promise<{ scope: ScopeType }> }) { 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); const scope = Scope.of((await props.searchParams)?.scope || ScopeType.ThisMonth);

9
src/app/payments/page.tsx
View file

@ -3,11 +3,16 @@ import React from 'react';
import PaymentPageClientContent from '@/components/paymentPageClientComponents'; import PaymentPageClientContent from '@/components/paymentPageClientComponents';
import paymentCreateUpdate from '@/lib/actions/paymentCreateUpdate'; import paymentCreateUpdate from '@/lib/actions/paymentCreateUpdate';
import paymentDelete from '@/lib/actions/paymentDelete'; 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() { 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({ const payments = await prisma.payment.findMany({
where: { where: {

4
src/lib/actions/categoryCreateUpdate.ts
View file

@ -3,7 +3,7 @@ import { ActionResponse } from '@/lib/types/actionResponse';
import prisma from '@/prisma'; import prisma from '@/prisma';
import { URL_SIGN_IN } from '@/lib/constants'; import { URL_SIGN_IN } from '@/lib/constants';
import { categoryFormSchema } from '@/lib/form-schemas/categoryFormSchema'; import { categoryFormSchema } from '@/lib/form-schemas/categoryFormSchema';
import { getSession } from '@auth0/nextjs-auth0'; import { auth0 } from '@/lib/auth';
export default async function categoryCreateUpdate({ export default async function categoryCreateUpdate({
id, id,
@ -12,7 +12,7 @@ export default async function categoryCreateUpdate({
}: z.infer<typeof categoryFormSchema>): Promise<ActionResponse> { }: z.infer<typeof categoryFormSchema>): Promise<ActionResponse> {
'use server'; 'use server';
const session = await getSession(); const session = await auth0.getSession();
if (!session) { if (!session) {
return { return {
type: 'error', type: 'error',

4
src/lib/actions/categoryDelete.ts
View file

@ -1,7 +1,7 @@
import { ActionResponse } from '@/lib/types/actionResponse'; import { ActionResponse } from '@/lib/types/actionResponse';
import prisma from '@/prisma'; import prisma from '@/prisma';
import { URL_SIGN_IN } from '@/lib/constants'; 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> { export default async function categoryDelete(id: number): Promise<ActionResponse> {
'use server'; '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) { if (!session) {
return { return {
type: 'error', type: 'error',

4
src/lib/actions/clearAccountData.ts
View file

@ -1,12 +1,12 @@
import { ActionResponse } from '@/lib/types/actionResponse'; import { ActionResponse } from '@/lib/types/actionResponse';
import { URL_SIGN_IN } from '@/lib/constants'; import { URL_SIGN_IN } from '@/lib/constants';
import prisma from '@/prisma'; import prisma from '@/prisma';
import { getSession } from '@auth0/nextjs-auth0'; import { auth0 } from '@/lib/auth';
export default async function clearAccountData(): Promise<ActionResponse> { export default async function clearAccountData(): Promise<ActionResponse> {
'use server'; 'use server';
const session = await getSession(); const session = await auth0.getSession();
if (!session) { if (!session) {
return { return {
type: 'error', type: 'error',

4
src/lib/actions/entityCreateUpdate.ts
View file

@ -3,7 +3,7 @@ import { ActionResponse } from '@/lib/types/actionResponse';
import { entityFormSchema } from '@/lib/form-schemas/entityFormSchema'; import { entityFormSchema } from '@/lib/form-schemas/entityFormSchema';
import prisma from '@/prisma'; import prisma from '@/prisma';
import { URL_SIGN_IN } from '@/lib/constants'; import { URL_SIGN_IN } from '@/lib/constants';
import { getSession } from '@auth0/nextjs-auth0'; import { auth0 } from '@/lib/auth';
export default async function entityCreateUpdate({ export default async function entityCreateUpdate({
id, id,
@ -13,7 +13,7 @@ export default async function entityCreateUpdate({
}: z.infer<typeof entityFormSchema>): Promise<ActionResponse> { }: z.infer<typeof entityFormSchema>): Promise<ActionResponse> {
'use server'; 'use server';
const session = await getSession(); const session = await auth0.getSession();
if (!session) { if (!session) {
return { return {
type: 'error', type: 'error',

4
src/lib/actions/entityDelete.ts
View file

@ -1,7 +1,7 @@
import { ActionResponse } from '@/lib/types/actionResponse'; import { ActionResponse } from '@/lib/types/actionResponse';
import prisma from '@/prisma'; import prisma from '@/prisma';
import { URL_SIGN_IN } from '@/lib/constants'; 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> { export default async function entityDelete(id: number): Promise<ActionResponse> {
'use server'; '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) { if (!session) {
return { return {
type: 'error', type: 'error',

4
src/lib/actions/generateSampleData.ts
View file

@ -3,12 +3,12 @@ import type { Category, Entity } from '@prisma/client';
import { EntityType } from '@prisma/client'; import { EntityType } from '@prisma/client';
import { URL_SIGN_IN } from '@/lib/constants'; import { URL_SIGN_IN } from '@/lib/constants';
import { ActionResponse } from '@/lib/types/actionResponse'; import { ActionResponse } from '@/lib/types/actionResponse';
import { getSession } from '@auth0/nextjs-auth0'; import { auth0 } from '@/lib/auth';
export default async function generateSampleData(): Promise<ActionResponse> { export default async function generateSampleData(): Promise<ActionResponse> {
'use server'; 'use server';
const session = await getSession(); const session = await auth0.getSession();
if (!session) { if (!session) {
return { return {
type: 'error', type: 'error',

4
src/lib/actions/paymentCreateUpdate.ts
View file

@ -3,7 +3,7 @@ import { ActionResponse } from '@/lib/types/actionResponse';
import prisma from '@/prisma'; import prisma from '@/prisma';
import { URL_SIGN_IN } from '@/lib/constants'; import { URL_SIGN_IN } from '@/lib/constants';
import { paymentFormSchema } from '@/lib/form-schemas/paymentFormSchema'; import { paymentFormSchema } from '@/lib/form-schemas/paymentFormSchema';
import { getSession } from '@auth0/nextjs-auth0'; import { auth0 } from '@/lib/auth';
export default async function paymentCreateUpdate({ export default async function paymentCreateUpdate({
id, id,
@ -16,7 +16,7 @@ export default async function paymentCreateUpdate({
}: z.infer<typeof paymentFormSchema>): Promise<ActionResponse> { }: z.infer<typeof paymentFormSchema>): Promise<ActionResponse> {
'use server'; 'use server';
const session = await getSession(); const session = await auth0.getSession();
if (!session) { if (!session) {
return { return {
type: 'error', type: 'error',

4
src/lib/actions/paymentDelete.ts
View file

@ -1,7 +1,7 @@
import { ActionResponse } from '@/lib/types/actionResponse'; import { ActionResponse } from '@/lib/types/actionResponse';
import prisma from '@/prisma'; import prisma from '@/prisma';
import { URL_SIGN_IN } from '@/lib/constants'; 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> { export default async function paymentDelete(id: number): Promise<ActionResponse> {
'use server'; '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) { if (!session) {
return { return {
type: 'error', type: 'error',

9
src/lib/auth.ts Normal file
View file

@ -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,
})

4
src/lib/constants.ts
View file

@ -1,5 +1,5 @@
export const URL_SIGN_IN = `/api/auth/login`; export const URL_SIGN_IN = `/auth/login`;
export const URL_SIGN_OUT = `/api/auth/logout`; export const URL_SIGN_OUT = `/auth/logout`;
// main urls // main urls

23
src/middleware.ts
View file

@ -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).*)",
],
}