feat: citizenship applications

This commit is contained in:
Ivan Rezchikov
2026-06-23 19:03:10 +03:00
parent 58ec75c948
commit c60ab9e8f9
44 changed files with 1254 additions and 130 deletions
+5 -3
View File
@@ -2,7 +2,9 @@ import { SignJWT, jwtVerify } from "jose";
import { cookies } from "next/headers";
import { cookieConfig } from "@/lib/cookieConfig";
const secret = new TextEncoder().encode(process.env.JWT_SECRET!);
function getSecret() {
return new TextEncoder().encode(process.env.JWT_SECRET!);
}
async function signJwt(userId: string) {
return await new SignJWT({})
@@ -10,7 +12,7 @@ async function signJwt(userId: string) {
.setSubject(userId)
.setIssuedAt()
.setExpirationTime(`${process.env.SESSION_MAX_AGE}s`)
.sign(secret);
.sign(getSecret());
}
export async function createSession(userId: string) {
@@ -29,7 +31,7 @@ export async function getSessionUserId(): Promise<string | null> {
if (!token) return null;
try {
const { payload } = await jwtVerify(token, secret);
const { payload } = await jwtVerify(token, getSecret());
return payload.sub ?? null;
} catch {
return null;
+5
View File
@@ -7,6 +7,11 @@ export async function setTokens(accessToken: string, refreshToken: string, ttl:
store.set("refresh_token", refreshToken, { ...cookieConfig, path: "/", maxAge: ttl * 7 * 24 * 60 * 60 });
}
export async function getAccessToken() {
const store = await cookies();
return store.get("access_token")?.value ?? null;
}
export async function deleteOAuthCookies() {
const store = await cookies();
store.delete("pkce_verifier");
+56
View File
@@ -0,0 +1,56 @@
"use server";
import { getCurrentUser } from "@/lib/user";
import { redirect } from "next/navigation";
import { revalidatePath } from "next/cache";
import { citizenshipApplicationSchema } from "./validation";
import { createApplication } from "./repository";
export type ApplicationState = {
success: boolean;
errors: string[];
};
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 raw: Record<string, string> = {
applicationType,
address: (formData.get("address") as string) ?? "",
height: (formData.get("height") as string) ?? "",
eyeColor: (formData.get("eyeColor") as string) ?? "",
};
if (applicationType === "PREVIOUS_CITIZENSHIP") {
raw.previousCountry = (formData.get("previousCountry") as string) ?? "";
raw.previousRegion = (formData.get("previousRegion") as string) ?? "";
} else if (applicationType === "BORN_IN_TERRITORY") {
raw.birthRegion = (formData.get("birthRegion") as string) ?? "";
} else if (applicationType === "NATURALIZATION") {
raw.naturalizationReason = (formData.get("naturalizationReason") as string) ?? "";
}
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 };
}
await createApplication(user.id, {
surname: user.secondName,
givenNames: user.firstName,
sex: user.sex,
birthDate: user.birthDate ?? new Date(),
...parsed.data,
});
revalidatePath("/account/citizenship");
return { success: true, errors: [] };
}
+33
View File
@@ -0,0 +1,33 @@
import { prisma } from "@/lib/prisma";
import type { ApplicationType } from "./types";
type CreateData = {
surname: string;
givenNames: string;
sex: "MALE" | "FEMALE";
birthDate: Date;
applicationType: ApplicationType;
previousCountry?: string | null;
previousRegion?: string | null;
birthRegion?: string | null;
naturalizationReason?: string | null;
address: string;
height: string;
eyeColor: string;
};
export async function createApplication(userId: string, data: CreateData) {
return prisma.citizenshipApplication.create({
data: {
userId,
...data,
},
});
}
export async function getUserApplications(userId: string) {
return prisma.citizenshipApplication.findMany({
where: { userId },
orderBy: { createdAt: "desc" },
});
}
+37
View File
@@ -0,0 +1,37 @@
export const CITIZENSHIP_APPLICATION_STATUSES = ["PENDING", "APPROVED", "REJECTED"] as const;
export type CitizenshipApplicationStatus = typeof CITIZENSHIP_APPLICATION_STATUSES[number];
export const APPLICATION_TYPES = ["PREVIOUS_CITIZENSHIP", "BORN_IN_TERRITORY", "NATURALIZATION"] as const;
export type ApplicationType = typeof APPLICATION_TYPES[number];
export const EYE_COLORS = [
"Blue",
"Green",
"Brown",
"Hazel",
"Gray",
"Amber",
] as const;
export type EyeColor = typeof EYE_COLORS[number];
export type CitizenshipApplication = {
id: string;
userId: string;
surname: string;
givenNames: string;
sex: "MALE" | "FEMALE";
birthDate: Date;
applicationType: ApplicationType;
previousCountry: string | null;
previousRegion: string | null;
birthRegion: string | null;
naturalizationReason: string | null;
address: string;
height: string;
eyeColor: string;
status: CitizenshipApplicationStatus;
rejectionReason: string | null;
reviewedAt: Date | null;
createdAt: Date;
updatedAt: Date;
};
+44
View File
@@ -0,0 +1,44 @@
import { z } from "zod";
const baseFields = {
address: z.string().min(1, "Address is required"),
height: z.string().min(1, "Height is required"),
eyeColor: z.string().min(1, "Eye colour is required"),
};
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,
});
const bornInTerritorySchema = z.object({
applicationType: z.literal("BORN_IN_TERRITORY"),
birthRegion: z.string().min(1, "Region of birth is required"),
...baseFields,
});
const naturalizationSchema = z.object({
applicationType: z.literal("NATURALIZATION"),
naturalizationReason: z.string().min(1, "Reason for naturalisation is required"),
...baseFields,
});
export const citizenshipApplicationSchema = z.discriminatedUnion("applicationType", [
previousCitizenshipSchema,
bornInTerritorySchema,
naturalizationSchema,
]);
export type CitizenshipApplicationFormData = z.infer<typeof citizenshipApplicationSchema>;
export function validateCitizenshipApplication(data: unknown) {
const result = citizenshipApplicationSchema.safeParse(data);
if (!result.success) {
const fieldErrors = result.error.flatten().fieldErrors ?? {};
const messages = Object.values(fieldErrors).flat().filter(Boolean);
return { success: false as const, errors: messages };
}
return { success: true as const, data: result.data };
}
+5
View File
@@ -5,6 +5,7 @@ import { Block, PageMeta, PageStatus, PageType } from "./types";
import { archivePage, createPage, deletePage, updatePage } from "./repository";
import { revalidatePath } from "next/cache";
import { deleteNavLinkByPageId } from "../navlinks/repository";
import { validatePage } from "./validation";
export async function savePageAction(params: {
id: string | null,
@@ -15,6 +16,10 @@ export async function savePageAction(params: {
blocks: Block[],
meta?: PageMeta
}) {
const parsed = validatePage(params);
if (!parsed.success) {
throw new Error(parsed.errors.join("; "));
}
if (params.id) {
await updatePage(params.id, params.title, params.type, params.status, params.blocks, params.meta);
+11 -7
View File
@@ -1,18 +1,19 @@
import { getCurrentUser } from "../user";
import { Block, PageMeta, PageStatus, PageType } from "./types";
import type { Block, Page, PageMeta, PageStatus, PageType } from "./types";
import { prisma } from "../prisma";
export async function getPages(type: PageType, status: PageStatus, limit?: number) {
// return await prisma.page.findMany({ where: { type, status }, take: limit, orderBy: { publishedAt: "desc" }, });
return []
return await prisma.page.findMany({ where: { type, status }, take: limit, orderBy: { publishedAt: "desc" }, }) as Page[];
}
export async function getPageById(id: string) {
return await prisma.page.findUnique({ where: { id: id } });
}
export async function getPageBySlug(slug: string) {
return await prisma.page.findUnique({ where: { slug } });
export async function getPageBySlug(slug: string, type?: PageType) {
return await prisma.page.findFirst({
where: { slug, ...(type ? { type } : {}) },
}) as Page | null;
}
export async function createPage(slug: string, title: string, type: PageType, status: PageStatus, blocks: Block[], meta?: PageMeta) {
@@ -68,6 +69,9 @@ export async function updatePage(
const user = await getCurrentUser();
if (!user?.isAdmin) throw new Error("Access denied");
const currentPage = await prisma.page.findUnique({ where: { id }, select: { status: true } });
const isNewlyPublished = status === "PUBLISHED" && currentPage?.status !== "PUBLISHED";
const page = await prisma.page.update({
where: { id },
data: {
@@ -75,7 +79,7 @@ export async function updatePage(
type,
status,
meta: meta ?? {},
publishedAt: status === "PUBLISHED" ? new Date() : undefined,
publishedAt: isNewlyPublished ? new Date() : undefined,
updatedAt: new Date(),
updatedBy: user.id
},
@@ -115,5 +119,5 @@ export async function getBlocksByPageId(pageId: string) {
return prisma.block.findMany({
where: { pageId },
orderBy: { position: "asc" },
});
}) as Promise<Block[]>;
}
+26
View File
@@ -0,0 +1,26 @@
import { z } from "zod";
export const pageSchema = z.object({
id: z.string().nullable(),
title: z.string().min(1, "Title is required"),
slug: z.string().min(1, "Slug is required"),
type: z.enum(["NEWS", "PAGE"]),
status: z.enum(["DRAFT", "PUBLISHED", "ARCHIVED"]),
blocks: z.array(z.any()),
meta: z.object({
location: z.string().optional(),
tags: z.array(z.string()).optional(),
}).optional(),
});
export type PageFormData = z.infer<typeof pageSchema>;
export function validatePage(data: unknown): { success: true; data: PageFormData } | { success: false; errors: string[] } {
const result = pageSchema.safeParse(data);
if (!result.success) {
const fieldErrors = result.error.flatten().fieldErrors ?? {};
const messages = Object.values(fieldErrors).flat().filter(Boolean);
return { success: false, errors: messages };
}
return { success: true, data: result.data };
}
+7 -1
View File
@@ -1,5 +1,5 @@
import { getSessionUserId } from "@/lib/auth/session";
import { findUserById } from "@/lib/user/repository";
import { findUserById, findUsersByIds } from "@/lib/user/repository";
import { fetchKotosoftUser } from "./kotosoft/client";
import { cookies } from "next/headers";
@@ -12,4 +12,10 @@ export async function getCurrentUser() {
export async function getUser(id: string | null) {
if (!id) return null;
return findUserById(id);
}
export async function getUsers(...ids: (string | null | undefined)[]) {
const filtered = ids.filter((id): id is string => !!id);
if (filtered.length === 0) return [];
return findUsersByIds(filtered);
}
+64
View File
@@ -0,0 +1,64 @@
"use server"
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 { deleteUser, updateUser } from "./repository";
import { getAccessToken } from "@/lib/auth/tokens";
import { fetchKotosoftUser } from "@/lib/kotosoft/client";
import { revalidatePath } from "next/cache";
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);
const params = new URLSearchParams({
client_id: process.env.KOTOSOFT_ID_CLIENT_ID!,
redirect_uri: `${process.env.PUBLIC_URL}/api/callback`,
scope: "profile:read",
response_type: "code",
code_challenge: challenge,
code_challenge_method: "S256",
state,
});
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,
});
revalidatePath("/account")
}
+13 -2
View File
@@ -10,6 +10,12 @@ export async function findUserById(id: string) {
return prisma.user.findUnique({ where: { id } });
}
export async function findUsersByIds(ids: string[]) {
const filtered = ids.filter(Boolean);
if (filtered.length === 0) return [];
return prisma.user.findMany({ where: { id: { in: filtered } } });
}
export async function findOrCreateUser(data: UserData) {
const existing = await findUserByKotosoftId(data.kotosoftId);
if (existing) return existing;
@@ -17,8 +23,13 @@ export async function findOrCreateUser(data: UserData) {
return prisma.user.create({
data: {
id: uuidv4(),
...data,
birthDate: new Date(data.birthDate),
kotosoftId: data.kotosoftId,
email: data.email,
firstName: data.firstName,
secondName: data.secondName,
sex: data.sex,
birthDate: data.birthDate ? new Date(data.birthDate) : null,
isAdmin: data.isAdmin,
},
});
}
+2 -2
View File
@@ -3,7 +3,7 @@ export type UserData = {
email: string;
firstName: string;
secondName: string;
sex: string;
birthDate: string;
sex: "MALE" | "FEMALE";
birthDate?: string;
isAdmin: boolean;
}