feat: create and update recipients in firebase auth store

firestore_to_postgres/src/recipient/recipient.transformer.ts

@@ -38,7 +38,12 @@ export class RecipientTransformer extends BaseTransformer<FirestoreRecipientWith
 							},
 						},
 					}
-				: undefined;
+				: {
+						create: {
+							number: '',
+							hasWhatsApp: false,
+						},
+					};
 
 			transformed.push({
 				legacyFirestoreId: raw.id,

shared/src/database/migrations/20251031122446_make_payment_information_phone_mandatory/migration.sql

@@ -0,0 +1,14 @@
+/*
+  Warnings:
+
+  - Made the column `phone_id` on table `payment_information` required. This step will fail if there are existing NULL values in that column.
+
+*/
+-- DropForeignKey
+ALTER TABLE "payment_information" DROP CONSTRAINT "payment_information_phone_id_fkey";
+
+-- AlterTable
+ALTER TABLE "payment_information" ALTER COLUMN "phone_id" SET NOT NULL;
+
+-- AddForeignKey
+ALTER TABLE "payment_information" ADD CONSTRAINT "payment_information_phone_id_fkey" FOREIGN KEY ("phone_id") REFERENCES "phone"("id") ON DELETE RESTRICT ON UPDATE CASCADE;

shared/src/database/schema.prisma

@@ -427,8 +427,8 @@ model PaymentInformation {
   id       String          @id @default(cuid()) @map("id")
   provider PaymentProvider @map("provider")
   code     String          @unique @map("code")
-  phoneId  String?         @map("phone_id")
-  phone    Phone?          @relation(fields: [phoneId], references: [id])
+  phoneId  String          @map("phone_id")
+  phone    Phone           @relation(fields: [phoneId], references: [id])
 
   recipients Recipient[]
 

shared/src/database/services/recipient/recipient.service.ts

@@ -1,4 +1,5 @@
 import { ProgramPermission, Recipient, RecipientStatus } from '@prisma/client';
+import { FirebaseService } from '@socialincome/shared/src/firebase/services/auth.service';
 import { BaseService } from '../core/base.service';
 import { ServiceResult } from '../core/base.types';
 import { ProgramAccessService } from '../program-access/program-access.service';
@@ -12,6 +13,7 @@ import {
 
 export class RecipientService extends BaseService {
 	private programAccessService = new ProgramAccessService();
+	private firebaseAuthService = new FirebaseService();
 
 	async create(userId: string, recipient: RecipientCreateInput): Promise<ServiceResult<Recipient>> {
 		const accessResult = await this.programAccessService.getAccessiblePrograms(userId);
@@ -27,6 +29,12 @@ export class RecipientService extends BaseService {
 		}
 
 		try {
+			const phoneNumber = recipient.paymentInformation?.create?.phone?.create?.number;
+			if (!phoneNumber) {
+				return this.resultFail('No phone number provided for recipient creation');
+			}
+
+			await this.firebaseAuthService.createByPhoneNumber(phoneNumber);
 			const newRecipient = await this.db.recipient.create({ data: recipient });
 			return this.resultOk(newRecipient);
 		} catch (error) {
@@ -44,7 +52,7 @@ export class RecipientService extends BaseService {
 
 		const existing = await this.db.recipient.findUnique({
 			where: { id: recipient.id?.toString() },
-			select: { programId: true },
+			select: { programId: true, paymentInformation: { select: { phone: { select: { number: true } } } } },
 		});
 
 		if (!existing) {
@@ -58,6 +66,15 @@ export class RecipientService extends BaseService {
 		}
 
 		try {
+			const phoneNumber =
+				recipient.paymentInformation?.upsert?.update?.phone?.upsert?.update.number?.toString() ||
+				recipient.paymentInformation?.upsert?.create?.phone?.create?.number?.toString();
+
+			if (!phoneNumber || !existing.paymentInformation?.phone?.number) {
+				return this.resultFail('No phone number available for recipient update');
+			}
+
+			await this.firebaseAuthService.updateByPhoneNumber(existing.paymentInformation?.phone.number, phoneNumber);
 			const updatedRecipient = await this.db.recipient.update({
 				where: { id: recipient.id?.toString() },
 				data: recipient,

shared/src/firebase/services/auth.service.ts

@@ -0,0 +1,59 @@
+import { getOrInitializeFirebaseAdmin } from '@socialincome/shared/src/firebase/admin/app';
+import { AuthAdmin } from '@socialincome/shared/src/firebase/admin/AuthAdmin';
+import { credential } from 'firebase-admin';
+
+const { FIREBASE_SERVICE_ACCOUNT_JSON, FIREBASE_DATABASE_URL } = process.env;
+
+// Firebase service account JSON is Base64-encoded to avoid multiline GitHub Secrets issues in Docker builds
+const credentials =
+	FIREBASE_SERVICE_ACCOUNT_JSON && FIREBASE_DATABASE_URL
+		? {
+				credential: credential.cert(JSON.parse(Buffer.from(FIREBASE_SERVICE_ACCOUNT_JSON, 'base64').toString('utf-8'))),
+				databaseURL: FIREBASE_DATABASE_URL,
+			}
+		: undefined;
+
+export class FirebaseService {
+	private authAdmin = new AuthAdmin(getOrInitializeFirebaseAdmin(credentials));
+
+	async createByPhoneNumber(phoneNumber: string) {
+		try {
+			const existingUser = await this.getByPhoneNumber(phoneNumber);
+			if (existingUser) {
+				console.log('User already exists for phone number:', phoneNumber);
+				return existingUser;
+			}
+			return await this.authAdmin.auth.createUser({
+				phoneNumber,
+			});
+		} catch (error) {
+			console.error('Error creating user by phone number:', error);
+			throw new Error('Could not create auth user by phone number');
+		}
+	}
+
+	async updateByPhoneNumber(oldPhoneNumber: string, newPhoneNumber: string) {
+		try {
+			const existingUser = await this.getByPhoneNumber(oldPhoneNumber);
+			if (!existingUser) throw new Error('Auth user not found');
+			return await this.authAdmin.auth.updateUser(existingUser.uid, {
+				phoneNumber: newPhoneNumber,
+			});
+		} catch (error) {
+			console.error('Error fetching user by phone number:', error);
+			throw new Error('Could not update auth user by phone number');
+		}
+	}
+
+	async getByPhoneNumber(phoneNumber: string) {
+		try {
+			return await this.authAdmin.auth.getUserByPhoneNumber(phoneNumber);
+		} catch (error: any) {
+			if (error?.code === 'auth/user-not-found') {
+				return null;
+			}
+			console.error('Error getting user by phone number:', error);
+			throw new Error('Auth user not found by phone number');
+		}
+	}
+}

website/src/app/portal/components/data-table/clients/recipients-table-client.tsx

@@ -40,7 +40,7 @@ export function RecipientsTableClient({
 
 	const onError = (error: unknown) => {
 		setHasError(true);
-		console.error('Local Partner Form Error: ', error);
+		console.error('Recipient Form Error: ', error);
 	};
 
 	return (

website/src/app/portal/components/forms/recipient/recipient-form-helpers.ts

@@ -50,7 +50,7 @@ export function buildUpdateRecipientInput(
 			upsert: {
 				create: {
 					...basePaymentInfo,
-					phone: paymentInfoFields.phone.value ? { create: { number: paymentInfoFields.phone.value } } : undefined,
+					phone: { create: { number: paymentInfoFields.phone.value } },
 				},
 				update: { ...basePaymentInfo, phone: paymentPhoneUpdate },
 				where: { id: recipient.paymentInformation?.id },
@@ -91,7 +91,7 @@ export function buildCreateRecipientInput(
 			create: {
 				provider: paymentInfoFields.provider.value,
 				code: paymentInfoFields.code.value,
-				phone: paymentInfoFields.phone.value ? { create: { number: paymentInfoFields.phone.value } } : undefined,
+				phone: { create: { number: paymentInfoFields.phone.value } },
 			},
 		},
 		contact: {

website/src/app/portal/components/forms/recipient/recipient-form.tsx

@@ -100,10 +100,7 @@ const initialFormSchema: RecipientFormSchema = {
 					label: 'Phone Number',
 					zodSchema: z
 						.string()
-						// TODO: chek regex and optional
-						.regex(/^\s*(?:\+?(\d{1,3}))?[-. (]*(\d{3})[-. )]*(\d{3})[-. ]*(\d{4})(?: *x(\d+))?\s*$/gm)
-						.or(z.literal(''))
-						.optional(),
+						.regex(/^\+[1-9]\d{1,14}$/, 'Phone number must be in valid E.164 format (e.g., +12345678901)'),
 				},
 			},
 		},