Merge pull request #1179 from firebase/@invertase/align-translations

Author: Ehesp

examples/nextjs/lib/firebase/clientApp.ts

@@ -20,7 +20,6 @@ import { initializeApp, getApps } from "firebase/app";
 import { firebaseConfig } from "./config";
 import { connectAuthEmulator, getAuth } from "firebase/auth";
 import { autoAnonymousLogin, initializeUI } from "@firebase-ui/core";
-import { customLanguage, english } from "@firebase-ui/translations";
 
 export const firebaseApp = getApps().length === 0 ? initializeApp(firebaseConfig) : getApps()[0];
 
@@ -29,19 +28,6 @@ export const auth = getAuth(firebaseApp);
 export const ui = initializeUI({
   app: firebaseApp,
   behaviors: [autoAnonymousLogin()],
-  translations: [
-    customLanguage(english.locale, {
-      labels: {
-        signIn: "Sign In",
-      },
-      prompts: {
-        signInToAccount: "Sign in to your account",
-      },
-      errors: {
-        invalidEmail: "Please enter a valid email address",
-      },
-    }),
-  ],
 });
 
 connectAuthEmulator(auth, "http://localhost:9099");

examples/react/lib/firebase/clientApp.ts

@@ -20,7 +20,6 @@ import { initializeApp, getApps } from "firebase/app";
 import { firebaseConfig } from "./config";
 import { connectAuthEmulator, getAuth } from "firebase/auth";
 import { autoAnonymousLogin, initializeUI } from "@firebase-ui/core";
-import { customLanguage, english } from "@firebase-ui/translations";
 
 export const firebaseApp = getApps().length === 0 ? initializeApp(firebaseConfig) : getApps()[0];
 
@@ -29,19 +28,6 @@ export const auth = getAuth(firebaseApp);
 export const ui = initializeUI({
   app: firebaseApp,
   behaviors: [autoAnonymousLogin()],
-  translations: [
-    customLanguage(english.locale, {
-      labels: {
-        signIn: "Sign In",
-      },
-      prompts: {
-        signInToAccount: "Sign in to your account",
-      },
-      errors: {
-        invalidEmail: "Please enter a valid email address",
-      },
-    }),
-  ],
 });
 
 if (import.meta.env.MODE === "development") {

packages/angular/src/lib/auth/forms/email-link-form/email-link-form.component.ts

@@ -25,6 +25,7 @@ import {
   FirebaseUIError,
   completeEmailLinkSignIn,
   sendSignInLinkToEmail,
+  FirebaseUIConfiguration,
 } from "@firebase-ui/core";
 import { firstValueFrom } from "rxjs";
 
@@ -74,7 +75,7 @@ export class EmailLinkFormComponent implements OnInit {
   formError: string | null = null;
   emailSent = false;
   private formSchema: any;
-  private config: any;
+  private config: FirebaseUIConfiguration;
 
   form = injectForm({
     defaultValues: {
@@ -86,7 +87,7 @@ export class EmailLinkFormComponent implements OnInit {
     try {
       this.config = await firstValueFrom(this.ui.config());
 
-      this.formSchema = createEmailLinkFormSchema(this.config?.translations);
+      this.formSchema = createEmailLinkFormSchema(this.config);
 
       this.form.update({
         validators: {

packages/angular/src/lib/auth/forms/email-password-form/email-password-form.component.ts

@@ -20,7 +20,7 @@ import { injectForm, TanStackField } from "@tanstack/angular-form";
 import { FirebaseUI } from "../../../provider";
 import { ButtonComponent } from "../../../components/button/button.component";
 import { TermsAndPrivacyComponent } from "../../../components/terms-and-privacy/terms-and-privacy.component";
-import { createEmailFormSchema, EmailFormSchema, FirebaseUIError, signInWithEmailAndPassword } from "@firebase-ui/core";
+import { createEmailFormSchema, EmailFormSchema, FirebaseUIConfiguration, FirebaseUIError, signInWithEmailAndPassword } from "@firebase-ui/core";
 import { firstValueFrom } from "rxjs";
 import { Router } from "@angular/router";
 
@@ -105,7 +105,7 @@ export class EmailPasswordFormComponent implements OnInit {
 
   formError: string | null = null;
   private formSchema: any;
-  private config: any;
+  private config: FirebaseUIConfiguration;
 
   form = injectForm({
     defaultValues: {
@@ -120,7 +120,7 @@ export class EmailPasswordFormComponent implements OnInit {
       this.config = await firstValueFrom(this.ui.config());
 
       // Create schema once
-      this.formSchema = createEmailFormSchema(this.config?.translations);
+      this.formSchema = createEmailFormSchema(this.config);
 
       // Apply schema to form validators
       this.form.update({

packages/angular/src/lib/auth/forms/forgot-password-form/forgot-password-form.component.ts

@@ -21,7 +21,7 @@ import { FirebaseUI } from "../../../provider";
 import { Auth } from "@angular/fire/auth";
 import { ButtonComponent } from "../../../components/button/button.component";
 import { TermsAndPrivacyComponent } from "../../../components/terms-and-privacy/terms-and-privacy.component";
-import { createForgotPasswordFormSchema, FirebaseUIError, sendPasswordResetEmail } from "@firebase-ui/core";
+import { createForgotPasswordFormSchema, FirebaseUIConfiguration, FirebaseUIError, sendPasswordResetEmail } from "@firebase-ui/core";
 import { firstValueFrom } from "rxjs";
 import { Router } from "@angular/router";
 
@@ -80,7 +80,7 @@ export class ForgotPasswordFormComponent implements OnInit {
   formError: string | null = null;
   emailSent = false;
   private formSchema: any;
-  private config: any;
+  private config: FirebaseUIConfiguration;
 
   form = injectForm({
     defaultValues: {
@@ -92,7 +92,7 @@ export class ForgotPasswordFormComponent implements OnInit {
     try {
       this.config = await firstValueFrom(this.ui.config());
 
-      this.formSchema = createForgotPasswordFormSchema(this.config?.translations);
+      this.formSchema = createForgotPasswordFormSchema(this.config);
 
       this.form.update({
         validators: {

packages/angular/src/lib/auth/forms/phone-form/phone-form.component.ts

@@ -31,6 +31,7 @@ import {
   formatPhoneNumberWithCountry,
   confirmPhoneNumber,
   signInWithPhoneNumber,
+  FirebaseUIConfiguration,
 } from "@firebase-ui/core";
 import { interval, Subscription, firstValueFrom } from "rxjs";
 import { Router } from "@angular/router";
@@ -102,7 +103,7 @@ export class PhoneNumberFormComponent implements OnInit, OnDestroy {
   recaptchaVerifier: RecaptchaVerifier | null = null;
   selectedCountry: CountryData = countryData[0];
   private formSchema: any;
-  private config: any;
+  private config: FirebaseUIConfiguration;
 
   form = injectForm({
     defaultValues: {
@@ -114,7 +115,7 @@ export class PhoneNumberFormComponent implements OnInit, OnDestroy {
     try {
       this.config = await firstValueFrom(this.ui.config());
 
-      this.formSchema = createPhoneFormSchema(this.config?.translations).pick({
+      this.formSchema = createPhoneFormSchema(this.config).pick({
         phoneNumber: true,
       });
 

packages/angular/src/lib/auth/forms/register-form/register-form.component.ts

@@ -24,6 +24,7 @@ import {
   EmailFormSchema,
   FirebaseUIError,
   createUserWithEmailAndPassword,
+  FirebaseUIConfiguration,
 } from "@firebase-ui/core";
 import { Auth } from "@angular/fire/auth";
 import { TermsAndPrivacyComponent } from "../../../components/terms-and-privacy/terms-and-privacy.component";
@@ -105,7 +106,7 @@ export class RegisterFormComponent implements OnInit {
 
   formError: string | null = null;
   private formSchema: any;
-  private config: any;
+  private config: FirebaseUIConfiguration;
 
   form = injectForm({
     defaultValues: {
@@ -118,7 +119,7 @@ export class RegisterFormComponent implements OnInit {
     try {
       this.config = await firstValueFrom(this.ui.config());
 
-      this.formSchema = createEmailFormSchema(this.config?.translations);
+      this.formSchema = createEmailFormSchema(this.config);
 
       this.form.update({
         validators: {

packages/angular/tsconfig.lib.json

@@ -7,7 +7,12 @@
     "declaration": true,
     "declarationMap": true,
     "inlineSources": true,
-    "types": []
+    "types": [],
+    "baseUrl": ".",
+    "paths": {
+      "@firebase-ui/core": ["../core/src/index.ts"],
+      "@firebase-ui/translations": ["../translations/src/index.ts"]
+    }
   },
   "exclude": ["**/*.spec.ts"]
 }

packages/core/src/config.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { english, Locale, RegisteredTranslations, TranslationsConfig } from "@firebase-ui/translations";
+import { enUs, RegisteredLocale } from "@firebase-ui/translations";
 import type { FirebaseApp } from "firebase/app";
 import { Auth, getAuth } from "firebase/auth";
 import { deepMap, DeepMapStore, map } from "nanostores";
@@ -23,20 +23,18 @@ import { FirebaseUIState } from "./state";
 
 type FirebaseUIConfigurationOptions = {
   app: FirebaseApp;
-  locale?: Locale | undefined;
-  translations?: RegisteredTranslations[] | undefined;
-  behaviors?: Partial<Behavior<keyof BehaviorHandlers>>[] | undefined;
-  recaptchaMode?: "normal" | "invisible" | undefined;
+  locale?: RegisteredLocale;
+  behaviors?: Partial<Behavior<keyof BehaviorHandlers>>[];
+  recaptchaMode?: "normal" | "invisible";
 };
 
 export type FirebaseUIConfiguration = {
   app: FirebaseApp;
   getAuth: () => Auth;
-  setLocale: (locale: Locale) => void;
+  setLocale: (locale: RegisteredLocale) => void;
   state: FirebaseUIState;
   setState: (state: FirebaseUIState) => void;
-  locale: Locale;
-  translations: TranslationsConfig;
+  locale: RegisteredLocale;
   behaviors: Partial<Record<BehaviorKey, BehaviorHandlers[BehaviorKey]>>;
   recaptchaMode: "normal" | "invisible";
 };
@@ -57,25 +55,13 @@ export function initializeUI(config: FirebaseUIConfigurationOptions, name: strin
     {} as Record<BehaviorKey, BehaviorHandlers[BehaviorKey]>
   );
 
-  config.translations ??= [];
-
-  // TODO: Is this right?
-  config.translations.push(english);
-
-  const translations = config.translations?.reduce((acc, translation) => {
-    return {
-      ...acc,
-      [translation.locale]: translation.translations,
-    };
-  }, {} as TranslationsConfig);
-
   $config.setKey(
     name,
     deepMap<FirebaseUIConfiguration>({
       app: config.app,
       getAuth: () => getAuth(config.app),
-      locale: config.locale ?? english.locale,
-      setLocale: (locale: Locale) => {
+      locale: config.locale ?? enUs,
+      setLocale: (locale: RegisteredLocale) => {
         const current = $config.get()[name]!;
         current.setKey(`locale`, locale);
       },
@@ -84,7 +70,6 @@ export function initializeUI(config: FirebaseUIConfigurationOptions, name: strin
         const current = $config.get()[name]!;
         current.setKey(`state`, state);
       },
-      translations,
       behaviors: behaviors ?? {},
       recaptchaMode: config.recaptchaMode ?? "normal",
     })

packages/core/src/errors.ts

@@ -14,22 +14,16 @@
  * limitations under the License.
  */
 
-import {
-  english,
-  ERROR_CODE_MAP,
-  ErrorCode,
-  getTranslation,
-  Locale,
-  TranslationsConfig,
-} from "@firebase-ui/translations";
+import { ERROR_CODE_MAP, ErrorCode } from "@firebase-ui/translations";
+import { getTranslation } from "./translations";
 import { FirebaseUIConfiguration } from "./config";
 export class FirebaseUIError extends Error {
   code: string;
 
-  constructor(error: any, translations?: TranslationsConfig, locale?: Locale) {
+  constructor(error: any, ui: FirebaseUIConfiguration) {
     const errorCode: ErrorCode = error?.customData?.message?.match?.(/\(([^)]+)\)/)?.at(1) || error?.code || "unknown";
     const translationKey = ERROR_CODE_MAP[errorCode] || "unknownError";
-    const message = getTranslation("errors", translationKey, translations, locale ?? english.locale);
+    const message = getTranslation(ui, "errors", translationKey);
 
     super(message);
     this.name = "FirebaseUIError";
@@ -44,7 +38,6 @@ export function handleFirebaseError(
     enableHandleExistingCredential?: boolean;
   }
 ): never {
-  const { translations, locale: defaultLocale } = ui;
   if (error?.code === "auth/account-exists-with-different-credential") {
     if (opts?.enableHandleExistingCredential && error.credential) {
       window.sessionStorage.setItem("pendingCred", JSON.stringify(error.credential));
@@ -59,14 +52,13 @@ export function handleFirebaseError(
           email: error.customData?.email,
         },
       },
-      translations,
-      defaultLocale
+      ui,
     );
   }
 
   // TODO: Debug why instanceof FirebaseError is not working
   if (error?.name === "FirebaseError") {
-    throw new FirebaseUIError(error, translations, defaultLocale);
+    throw new FirebaseUIError(error, ui);
   }
-  throw new FirebaseUIError({ code: "unknown" }, translations, defaultLocale);
+  throw new FirebaseUIError({ code: "unknown" }, ui);
 }