Changes:
- Updated UserSettings interface: town -> ownerTown
- Updated userSettingsActions.ts:
- Changed State type to use ownerTown
- Added max length validation (27 characters) to FormSchema
- Updated validation refinement to check ownerTown
- Updated form data parsing to read ownerTown
- Updated database write operations to use ownerTown
- Updated UserSettingsForm.tsx:
- Changed state tracking to use ownerTown
- Updated validation check to reference ownerTown
- Updated input field: id, name, maxLength={27}
- Updated ViewLocationCard.tsx to use ownerTown instead of town
- Updated English translations:
- town-label -> owner-town-label: "Your Postal Code and Town"
- town-placeholder -> owner-town-placeholder
- town-required -> owner-town-required
- Updated Croatian translations with corresponding ownerTown keys
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <noreply@anthropic.com>
195 lines
5.8 KiB
TypeScript
195 lines
5.8 KiB
TypeScript
'use server';
|
|
|
|
import { z } from 'zod';
|
|
import { getDbClient } from '../dbClient';
|
|
import { UserSettings } from '../db-types';
|
|
import { withUser } from '@/app/lib/auth';
|
|
import { AuthenticatedUser } from '../types/next-auth';
|
|
import { unstable_noStore as noStore } from 'next/cache';
|
|
import { IntlTemplateFn } from '@/app/i18n';
|
|
import { getTranslations, getLocale } from "next-intl/server";
|
|
import { revalidatePath } from 'next/cache';
|
|
import { gotoHomeWithMessage } from './navigationActions';
|
|
import * as IBAN from 'iban';
|
|
|
|
export type State = {
|
|
errors?: {
|
|
ownerName?: string[];
|
|
ownerStreet?: string[];
|
|
ownerTown?: string[];
|
|
iban?: string[];
|
|
currency?: string[];
|
|
show2dCodeInMonthlyStatement?: string[];
|
|
};
|
|
message?: string | null;
|
|
success?: boolean;
|
|
};
|
|
|
|
/**
|
|
* Schema for validating user settings form fields
|
|
*/
|
|
const FormSchema = (t: IntlTemplateFn) => z.object({
|
|
ownerName: z.string().max(25).optional(),
|
|
ownerStreet: z.string().max(25).optional(),
|
|
ownerTown: z.string().max(27).optional(),
|
|
iban: z.string()
|
|
.optional()
|
|
.refine(
|
|
(val) => {
|
|
if (!val || val.trim() === '') return true;
|
|
// Remove spaces and validate using iban.js library
|
|
const cleaned = val.replace(/\s/g, '').toUpperCase();
|
|
return IBAN.isValid(cleaned);
|
|
},
|
|
{ message: t("iban-invalid") }
|
|
),
|
|
currency: z.string().optional(),
|
|
show2dCodeInMonthlyStatement: z.boolean().optional().nullable(),
|
|
})
|
|
.refine((data) => {
|
|
if (data.show2dCodeInMonthlyStatement) {
|
|
return !!data.ownerName && data.ownerName.trim().length > 0;
|
|
}
|
|
return true;
|
|
}, {
|
|
message: t("owner-name-required"),
|
|
path: ["ownerName"],
|
|
})
|
|
.refine((data) => {
|
|
if (data.show2dCodeInMonthlyStatement) {
|
|
return !!data.ownerStreet && data.ownerStreet.trim().length > 0;
|
|
}
|
|
return true;
|
|
}, {
|
|
message: t("owner-street-required"),
|
|
path: ["ownerStreet"],
|
|
})
|
|
.refine((data) => {
|
|
if (data.show2dCodeInMonthlyStatement) {
|
|
return !!data.ownerTown && data.ownerTown.trim().length > 0;
|
|
}
|
|
return true;
|
|
}, {
|
|
message: t("owner-town-required"),
|
|
path: ["ownerTown"],
|
|
})
|
|
.refine((data) => {
|
|
if (data.show2dCodeInMonthlyStatement) {
|
|
if (!data.iban || data.iban.trim().length === 0) {
|
|
return false;
|
|
}
|
|
// Validate IBAN format when required
|
|
const cleaned = data.iban.replace(/\s/g, '').toUpperCase();
|
|
return IBAN.isValid(cleaned);
|
|
}
|
|
return true;
|
|
}, {
|
|
message: t("iban-required"),
|
|
path: ["iban"],
|
|
})
|
|
.refine((data) => {
|
|
if (data.show2dCodeInMonthlyStatement) {
|
|
return !!data.currency && data.currency.trim().length > 0;
|
|
}
|
|
return true;
|
|
}, {
|
|
message: t("currency-required"),
|
|
path: ["currency"],
|
|
});
|
|
|
|
/**
|
|
* Get user settings
|
|
*/
|
|
export const getUserSettings = withUser(async (user: AuthenticatedUser) => {
|
|
noStore();
|
|
|
|
const dbClient = await getDbClient();
|
|
const { id: userId } = user;
|
|
|
|
const userSettings = await dbClient.collection<UserSettings>("userSettings")
|
|
.findOne({ userId });
|
|
|
|
return userSettings;
|
|
});
|
|
|
|
/**
|
|
* Get user settings by userId (without authentication)
|
|
* Used for public/shared pages where we need to display owner's payment information
|
|
*/
|
|
export const getUserSettingsByUserId = async (userId: string): Promise<UserSettings | null> => {
|
|
noStore();
|
|
|
|
const dbClient = await getDbClient();
|
|
|
|
const userSettings = await dbClient.collection<UserSettings>("userSettings")
|
|
.findOne({ userId });
|
|
|
|
return userSettings;
|
|
};
|
|
|
|
/**
|
|
* Update user settings
|
|
*/
|
|
export const updateUserSettings = withUser(async (user: AuthenticatedUser, prevState: State, formData: FormData) => {
|
|
noStore();
|
|
|
|
const t = await getTranslations("user-settings-form.validation");
|
|
|
|
const validatedFields = FormSchema(t).safeParse({
|
|
ownerName: formData.get('ownerName') || undefined,
|
|
ownerStreet: formData.get('ownerStreet') || undefined,
|
|
ownerTown: formData.get('ownerTown') || undefined,
|
|
iban: formData.get('iban') || undefined,
|
|
currency: formData.get('currency') || undefined,
|
|
show2dCodeInMonthlyStatement: formData.get('generateTenantCode') === 'on',
|
|
});
|
|
|
|
// If form validation fails, return errors early. Otherwise, continue...
|
|
if (!validatedFields.success) {
|
|
return {
|
|
errors: validatedFields.error.flatten().fieldErrors,
|
|
message: t("validation-failed"),
|
|
success: false,
|
|
};
|
|
}
|
|
|
|
const { ownerName, ownerStreet, ownerTown, iban, currency, show2dCodeInMonthlyStatement } = validatedFields.data;
|
|
|
|
// Normalize IBAN: remove spaces and convert to uppercase
|
|
const normalizedIban = iban ? iban.replace(/\s/g, '').toUpperCase() : null;
|
|
|
|
// Update the user settings in MongoDB
|
|
const dbClient = await getDbClient();
|
|
const { id: userId } = user;
|
|
|
|
const userSettings: UserSettings = {
|
|
userId,
|
|
ownerName: ownerName || null,
|
|
ownerStreet: ownerStreet || null,
|
|
ownerTown: ownerTown || null,
|
|
iban: normalizedIban,
|
|
currency: currency || null,
|
|
show2dCodeInMonthlyStatement: show2dCodeInMonthlyStatement ?? false,
|
|
};
|
|
|
|
await dbClient.collection<UserSettings>("userSettings")
|
|
.updateOne(
|
|
{ userId },
|
|
{ $set: userSettings },
|
|
{ upsert: true }
|
|
);
|
|
|
|
revalidatePath('/settings');
|
|
|
|
// Get current locale and redirect to home with success message
|
|
const locale = await getLocale();
|
|
await gotoHomeWithMessage(locale, 'userSettingsSaved');
|
|
|
|
// This return is needed for TypeScript, but won't be reached due to redirect
|
|
return {
|
|
message: null,
|
|
errors: {},
|
|
success: true,
|
|
};
|
|
});
|