fix billing and 2fa admin

apps/api/src/modules/admin/admin.service.ts

@@ -171,8 +171,13 @@ export async function login(email: string, password: string, totpCode?: string,
 }
 
 export async function setupTotp(adminId: string, email: string) {
-  const secret = authenticator.generateSecret()
-  await repo.updateAdminTotpSecret(adminId, secret)
+  const admin = await repo.findAdminByIdOrThrow(adminId)
+  const secret = admin.totpSecret && !admin.totpEnabled
+    ? admin.totpSecret
+    : authenticator.generateSecret()
+  if (secret !== admin.totpSecret) {
+    await repo.updateAdminTotpSecret(adminId, secret)
+  }
   const otpauth = authenticator.keyuri(email, 'RentalDriveGo Admin', secret)
   const qrCode = await qrcode.toDataURL(otpauth)
   return { secret, qrCode }
@@ -335,7 +340,7 @@ export async function listAdmins() {
   return admins.map((admin: any) => presenter.presentAdminUser(admin))
 }
 
-export async function createAdmin(body: { email: string; firstName: string; lastName: string; role: string; password: string; permissions?: any[] }) {
+export async function createAdmin(body: { email: string; firstName: string; lastName: string; role: string; preferredLocale: string; password: string; permissions?: any[] }) {
   const admin = await repo.createAdmin({
     ...body,
     passwordHash: await bcrypt.hash(body.password, 12),
@@ -350,6 +355,7 @@ export async function updateAdmin(
     firstName?: string
     lastName?: string
     role?: string
+    preferredLocale?: string
     password?: string
     isActive?: boolean
   },
@@ -359,6 +365,7 @@ export async function updateAdmin(
     ...(body.firstName !== undefined ? { firstName: body.firstName } : {}),
     ...(body.lastName !== undefined ? { lastName: body.lastName } : {}),
     ...(body.role !== undefined ? { role: body.role } : {}),
+    ...(body.preferredLocale !== undefined ? { preferredLocale: body.preferredLocale } : {}),
     ...(body.isActive !== undefined ? { isActive: body.isActive } : {}),
     ...(body.password ? { passwordHash: await bcrypt.hash(body.password, 12) } : {}),
   })
@@ -406,6 +413,18 @@ export function updateBillingAccount(
   return billingService.updateBillingAccount(billingAccountId, data, adminId, ip)
 }
 
+export function getBillingPlatformSettings() {
+  return billingService.getBillingPlatformSettings()
+}
+
+export function updateBillingPlatformSettings(
+  data: Parameters<typeof billingService.updateBillingPlatformSettings>[0],
+  adminId: string,
+  ip?: string,
+) {
+  return billingService.updateBillingPlatformSettings(data, adminId, ip)
+}
+
 export function setDunningPaused(billingAccountId: string, paused: boolean, adminId: string, ip?: string) {
   return billingService.setDunningPaused(billingAccountId, paused, adminId, ip)
 }