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

N-FIN-79: refactor server actions to use auth0 session

Browse source
This commit is contained in:
Markus Thielker 2024-04-04 00:48:36 +02:00
parent c4146a36a4
commit 12c689d1d6
No known key found for this signature in database
9 changed files with 81 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/lib/actions/accountDelete.ts
View file

@ -1,58 +1,52 @@
import { ActionResponse } from '@/lib/types/actionResponse'; import { ActionResponse } from '@/lib/types/actionResponse';
import { URL_SIGN_IN } from '@/lib/constants'; import { URL_SIGN_IN, URL_SIGN_OUT } from '@/lib/constants';
import { getUser, lucia } from '@/auth';
import prisma from '@/prisma'; import prisma from '@/prisma';
import { cookies } from 'next/headers'; import { getSession } from '@auth0/nextjs-auth0';
export default async function accountDelete(): Promise<ActionResponse> { export default async function accountDelete(): Promise<ActionResponse> {
'use server'; 'use server';
const user = await getUser(); const session = await getSession();
if (!session) {
if (!user) {
return { return {
type: 'error', type: 'error',
message: 'You aren\'t signed in.', message: 'You aren\'t signed in.',
redirect: URL_SIGN_IN, redirect: URL_SIGN_IN,
}; };
} }
const user = session.user;
await prisma.payment.deleteMany({ await prisma.payment.deleteMany({
where: { where: {
userId: user.id, userId: user.sub,
}, },
}); });
await prisma.entity.deleteMany({ await prisma.entity.deleteMany({
where: { where: {
userId: user.id, userId: user.sub,
}, },
}); });
await prisma.category.deleteMany({ await prisma.category.deleteMany({
where: { where: {
userId: user.id, userId: user.sub,
}, },
}); });
await prisma.session.deleteMany({ let requestOptions = {
where: { method: 'DELETE',
userId: user.id, redirect: 'follow',
}, } as RequestInit;
});
await prisma.user.delete({ fetch(`https://login.auth0.com/api/v2/users/${user.sub}`, requestOptions)
where: { .then(response => response.text())
id: user.id, .then(result => console.log(result))
}, .catch(error => console.log('error', error));
});
const sessionCookie = lucia.createBlankSessionCookie();
cookies().set(sessionCookie.name, sessionCookie.value, sessionCookie.attributes);
return { return {
type: 'success', type: 'success',
message: 'Your account was removed.', message: 'Your account was removed.',
redirect: URL_SIGN_IN, redirect: URL_SIGN_OUT,
}; };
} }

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

@ -1,9 +1,9 @@
import { z } from 'zod'; import { z } from 'zod';
import { ActionResponse } from '@/lib/types/actionResponse'; import { ActionResponse } from '@/lib/types/actionResponse';
import prisma from '@/prisma'; import prisma from '@/prisma';
import { getUser } from '@/auth';
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';
export default async function categoryCreateUpdate({ export default async function categoryCreateUpdate({
id, id,
@ -12,15 +12,15 @@ export default async function categoryCreateUpdate({
}: z.infer<typeof categoryFormSchema>): Promise<ActionResponse> { }: z.infer<typeof categoryFormSchema>): Promise<ActionResponse> {
'use server'; 'use server';
// check that user is logged in const session = await getSession();
const user = await getUser(); if (!session) {
if (!user) {
return { return {
type: 'error', type: 'error',
message: 'You must be logged in to create/update an category.', message: 'You aren\'t signed in.',
redirect: URL_SIGN_IN, redirect: URL_SIGN_IN,
}; };
} }
const user = session.user;
// create/update category // create/update category
try { try {
@ -44,7 +44,7 @@ export default async function categoryCreateUpdate({
} else { } else {
await prisma.category.create({ await prisma.category.create({
data: { data: {
userId: user.id, userId: user.sub,
name: name, name: name,
color: color, color: color,
}, },

14
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 { getUser } from '@/auth';
import { URL_SIGN_IN } from '@/lib/constants'; import { URL_SIGN_IN } from '@/lib/constants';
import { getSession } from '@auth0/nextjs-auth0';
export default async function categoryDelete(id: number): Promise<ActionResponse> { export default async function categoryDelete(id: number): Promise<ActionResponse> {
'use server'; 'use server';
@ -14,21 +14,21 @@ export default async function categoryDelete(id: number): Promise<ActionResponse
}; };
} }
// check that user is logged in const session = await getSession();
const user = await getUser(); if (!session) {
if (!user) {
return { return {
type: 'error', type: 'error',
message: 'You must be logged in to delete an category.', message: 'You aren\'t signed in.',
redirect: URL_SIGN_IN, redirect: URL_SIGN_IN,
}; };
} }
const user = session.user;
// check that category is associated with user // check that category is associated with user
const category = await prisma.category.findFirst({ const category = await prisma.category.findFirst({
where: { where: {
id: id, id: id,
userId: user.id, userId: user.sub,
}, },
}); });
if (!category) { if (!category) {
@ -43,7 +43,7 @@ export default async function categoryDelete(id: number): Promise<ActionResponse
await prisma.category.delete({ await prisma.category.delete({
where: { where: {
id: category.id, id: category.id,
userId: user.id, userId: user.sub,
}, },
}, },
); );

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

@ -2,8 +2,8 @@ import { z } from 'zod';
import { ActionResponse } from '@/lib/types/actionResponse'; 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 { getUser } from '@/auth';
import { URL_SIGN_IN } from '@/lib/constants'; import { URL_SIGN_IN } from '@/lib/constants';
import { getSession } from '@auth0/nextjs-auth0';
export default async function entityCreateUpdate({ export default async function entityCreateUpdate({
id, id,
@ -13,15 +13,15 @@ export default async function entityCreateUpdate({
}: z.infer<typeof entityFormSchema>): Promise<ActionResponse> { }: z.infer<typeof entityFormSchema>): Promise<ActionResponse> {
'use server'; 'use server';
// check that user is logged in const session = await getSession();
const user = await getUser(); if (!session) {
if (!user) {
return { return {
type: 'error', type: 'error',
message: 'You must be logged in to create/update an entity.', message: 'You aren\'t signed in.',
redirect: URL_SIGN_IN, redirect: URL_SIGN_IN,
}; };
} }
const user = session.user;
// create/update entity // create/update entity
try { try {
@ -46,7 +46,7 @@ export default async function entityCreateUpdate({
} else { } else {
await prisma.entity.create({ await prisma.entity.create({
data: { data: {
userId: user.id, userId: user.sub,
name: name, name: name,
type: type, type: type,
defaultCategoryId: defaultCategoryId ?? null, defaultCategoryId: defaultCategoryId ?? null,

14
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 { getUser } from '@/auth';
import { URL_SIGN_IN } from '@/lib/constants'; import { URL_SIGN_IN } from '@/lib/constants';
import { getSession } from '@auth0/nextjs-auth0';
export default async function entityDelete(id: number): Promise<ActionResponse> { export default async function entityDelete(id: number): Promise<ActionResponse> {
'use server'; 'use server';
@ -14,21 +14,21 @@ export default async function entityDelete(id: number): Promise<ActionResponse>
}; };
} }
// check that user is logged in const session = await getSession();
const user = await getUser(); if (!session) {
if (!user) {
return { return {
type: 'error', type: 'error',
message: 'You must be logged in to delete an entity.', message: 'You aren\'t signed in.',
redirect: URL_SIGN_IN, redirect: URL_SIGN_IN,
}; };
} }
const user = session.user;
// check that entity is associated with user // check that entity is associated with user
const entity = await prisma.entity.findFirst({ const entity = await prisma.entity.findFirst({
where: { where: {
id: id, id: id,
userId: user.id, userId: user.sub,
}, },
}); });
if (!entity) { if (!entity) {
@ -43,7 +43,7 @@ export default async function entityDelete(id: number): Promise<ActionResponse>
await prisma.entity.delete({ await prisma.entity.delete({
where: { where: {
id: entity.id, id: entity.id,
userId: user.id, userId: user.sub,
}, },
}, },
); );

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

@ -1,32 +1,32 @@
import prisma from '@/prisma'; import prisma from '@/prisma';
import type { Category, Entity } from '@prisma/client'; import type { Category, Entity } from '@prisma/client';
import { EntityType } from '@prisma/client'; import { EntityType } from '@prisma/client';
import { getUser } from '@/auth';
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';
export default async function generateSampleData(): Promise<ActionResponse> { export default async function generateSampleData(): Promise<ActionResponse> {
'use server'; 'use server';
const user = await getUser(); const session = await getSession();
if (!session) {
if (!user) {
return { return {
type: 'error', type: 'error',
message: 'You must be logged in to create/update an category.', message: 'You aren\'t signed in.',
redirect: URL_SIGN_IN, redirect: URL_SIGN_IN,
}; };
} }
const user = session.user;
// Categories: create sample data // Categories: create sample data
const categories: Category[] = await prisma.category.findMany({where: {userId: user.id}}); const categories: Category[] = await prisma.category.findMany({where: {userId: user.sub}});
if (await prisma.category.count({where: {userId: user.id}}) == 0) { if (await prisma.category.count({where: {userId: user.sub}}) == 0) {
console.log('Creating sample categories...'); console.log('Creating sample categories...');
categories.push(await prisma.category.create({ categories.push(await prisma.category.create({
data: { data: {
userId: user.id, userId: user.sub,
name: 'Groceries', name: 'Groceries',
color: '#FFBEAC', color: '#FFBEAC',
}, },
@ -34,7 +34,7 @@ export default async function generateSampleData(): Promise<ActionResponse> {
categories.push(await prisma.category.create({ categories.push(await prisma.category.create({
data: { data: {
userId: user.id, userId: user.sub,
name: 'Drugstore items', name: 'Drugstore items',
color: '#9CBCFF', color: '#9CBCFF',
}, },
@ -42,7 +42,7 @@ export default async function generateSampleData(): Promise<ActionResponse> {
categories.push(await prisma.category.create({ categories.push(await prisma.category.create({
data: { data: {
userId: user.id, userId: user.sub,
name: 'Going out', name: 'Going out',
color: '#F1ADFF', color: '#F1ADFF',
}, },
@ -50,7 +50,7 @@ export default async function generateSampleData(): Promise<ActionResponse> {
categories.push(await prisma.category.create({ categories.push(await prisma.category.create({
data: { data: {
userId: user.id, userId: user.sub,
name: 'Random stuff', name: 'Random stuff',
color: '#C1FFA9', color: '#C1FFA9',
}, },
@ -58,7 +58,7 @@ export default async function generateSampleData(): Promise<ActionResponse> {
categories.push(await prisma.category.create({ categories.push(await prisma.category.create({
data: { data: {
userId: user.id, userId: user.sub,
name: 'Salary', name: 'Salary',
color: '#FFF787', color: '#FFF787',
}, },
@ -69,14 +69,14 @@ export default async function generateSampleData(): Promise<ActionResponse> {
console.log(categories); console.log(categories);
// Entities: create sample data // Entities: create sample data
const entities: Entity[] = await prisma.entity.findMany({where: {userId: user.id}}); const entities: Entity[] = await prisma.entity.findMany({where: {userId: user.sub}});
if (await prisma.entity.count({where: {userId: user.id}}) == 0) { if (await prisma.entity.count({where: {userId: user.sub}}) == 0) {
console.log('Creating sample entities...'); console.log('Creating sample entities...');
entities.push(await prisma.entity.create({ entities.push(await prisma.entity.create({
data: { data: {
userId: user.id, userId: user.sub,
name: 'Main Account', name: 'Main Account',
type: EntityType.Account, type: EntityType.Account,
}, },
@ -84,7 +84,7 @@ export default async function generateSampleData(): Promise<ActionResponse> {
entities.push(await prisma.entity.create({ entities.push(await prisma.entity.create({
data: { data: {
userId: user.id, userId: user.sub,
name: 'Company', name: 'Company',
type: EntityType.Entity, type: EntityType.Entity,
}, },
@ -92,7 +92,7 @@ export default async function generateSampleData(): Promise<ActionResponse> {
entities.push(await prisma.entity.create({ entities.push(await prisma.entity.create({
data: { data: {
userId: user.id, userId: user.sub,
name: 'Supermarket 1', name: 'Supermarket 1',
type: EntityType.Entity, type: EntityType.Entity,
}, },
@ -100,7 +100,7 @@ export default async function generateSampleData(): Promise<ActionResponse> {
entities.push(await prisma.entity.create({ entities.push(await prisma.entity.create({
data: { data: {
userId: user.id, userId: user.sub,
name: 'Supermarket 2', name: 'Supermarket 2',
type: EntityType.Entity, type: EntityType.Entity,
}, },
@ -108,7 +108,7 @@ export default async function generateSampleData(): Promise<ActionResponse> {
entities.push(await prisma.entity.create({ entities.push(await prisma.entity.create({
data: { data: {
userId: user.id, userId: user.sub,
name: 'Supermarket 3', name: 'Supermarket 3',
type: EntityType.Entity, type: EntityType.Entity,
}, },
@ -116,7 +116,7 @@ export default async function generateSampleData(): Promise<ActionResponse> {
entities.push(await prisma.entity.create({ entities.push(await prisma.entity.create({
data: { data: {
userId: user.id, userId: user.sub,
name: 'Supermarket 4', name: 'Supermarket 4',
type: EntityType.Entity, type: EntityType.Entity,
}, },
@ -129,7 +129,7 @@ export default async function generateSampleData(): Promise<ActionResponse> {
// Payments: create sample data // Payments: create sample data
console.log('Creating sample payments...'); 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++) { for (let i = 0; i < 4; i++) {
const date = new Date(); const date = new Date();
@ -138,7 +138,7 @@ export default async function generateSampleData(): Promise<ActionResponse> {
await prisma.payment.create({ await prisma.payment.create({
data: { data: {
userId: user.id, userId: user.sub,
amount: 200000, amount: 200000,
date: date, date: date,
payorId: entities[1].id, payorId: entities[1].id,
@ -166,7 +166,7 @@ export default async function generateSampleData(): Promise<ActionResponse> {
await prisma.payment.create({ await prisma.payment.create({
data: { data: {
userId: user.id, userId: user.sub,
amount: Math.floor( amount: Math.floor(
Math.random() * (maxAmount - minAmount) + minAmount), Math.random() * (maxAmount - minAmount) + minAmount),
date: date, date: date,

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

@ -1,9 +1,9 @@
import { z } from 'zod'; import { z } from 'zod';
import { ActionResponse } from '@/lib/types/actionResponse'; import { ActionResponse } from '@/lib/types/actionResponse';
import prisma from '@/prisma'; import prisma from '@/prisma';
import { getUser } from '@/auth';
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';
export default async function paymentCreateUpdate({ export default async function paymentCreateUpdate({
id, id,
@ -16,15 +16,15 @@ export default async function paymentCreateUpdate({
}: z.infer<typeof paymentFormSchema>): Promise<ActionResponse> { }: z.infer<typeof paymentFormSchema>): Promise<ActionResponse> {
'use server'; 'use server';
// check that user is logged in const session = await getSession();
const user = await getUser(); if (!session) {
if (!user) {
return { return {
type: 'error', type: 'error',
message: 'You must be logged in to create/update a payment.', message: 'You aren\'t signed in.',
redirect: URL_SIGN_IN, redirect: URL_SIGN_IN,
}; };
} }
const user = session.user;
// create/update payment // create/update payment
try { try {
@ -52,7 +52,7 @@ export default async function paymentCreateUpdate({
} else { } else {
await prisma.payment.create({ await prisma.payment.create({
data: { data: {
userId: user.id, userId: user.sub,
amount: amount, amount: amount,
date: date, date: date,
payorId: payorId, payorId: payorId,

14
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 { getUser } from '@/auth';
import { URL_SIGN_IN } from '@/lib/constants'; import { URL_SIGN_IN } from '@/lib/constants';
import { getSession } from '@auth0/nextjs-auth0';
export default async function paymentDelete(id: number): Promise<ActionResponse> { export default async function paymentDelete(id: number): Promise<ActionResponse> {
'use server'; 'use server';
@ -14,21 +14,21 @@ export default async function paymentDelete(id: number): Promise<ActionResponse>
}; };
} }
// check that user is logged in const session = await getSession();
const user = await getUser(); if (!session) {
if (!user) {
return { return {
type: 'error', type: 'error',
message: 'You must be logged in to delete a payment.', message: 'You aren\'t signed in.',
redirect: URL_SIGN_IN, redirect: URL_SIGN_IN,
}; };
} }
const user = session.user;
// check that payment is associated with user // check that payment is associated with user
const payment = await prisma.payment.findFirst({ const payment = await prisma.payment.findFirst({
where: { where: {
id: id, id: id,
userId: user.id, userId: user.sub,
}, },
}); });
if (!payment) { if (!payment) {
@ -43,7 +43,7 @@ export default async function paymentDelete(id: number): Promise<ActionResponse>
await prisma.payment.delete({ await prisma.payment.delete({
where: { where: {
id: payment.id, id: payment.id,
userId: user.id, userId: user.sub,
}, },
}, },
); );

2
src/lib/constants.ts
View file

@ -1,4 +1,6 @@
export const URL_SIGN_IN = `/api/auth/login`; export const URL_SIGN_IN = `/api/auth/login`;
export const URL_SIGN_OUT = `/api/auth/logout`;
// main urls // main urls
export const URL_HOME = '/'; export const URL_HOME = '/';