feat: images upload
This commit is contained in:
@@ -0,0 +1,12 @@
|
||||
export type ActionResult<T = void> =
|
||||
| { success: true; data: T }
|
||||
| { success: false; error: string; fieldErrors?: Record<string, string[]> };
|
||||
|
||||
|
||||
export class AppError extends Error {
|
||||
fieldErrors?: Record<string, string[]>;
|
||||
constructor(message: string, fieldErrors?: Record<string, string[]>) {
|
||||
super(message);
|
||||
this.fieldErrors = fieldErrors;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
export function formatEuAddress(street: string, city: string, regionName: string): string {
|
||||
return `${street}, ${city}, ${regionName}, EU`;
|
||||
}
|
||||
|
||||
export function formatAddress(options: {
|
||||
isEuResident: boolean;
|
||||
street?: string | null;
|
||||
city?: string | null;
|
||||
regionName?: string | null;
|
||||
customAddress?: string | null;
|
||||
}): string {
|
||||
const { isEuResident, street, city, regionName, customAddress } = options;
|
||||
|
||||
if (isEuResident && street && city && regionName) {
|
||||
return formatEuAddress(street, city, regionName);
|
||||
}
|
||||
|
||||
return customAddress ?? "";
|
||||
}
|
||||
+147
-110
@@ -1,16 +1,17 @@
|
||||
"use server";
|
||||
|
||||
import { getCurrentUser } from "@/lib/user";
|
||||
import { redirect } from "next/navigation";
|
||||
import { revalidatePath } from "next/cache";
|
||||
import { redirect } from "next/navigation";
|
||||
import { requireUser, requireAdmin } from "@/lib/user/require";
|
||||
import { runAction, isPrismaError } from "@/lib/run-action";
|
||||
import { AppError, type ActionResult } from "@/lib/action-result";
|
||||
import { formAction } from "@/lib/form-action";
|
||||
import { citizenshipApplicationSchema } from "./validation";
|
||||
import { createApplication } from "./repository";
|
||||
import { createApplication, getActiveCitizenship, getApplicationEligibility } from "./repository";
|
||||
import { prisma } from "../prisma";
|
||||
|
||||
export type ApplicationState = {
|
||||
success: boolean;
|
||||
errors: string[];
|
||||
};
|
||||
import { formatAddress } from "@/lib/address";
|
||||
import { Prisma } from "@/lib/generated/prisma/client";
|
||||
import { uploadImage } from "../image";
|
||||
|
||||
function generateDocumentNumber(): string {
|
||||
const letter = () => String.fromCharCode(65 + Math.floor(Math.random() * 26));
|
||||
@@ -18,117 +19,153 @@ function generateDocumentNumber(): string {
|
||||
return `${letter()}${digits}${letter()}`;
|
||||
}
|
||||
|
||||
export async function submitCitizenshipApplication(
|
||||
_prevState: ApplicationState,
|
||||
formData: FormData
|
||||
): Promise<ApplicationState> {
|
||||
const user = await getCurrentUser();
|
||||
if (!user) redirect("/");
|
||||
|
||||
const applicationType = formData.get("applicationType") as string;
|
||||
const isEuResident = formData.get("isEuResident") as string;
|
||||
|
||||
const raw: Record<string, string> = {
|
||||
applicationType,
|
||||
height: (formData.get("height") as string) ?? "",
|
||||
eyeColor: (formData.get("eyeColor") as string) ?? "",
|
||||
isEuResident,
|
||||
regionId: (formData.get("regionId") as string) ?? "",
|
||||
city: (formData.get("city") as string) ?? "",
|
||||
street: (formData.get("street") as string) ?? "",
|
||||
customAddress: (formData.get("customAddress") as string) ?? "",
|
||||
};
|
||||
|
||||
if (applicationType === "PREVIOUS_CITIZENSHIP") {
|
||||
raw.previousCountry = (formData.get("previousCountry") as string) ?? "";
|
||||
raw.previousRegion = (formData.get("previousRegion") as string) ?? "";
|
||||
} else if (applicationType === "NATURALIZATION") {
|
||||
raw.naturalizationReason = (formData.get("naturalizationReason") as string) ?? "";
|
||||
async function createIdentityDocument(
|
||||
tx: Prisma.TransactionClient,
|
||||
data: {
|
||||
citizenshipId: string;
|
||||
address: string;
|
||||
regionId: string | null;
|
||||
city: string | null;
|
||||
street: string | null;
|
||||
customAddress: string | null;
|
||||
issuedAt: Date;
|
||||
expiresAt: Date;
|
||||
}
|
||||
|
||||
const parsed = citizenshipApplicationSchema.safeParse(raw);
|
||||
if (!parsed.success) {
|
||||
const fieldErrors = parsed.error.flatten().fieldErrors ?? {};
|
||||
const messages = Object.values(fieldErrors).flat().filter(Boolean);
|
||||
return { success: false, errors: messages };
|
||||
) {
|
||||
const maxAttempts = 5;
|
||||
for (let attempt = 0; attempt < maxAttempts; attempt++) {
|
||||
try {
|
||||
return await tx.identityDocument.create({ data: { ...data, documentNumber: generateDocumentNumber() } });
|
||||
} catch (error) {
|
||||
if (!isPrismaError(error, "P2002") || attempt === maxAttempts - 1) throw error;
|
||||
}
|
||||
}
|
||||
|
||||
const { isEuResident: _, regionId, city, street, customAddress, ...applicationData } = parsed.data;
|
||||
|
||||
const address = _ === "yes"
|
||||
? `${street}, ${city}, ${regionId}, EU`
|
||||
: customAddress!;
|
||||
|
||||
await createApplication(user.id, {
|
||||
surname: user.secondName,
|
||||
givenNames: user.firstName,
|
||||
sex: user.sex,
|
||||
birthDate: user.birthDate ?? new Date(),
|
||||
...applicationData,
|
||||
address,
|
||||
regionId: _ === "yes" ? regionId : null,
|
||||
city: _ === "yes" ? city : null,
|
||||
street: _ === "yes" ? street : null,
|
||||
customAddress: _ === "yes" ? null : customAddress,
|
||||
});
|
||||
|
||||
revalidatePath("/account/citizenship");
|
||||
return { success: true, errors: [] };
|
||||
throw new Error("Failed to generate a unique document number");
|
||||
}
|
||||
|
||||
export async function approveApplication(id: string) {
|
||||
const user = await getCurrentUser();
|
||||
if (!user) redirect("/");
|
||||
export const submitCitizenshipApplication = formAction(citizenshipApplicationSchema,
|
||||
async (data) => {
|
||||
const user = await requireUser();
|
||||
|
||||
const application = await prisma.citizenshipApplication.update({
|
||||
where: { id },
|
||||
data: {
|
||||
status: "APPROVED",
|
||||
reviewedAt: new Date(),
|
||||
reviewedBy: user.id,
|
||||
},
|
||||
const eligibility = await getApplicationEligibility(user.id, user.birthDate);
|
||||
if (!eligibility.eligible) throw new AppError(eligibility.reason!);
|
||||
|
||||
const isEuResidentYes = data.isEuResident === "yes";
|
||||
const { profile, signature, isEuResident, ...applicationData } = data;
|
||||
let regionName: string | null = null;
|
||||
|
||||
if (isEuResidentYes) {
|
||||
const region = await prisma.region.findUnique({ where: { id: data.regionId } });
|
||||
if (!region) {
|
||||
throw new AppError("Selected region is invalid.", { regionId: ["Selected region is invalid."] });
|
||||
}
|
||||
regionName = region.name;
|
||||
}
|
||||
|
||||
const address = formatAddress({
|
||||
isEuResident: isEuResidentYes,
|
||||
street: data.street,
|
||||
city: data.city,
|
||||
regionName,
|
||||
customAddress: data.customAddress,
|
||||
});
|
||||
|
||||
const profileKey = await uploadImage(profile, "citizenship/profiles");
|
||||
const signatureKey = await uploadImage(signature, "citizenship/signatures");
|
||||
|
||||
await createApplication(user.id, {
|
||||
surname: user.secondName,
|
||||
givenNames: user.firstName,
|
||||
sex: user.sex,
|
||||
birthDate: user.birthDate!,
|
||||
...applicationData,
|
||||
address,
|
||||
regionId: isEuResidentYes ? data.regionId! : null,
|
||||
city: isEuResidentYes ? data.city! : null,
|
||||
street: isEuResidentYes ? data.street! : null,
|
||||
customAddress: isEuResidentYes ? null : data.customAddress!,
|
||||
profileKey,
|
||||
signatureKey
|
||||
});
|
||||
|
||||
revalidatePath("/account/citizenship");
|
||||
redirect("/account/citizenship");
|
||||
}
|
||||
);
|
||||
|
||||
export async function approveApplication(id: string): Promise<ActionResult> {
|
||||
return runAction(async () => {
|
||||
const user = await requireAdmin();
|
||||
|
||||
const application = await prisma.citizenshipApplication.findUnique({ where: { id } });
|
||||
if (!application) throw new AppError("Application not found.");
|
||||
if (application.status !== "PENDING") throw new AppError("This application is no longer pending review.");
|
||||
if (application.userId === user.id) throw new AppError("You cannot approve your own application.");
|
||||
|
||||
const existingCitizenship = await prisma.citizenship.findUnique({ where: { userId: application.userId } });
|
||||
if (existingCitizenship && !existingCitizenship.revokedAt) {
|
||||
throw new AppError("This applicant is already a citizen.");
|
||||
}
|
||||
|
||||
const now = new Date();
|
||||
const expiresAt = new Date(now);
|
||||
expiresAt.setFullYear(expiresAt.getFullYear() + 10);
|
||||
|
||||
await prisma.$transaction(async (tx) => {
|
||||
await tx.citizenshipApplication.update({
|
||||
where: { id, status: "PENDING" },
|
||||
data: { status: "APPROVED", reviewedAt: now, reviewedBy: user.id },
|
||||
});
|
||||
|
||||
const citizenship = await tx.citizenship.create({
|
||||
data: { userId: application.userId, applicationId: application.id },
|
||||
});
|
||||
|
||||
await createIdentityDocument(tx, {
|
||||
citizenshipId: citizenship.id,
|
||||
address: application.address,
|
||||
regionId: application.regionId,
|
||||
city: application.city,
|
||||
street: application.street,
|
||||
customAddress: application.customAddress,
|
||||
issuedAt: now,
|
||||
expiresAt,
|
||||
});
|
||||
});
|
||||
|
||||
revalidatePath("/account/citizenship/review");
|
||||
});
|
||||
|
||||
const citizenship = await prisma.citizenship.create({
|
||||
data: {
|
||||
userId: application.userId,
|
||||
applicationId: application.id,
|
||||
},
|
||||
});
|
||||
|
||||
const now = new Date();
|
||||
const expiresAt = new Date(now);
|
||||
expiresAt.setFullYear(expiresAt.getFullYear() + 10);
|
||||
|
||||
await prisma.identityDocument.create({
|
||||
data: {
|
||||
citizenshipId: citizenship.id,
|
||||
documentNumber: generateDocumentNumber(),
|
||||
regionId: application.regionId,
|
||||
city: application.city,
|
||||
street: application.street,
|
||||
customAddress: application.customAddress,
|
||||
issuedAt: now,
|
||||
expiresAt,
|
||||
},
|
||||
});
|
||||
|
||||
revalidatePath("/account/citizenship/review");
|
||||
}
|
||||
|
||||
export async function rejectApplication(id: string, reason: string) {
|
||||
const user = await getCurrentUser();
|
||||
if (!user) redirect("/");
|
||||
export async function rejectApplication(id: string, reason: string): Promise<ActionResult> {
|
||||
return runAction(async () => {
|
||||
const user = await requireAdmin();
|
||||
|
||||
await prisma.citizenshipApplication.update({
|
||||
where: { id },
|
||||
data: {
|
||||
status: "REJECTED",
|
||||
rejectionReason: reason,
|
||||
reviewedAt: new Date(),
|
||||
reviewedBy: user.id,
|
||||
},
|
||||
const application = await prisma.citizenshipApplication.findUnique({ where: { id } });
|
||||
if (!application) throw new AppError("Application not found.");
|
||||
if (application.status !== "PENDING") throw new AppError("This application is no longer pending review.");
|
||||
if (application.userId === user.id) throw new AppError("You cannot reject your own application.");
|
||||
|
||||
const trimmedReason = reason.trim();
|
||||
if (!trimmedReason) throw new AppError("A rejection reason is required.");
|
||||
|
||||
await prisma.citizenshipApplication.update({
|
||||
where: { id, status: "PENDING" },
|
||||
data: { status: "REJECTED", rejectionReason: trimmedReason, reviewedAt: new Date(), reviewedBy: user.id },
|
||||
});
|
||||
|
||||
revalidatePath("/account/citizenship/review");
|
||||
});
|
||||
}
|
||||
|
||||
revalidatePath("/account/citizenship/review");
|
||||
export async function renounceCitizenship(): Promise<ActionResult> {
|
||||
return runAction(async () => {
|
||||
const user = await requireUser();
|
||||
|
||||
const citizenship = await getActiveCitizenship(user.id);
|
||||
if (!citizenship) throw new AppError("Citizenship not found.");
|
||||
|
||||
await prisma.citizenship.update({ where: { id: citizenship.id }, data: { revokedAt: new Date() } });
|
||||
revalidatePath("/account/citizenship");
|
||||
});
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
import { prisma } from "@/lib/prisma";
|
||||
import type { ApplicationType } from "./types";
|
||||
import type { ApplicationType, EyeColor } from "./types";
|
||||
|
||||
type CreateData = {
|
||||
surname: string;
|
||||
@@ -9,17 +9,58 @@ type CreateData = {
|
||||
applicationType: ApplicationType;
|
||||
previousCountry?: string | null;
|
||||
previousRegion?: string | null;
|
||||
birthRegion?: string | null;
|
||||
naturalizationReason?: string | null;
|
||||
address: string;
|
||||
regionId?: string | null;
|
||||
city?: string | null;
|
||||
street?: string | null;
|
||||
customAddress?: string | null;
|
||||
height: string;
|
||||
eyeColor: string;
|
||||
height: number;
|
||||
eyeColor: EyeColor;
|
||||
profileKey: string;
|
||||
signatureKey: string;
|
||||
};
|
||||
|
||||
export type ApplicationEligibility = {
|
||||
eligible: boolean;
|
||||
reason: string | null;
|
||||
};
|
||||
|
||||
export async function getApplicationEligibility(
|
||||
userId: string,
|
||||
birthDate: Date | null | undefined
|
||||
): Promise<ApplicationEligibility> {
|
||||
if (!birthDate) {
|
||||
return {
|
||||
eligible: false,
|
||||
reason:
|
||||
"Date of birth is required. Update your profile in Kotosoft ID and synchronise your account.",
|
||||
};
|
||||
}
|
||||
|
||||
const citizenship = await prisma.citizenship.findUnique({ where: { userId } });
|
||||
if (citizenship && !citizenship.revokedAt) {
|
||||
return {
|
||||
eligible: false,
|
||||
reason: "You are already a citizen of the European Federation.",
|
||||
};
|
||||
}
|
||||
|
||||
const applications = await prisma.citizenshipApplication.findMany({
|
||||
where: { userId },
|
||||
select: { status: true },
|
||||
});
|
||||
|
||||
if (applications.some((application) => application.status === "PENDING")) {
|
||||
return {
|
||||
eligible: false,
|
||||
reason: "You already have a pending application.",
|
||||
};
|
||||
}
|
||||
|
||||
return { eligible: true, reason: null };
|
||||
}
|
||||
|
||||
export async function createApplication(userId: string, data: CreateData) {
|
||||
return prisma.citizenshipApplication.create({
|
||||
data: {
|
||||
@@ -40,10 +81,26 @@ export async function getPendingApplications() {
|
||||
return prisma.citizenshipApplication.findMany({
|
||||
where: { status: "PENDING" },
|
||||
orderBy: { createdAt: "desc" },
|
||||
include: { user: true },
|
||||
})
|
||||
include: {
|
||||
user: {
|
||||
include: {
|
||||
_count: {
|
||||
select: {
|
||||
citizenships: true,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
export async function getPendingApplicationsCount(): Promise<number> {
|
||||
return prisma.citizenshipApplication.count({ where: { status: "PENDING" } })
|
||||
}
|
||||
return prisma.citizenshipApplication.count({ where: { status: "PENDING" } });
|
||||
}
|
||||
|
||||
export async function getActiveCitizenship(userId: string) {
|
||||
const citizenship = await prisma.citizenship.findUnique({ where: { userId } });
|
||||
if (!citizenship || citizenship.revokedAt) return null;
|
||||
return citizenship;
|
||||
}
|
||||
|
||||
@@ -26,16 +26,23 @@ export type CitizenshipApplication = {
|
||||
previousRegion: string | null;
|
||||
naturalizationReason: string | null;
|
||||
address: string;
|
||||
height: string;
|
||||
eyeColor: string;
|
||||
height: number;
|
||||
eyeColor: EyeColor;
|
||||
status: CitizenshipApplicationStatus;
|
||||
rejectionReason: string | null;
|
||||
reviewedAt: Date | null;
|
||||
reviewedBy: string | null;
|
||||
createdAt: Date;
|
||||
updatedAt: Date;
|
||||
profileKey: string;
|
||||
signatureKey: string;
|
||||
profile: File;
|
||||
signature: File;
|
||||
};
|
||||
|
||||
export type CitizenshipApplicationWithWarning = CitizenshipApplication & {
|
||||
nameMismatch: boolean
|
||||
}
|
||||
nameMismatch: boolean;
|
||||
previousCitizenship: boolean;
|
||||
profileUrl: string;
|
||||
signatureUrl: string;
|
||||
};
|
||||
|
||||
@@ -1,39 +1,70 @@
|
||||
import { z } from "zod";
|
||||
import { EYE_COLORS } from "./types";
|
||||
|
||||
const MAX_FILE_SIZE = 5 * 1024 * 1024;
|
||||
const ACCEPTED_IMAGE_TYPES = ["image/jpeg", "image/png", "image/webp"];
|
||||
|
||||
const imageFileSchema = z
|
||||
.instanceof(File, { error: "A file is required" })
|
||||
.refine((file) => file.size > 0, "A file is required")
|
||||
.refine((file) => file.size <= MAX_FILE_SIZE, "Image must be smaller than 5MB")
|
||||
.refine((file) => ACCEPTED_IMAGE_TYPES.includes(file.type), "Only JPEG, PNG, or WEBP images are allowed");
|
||||
|
||||
const baseFields = {
|
||||
height: z.string().regex(/^\d+$/, "Height must be a number").min(1, "Height is required"),
|
||||
eyeColor: z.string().min(1, "Eye colour is required"),
|
||||
height: z.coerce
|
||||
.number({ error: "Height is required" })
|
||||
.int("Height must be a whole number")
|
||||
.min(60, "Height must be at least 60 cm")
|
||||
.max(240, "Height must be at most 240 cm"),
|
||||
eyeColor: z.enum(EYE_COLORS, { error: "Eye colour is required" }),
|
||||
isEuResident: z.enum(["yes", "no"]),
|
||||
regionId: z.string().optional(),
|
||||
city: z.string().optional(),
|
||||
street: z.string().optional(),
|
||||
customAddress: z.string().optional(),
|
||||
}
|
||||
city: z.string().trim().optional(),
|
||||
street: z.string().trim().optional(),
|
||||
customAddress: z.string().trim().optional(),
|
||||
profile: imageFileSchema,
|
||||
signature: imageFileSchema,
|
||||
};
|
||||
|
||||
const previousCitizenshipSchema = z.object({
|
||||
applicationType: z.literal("PREVIOUS_CITIZENSHIP"),
|
||||
previousCountry: z.string().min(1, "Country of previous citizenship is required"),
|
||||
previousRegion: z.string().min(1, "Region of previous citizenship is required"),
|
||||
...baseFields,
|
||||
}).superRefine(validateAddress)
|
||||
const previousCitizenshipSchema = z
|
||||
.object({
|
||||
applicationType: z.literal("PREVIOUS_CITIZENSHIP"),
|
||||
previousCountry: z.enum(["DUS", "REA"], { error: "Invalid country of previous citizenship" }),
|
||||
previousRegion: z.string().trim().min(1, "Region of previous citizenship is required"),
|
||||
...baseFields,
|
||||
})
|
||||
.superRefine(validateAddress);
|
||||
|
||||
const naturalizationSchema = z.object({
|
||||
applicationType: z.literal("NATURALIZATION"),
|
||||
naturalizationReason: z.string().min(1, "Reason for naturalisation is required"),
|
||||
...baseFields,
|
||||
}).superRefine(validateAddress)
|
||||
const naturalizationSchema = z
|
||||
.object({
|
||||
applicationType: z.literal("NATURALIZATION"),
|
||||
naturalizationReason: z.string().trim().min(1, "Reason for naturalisation is required"),
|
||||
...baseFields,
|
||||
})
|
||||
.superRefine(validateAddress);
|
||||
|
||||
function validateAddress(data: { isEuResident: string, regionId?: string, city?: string, street?: string, customAddress?: string }, ctx: z.RefinementCtx) {
|
||||
function validateAddress(
|
||||
data: {
|
||||
isEuResident: string;
|
||||
regionId?: string;
|
||||
city?: string;
|
||||
street?: string;
|
||||
customAddress?: string;
|
||||
},
|
||||
ctx: z.RefinementCtx
|
||||
) {
|
||||
if (data.isEuResident === "yes") {
|
||||
if (!data.regionId) ctx.addIssue({ code: "custom", path: ["regionId"], message: "Region is required" })
|
||||
if (!data.city) ctx.addIssue({ code: "custom", path: ["city"], message: "City is required" })
|
||||
if (!data.street) ctx.addIssue({ code: "custom", path: ["street"], message: "Street is required" })
|
||||
if (!data.regionId) ctx.addIssue({ code: "custom", path: ["regionId"], message: "Region is required" });
|
||||
if (!data.city) ctx.addIssue({ code: "custom", path: ["city"], message: "City is required" });
|
||||
if (!data.street) ctx.addIssue({ code: "custom", path: ["street"], message: "Street is required" });
|
||||
} else {
|
||||
if (!data.customAddress) ctx.addIssue({ code: "custom", path: ["customAddress"], message: "Address is required" })
|
||||
if (!data.customAddress) {
|
||||
ctx.addIssue({ code: "custom", path: ["customAddress"], message: "Address is required" });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export const citizenshipApplicationSchema = z.discriminatedUnion("applicationType", [
|
||||
previousCitizenshipSchema,
|
||||
naturalizationSchema,
|
||||
])
|
||||
]);
|
||||
@@ -0,0 +1,34 @@
|
||||
import { z } from "zod";
|
||||
import { unstable_rethrow } from "next/navigation";
|
||||
import { AppError } from "./action-result";
|
||||
|
||||
export type FormState = {
|
||||
success: boolean;
|
||||
error?: string;
|
||||
fieldErrors?: Record<string, string[] | undefined>;
|
||||
};
|
||||
|
||||
export const initialFormState: FormState = { success: false };
|
||||
|
||||
export function formAction<Schema extends z.ZodTypeAny>(schema: Schema, handler: (data: z.infer<Schema>, formData: FormData) => Promise<void>) {
|
||||
return async (_prevState: FormState, formData: FormData): Promise<FormState> => {
|
||||
const raw = Object.fromEntries(formData.entries());
|
||||
const parsed = schema.safeParse(raw);
|
||||
|
||||
if (!parsed.success) {
|
||||
return { success: false, fieldErrors: parsed.error.flatten().fieldErrors };
|
||||
}
|
||||
|
||||
try {
|
||||
await handler(parsed.data, formData);
|
||||
return { success: true };
|
||||
} catch (e) {
|
||||
unstable_rethrow(e);
|
||||
if (e instanceof AppError) {
|
||||
return { success: false, error: e.message, fieldErrors: e.fieldErrors };
|
||||
}
|
||||
console.error(e);
|
||||
return { success: false, error: "Something went wrong. Please try again." };
|
||||
}
|
||||
};
|
||||
}
|
||||
+31
-27
@@ -1,4 +1,6 @@
|
||||
import { prisma } from "@/lib/prisma";
|
||||
import type { EyeColor } from "@/lib/citizenship/types";
|
||||
import { getImageUrl } from "../image";
|
||||
|
||||
export type IdentityCardData = {
|
||||
documentNumber: string;
|
||||
@@ -9,27 +11,29 @@ export type IdentityCardData = {
|
||||
sex: "M" | "F";
|
||||
birthDate: Date;
|
||||
address: string;
|
||||
height: string;
|
||||
eyeColor: string;
|
||||
height: number;
|
||||
eyeColor: EyeColor;
|
||||
issueDate: Date;
|
||||
expiryDate: Date;
|
||||
authority: string;
|
||||
origin: string | null;
|
||||
profileUrl: string;
|
||||
signatureUrl: string;
|
||||
};
|
||||
|
||||
export async function getIdentityCardData(userId: string): Promise<IdentityCardData | null> {
|
||||
const doc = await prisma.identityDocument.findFirst({
|
||||
const document = await prisma.identityDocument.findFirst({
|
||||
where: {
|
||||
citizenship: { userId },
|
||||
citizenship: {
|
||||
userId,
|
||||
revokedAt: null,
|
||||
},
|
||||
},
|
||||
orderBy: { issuedAt: "desc" },
|
||||
select: {
|
||||
documentNumber: true,
|
||||
address: true,
|
||||
issuedAt: true,
|
||||
expiresAt: true,
|
||||
regionId: true,
|
||||
city: true,
|
||||
street: true,
|
||||
customAddress: true,
|
||||
region: {
|
||||
select: { name: true },
|
||||
},
|
||||
@@ -41,9 +45,10 @@ export async function getIdentityCardData(userId: string): Promise<IdentityCardD
|
||||
givenNames: true,
|
||||
sex: true,
|
||||
birthDate: true,
|
||||
address: true,
|
||||
height: true,
|
||||
eyeColor: true,
|
||||
profileKey: true,
|
||||
signatureKey: true,
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -51,26 +56,25 @@ export async function getIdentityCardData(userId: string): Promise<IdentityCardD
|
||||
},
|
||||
});
|
||||
|
||||
if (!doc) return null;
|
||||
if (!document) return null;
|
||||
|
||||
const app = doc.citizenship.application;
|
||||
const application = document.citizenship.application;
|
||||
|
||||
return {
|
||||
documentNumber: doc.documentNumber,
|
||||
documentNumber: document.documentNumber,
|
||||
issuingCountry: "EUR",
|
||||
nationality: "EUR",
|
||||
surname: app.surname,
|
||||
givenNames: app.givenNames,
|
||||
sex: app.sex === "MALE" ? "M" : "F",
|
||||
birthDate: app.birthDate,
|
||||
address: app.address,
|
||||
height: app.height,
|
||||
eyeColor: app.eyeColor,
|
||||
issueDate: doc.issuedAt,
|
||||
expiryDate: doc.expiresAt,
|
||||
authority: doc.region?.name ?? "European Federation",
|
||||
origin: doc.regionId && doc.city
|
||||
? `${doc.city}, ${doc.regionId}, EU`
|
||||
: doc.customAddress ?? null,
|
||||
surname: application.surname,
|
||||
givenNames: application.givenNames,
|
||||
sex: application.sex === "MALE" ? "M" : "F",
|
||||
birthDate: application.birthDate,
|
||||
address: document.address,
|
||||
height: application.height,
|
||||
eyeColor: application.eyeColor as EyeColor,
|
||||
issueDate: document.issuedAt,
|
||||
expiryDate: document.expiresAt,
|
||||
authority: document.region?.name ?? "European Federation",
|
||||
profileUrl: await getImageUrl(application.profileKey),
|
||||
signatureUrl: await getImageUrl(application.signatureKey),
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
import crypto from "crypto";
|
||||
import sharp from "sharp";
|
||||
|
||||
import { AppError } from "@/lib/action-result";
|
||||
import { minioClient } from "@/lib/minio";
|
||||
|
||||
const BUCKET = "uploads";
|
||||
|
||||
const MAX_FILE_SIZE = 5 * 1024 * 1024;
|
||||
|
||||
export async function uploadImage(file: File, directory: string): Promise<string> {
|
||||
if (file.size === 0) {
|
||||
throw new AppError("A file is required");
|
||||
}
|
||||
|
||||
if (file.size > MAX_FILE_SIZE) {
|
||||
throw new AppError("Image must be smaller than 5MB");
|
||||
}
|
||||
|
||||
const input = Buffer.from(await file.arrayBuffer());
|
||||
|
||||
let image = sharp(input, {
|
||||
failOn: "error",
|
||||
});
|
||||
|
||||
const metadata = await image.metadata();
|
||||
|
||||
if (!metadata.format) {
|
||||
throw new AppError("Only JPEG, PNG, or WEBP images are allowed");
|
||||
}
|
||||
|
||||
const output = await image
|
||||
.rotate()
|
||||
.webp({
|
||||
quality: 80,
|
||||
effort: 4,
|
||||
})
|
||||
.toBuffer();
|
||||
|
||||
const key = `${directory}/${crypto.randomUUID()}.webp`;
|
||||
|
||||
await minioClient.putObject(
|
||||
BUCKET,
|
||||
key,
|
||||
output,
|
||||
output.length,
|
||||
{
|
||||
"Content-Type": "image/webp",
|
||||
},
|
||||
);
|
||||
|
||||
return key;
|
||||
}
|
||||
|
||||
export async function getImageUrl(key: string): Promise<string> {
|
||||
return minioClient.presignedGetObject(
|
||||
BUCKET,
|
||||
key,
|
||||
60 * 5
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
import { Client } from "minio";
|
||||
|
||||
export const minioClient = new Client({
|
||||
endPoint: process.env.MINIO_URL!,
|
||||
port: Number(process.env.MINIO_PORT),
|
||||
useSSL: false,
|
||||
accessKey: process.env.MINIO_ACCESS_KEY!,
|
||||
secretKey: process.env.MINIO_SECRET_KEY!
|
||||
})
|
||||
@@ -0,0 +1,29 @@
|
||||
import { unstable_rethrow } from "next/navigation";
|
||||
import { Prisma } from "@/lib/generated/prisma/client";
|
||||
import { AppError, type ActionResult } from "./action-result";
|
||||
|
||||
export function isPrismaError(error: unknown, code: string): boolean {
|
||||
return error instanceof Prisma.PrismaClientKnownRequestError && error.code === code;
|
||||
}
|
||||
|
||||
export async function runAction<T>(fn: () => Promise<T>): Promise<ActionResult<T>> {
|
||||
try {
|
||||
const data = await fn();
|
||||
return { success: true, data };
|
||||
} catch (e) {
|
||||
unstable_rethrow(e);
|
||||
|
||||
if (e instanceof AppError) {
|
||||
return { success: false, error: e.message, fieldErrors: e.fieldErrors };
|
||||
}
|
||||
if (isPrismaError(e, "P2025")) {
|
||||
return { success: false, error: "This record was updated by someone else. Please refresh and try again." };
|
||||
}
|
||||
if (isPrismaError(e, "P2002")) {
|
||||
return { success: false, error: "This record already exists." };
|
||||
}
|
||||
|
||||
console.error(e);
|
||||
return { success: false, error: "Something went wrong. Please try again." };
|
||||
}
|
||||
}
|
||||
+41
-31
@@ -4,16 +4,18 @@ import { generatePkce, generateState } from "@/lib/auth/pkce";
|
||||
import { pkceConfig } from "@/lib/cookieConfig";
|
||||
import { cookies } from "next/headers";
|
||||
import { redirect } from "next/navigation";
|
||||
import { deleteSession } from "@/lib/auth/session";
|
||||
import { deleteSession, getSessionUserId } from "@/lib/auth/session";
|
||||
import { deleteUser, updateUser } from "./repository";
|
||||
import { getAccessToken } from "@/lib/auth/tokens";
|
||||
import { fetchKotosoftUser } from "@/lib/kotosoft/client";
|
||||
import { revalidatePath } from "next/cache";
|
||||
import { getCurrentUser } from "../user";
|
||||
import { runAction } from "@/lib/run-action";
|
||||
import { AppError, type ActionResult } from "@/lib/action-result";
|
||||
|
||||
export async function login() {
|
||||
const { verifier, challenge } = generatePkce();
|
||||
const state = generateState();
|
||||
|
||||
const store = await cookies();
|
||||
store.set("pkce_verifier", verifier, pkceConfig);
|
||||
store.set("oauth_state", state, pkceConfig);
|
||||
@@ -31,34 +33,42 @@ export async function login() {
|
||||
redirect(`${process.env.KOTOSOFT_ID_API_URL}/oauth/authorize?${params}`);
|
||||
}
|
||||
|
||||
export async function logout() {
|
||||
await deleteSession();
|
||||
redirect("/");
|
||||
}
|
||||
|
||||
export async function deleteUserAction(userId: string) {
|
||||
await deleteUser(userId);
|
||||
await deleteSession();
|
||||
redirect("/");
|
||||
}
|
||||
|
||||
export async function updateUserAction() {
|
||||
const accessToken = await getAccessToken();
|
||||
if (!accessToken) throw new Error("Not authenticated");
|
||||
|
||||
const kotosoftUser = await fetchKotosoftUser(accessToken);
|
||||
|
||||
const { getSessionUserId } = await import("@/lib/auth/session");
|
||||
const userId = await getSessionUserId();
|
||||
if (!userId) throw new Error("Not authenticated");
|
||||
|
||||
await updateUser(userId, {
|
||||
email: kotosoftUser.email,
|
||||
firstName: kotosoftUser.first_name,
|
||||
secondName: kotosoftUser.second_name,
|
||||
sex: kotosoftUser.sex as "MALE" | "FEMALE",
|
||||
birthDate: kotosoftUser.birth_date,
|
||||
export async function logout(): Promise<ActionResult> {
|
||||
return runAction(async () => {
|
||||
await deleteSession();
|
||||
redirect("/");
|
||||
});
|
||||
|
||||
revalidatePath("/account")
|
||||
}
|
||||
|
||||
export async function deleteUserAction(): Promise<ActionResult> {
|
||||
return runAction(async () => {
|
||||
const user = await getCurrentUser();
|
||||
if (!user) throw new AppError("Not authenticated");
|
||||
|
||||
await deleteUser(user.id);
|
||||
await deleteSession();
|
||||
redirect("/");
|
||||
});
|
||||
}
|
||||
|
||||
export async function updateUserAction(): Promise<ActionResult> {
|
||||
return runAction(async () => {
|
||||
const accessToken = await getAccessToken();
|
||||
if (!accessToken) throw new AppError("Not authenticated");
|
||||
|
||||
const kotosoftUser = await fetchKotosoftUser(accessToken);
|
||||
|
||||
const userId = await getSessionUserId();
|
||||
if (!userId) throw new AppError("Not authenticated");
|
||||
|
||||
await updateUser(userId, {
|
||||
email: kotosoftUser.email,
|
||||
firstName: kotosoftUser.first_name,
|
||||
secondName: kotosoftUser.second_name,
|
||||
sex: kotosoftUser.sex as "MALE" | "FEMALE",
|
||||
birthDate: kotosoftUser.birth_date,
|
||||
});
|
||||
|
||||
revalidatePath("/account");
|
||||
});
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
import { getCurrentUser } from "@/lib/user";
|
||||
import { redirect } from "next/navigation";
|
||||
import { AppError } from "@/lib/action-result";
|
||||
|
||||
export async function requireUser() {
|
||||
const user = await getCurrentUser();
|
||||
if (!user) redirect("/");
|
||||
return user;
|
||||
}
|
||||
|
||||
export async function requireAdmin() {
|
||||
const user = await requireUser();
|
||||
if (!user.isAdmin) throw new AppError("You do not have permission to perform this action.");
|
||||
return user;
|
||||
}
|
||||
Reference in New Issue
Block a user