Skip to content

Commit 3485eed

Browse files
authored
fix(*): Rename FirebaseUIConfiguration -> FirebaseUI
fix(*): Rename FirebaseUIConfiguration -> FirebaseUI
2 parents c341c78 + fb9504c commit 3485eed

File tree

24 files changed

+98
-135
lines changed

24 files changed

+98
-135
lines changed

README.md

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -202,12 +202,11 @@ The initializeUI function accepts an options object that allows you to customize
202202
### Type Definition
203203

204204
```js
205-
type FirebaseUIConfigurationOptions = {
205+
type FirebaseUIOptions = {
206206
app: FirebaseApp;
207-
locale?: Locale | undefined;
208-
translations?: RegisteredTranslations[] | undefined;
209-
behaviors?: Partial<Behavior<keyof BehaviorHandlers>>[] | undefined;
210-
recaptchaMode?: 'normal' | 'invisible' | undefined;
207+
auth?: Auth;
208+
locale?: Locale;
209+
behaviors?: Behavior<any>[];
211210
};
212211
```
213212

@@ -290,7 +289,7 @@ const ui = initializeUI({
290289
Configuration Type:
291290

292291
```js
293-
type FirebaseUIConfigurationOptions = {
292+
type FirebaseUIOptions = {
294293
app: FirebaseApp;
295294
locale?: Locale | undefined;
296295
translations?: RegisteredTranslations[] | undefined;
@@ -303,61 +302,61 @@ type FirebaseUIConfigurationOptions = {
303302

304303
**signInWithEmailAndPassword**: Signs in the user based on an email/password credential.
305304

306-
- _ui_: FirebaseUIConfiguration
305+
- _ui_: FirebaseUI
307306
- _email_: string
308307
- _password_: string
309308

310309
**createUserWithEmailAndPassword**: Creates a user account based on an email/password credential.
311310

312-
- _ui_: FirebaseUIConfiguration
311+
- _ui_: FirebaseUI
313312
- _email_: string
314313
- _password_: string
315314

316315
**signInWithPhoneNumber**: Signs in the user based on a provided phone number, using ReCaptcha to verify the sign-in.
317316

318-
- _ui_: FirebaseUIConfiguration
317+
- _ui_: FirebaseUI
319318
- _phoneNumber_: string
320319
- _recaptchaVerifier_: string
321320

322321
**confirmPhoneNumber**: Verifies the phonenumber credential and signs in the user.
323322

324-
- _ui_: FirebaseUIConfiguration
323+
- _ui_: FirebaseUI
325324
- _confirmationResult_: [ConfirmationResult](https://firebase.google.com/docs/reference/node/firebase.auth.ConfirmationResult)
326325
- _verificationCode_: string
327326

328327
**sendPasswordResetEmail**: Sends password reset instructions to an email account.
329328

330-
- _ui_: FirebaseUIConfiguration
329+
- _ui_: FirebaseUI
331330
- _email_: string
332331

333332
**sendSignInLinkToEmail**: Send an sign-in links to an email account.
334333

335-
- _ui_: FirebaseUIConfiguration
334+
- _ui_: FirebaseUI
336335
- _email_: string
337336

338337
**signInWithEmailLink**: Signs in with the user with the email link. If `autoUpgradeAnonymousCredential` then a pending credential will be handled.
339338

340-
- _ui_: FirebaseUIConfiguration
339+
- _ui_: FirebaseUI
341340
- _email_: string
342341
- _link_: string
343342

344343
**signInAnonymously**: Signs in as an anonymous user.
345344

346-
- _ui_: FirebaseUIConfiguration
345+
- _ui_: FirebaseUI
347346

348347
**signInWithOAuth**: Signs in with a provider such as Google via a redirect link. If `autoUpgradeAnonymousCredential` then the account will upgraded.
349348

350-
- _ui_: FirebaseUIConfiguration
349+
- _ui_: FirebaseUI
351350
- _provider_: [AuthProvider](https://firebase.google.com/docs/reference/node/firebase.auth.AuthProvider)
352351

353352
**completeEmailLinkSignIn**: Completes the signing process based on a user signing in with an email link.
354353

355-
- _ui_: FirebaseUIConfiguration
354+
- _ui_: FirebaseUI
356355
- _currentUrl_: string
357356

358357
#### Provide a Store via Context
359358

360-
Using the returned `FirebaseUIConfiguration`, it is reccomended to use local context/providers/dependency-injection to expose the FirebaseUIConfiguration to the application. Here is an example context wrapper which accepts the configuration as a `ui` parameter:
359+
Using the returned `FirebaseUI`, it is reccomended to use local context/providers/dependency-injection to expose the FirebaseUI to the application. Here is an example context wrapper which accepts the configuration as a `ui` parameter:
361360

362361
```js
363362
/** Creates a framework-agnostic context for Firebase UI configuration **/
@@ -391,7 +390,7 @@ export function createFirebaseUIContext(initialConfig) {
391390
FirebaseUI Configuration Type:
392391

393392
```js
394-
export type FirebaseUIConfiguration = {
393+
export type FirebaseUI = {
395394
app: FirebaseApp,
396395
getAuth: () => Auth,
397396
setLocale: (locale: Locale) => void,
@@ -556,7 +555,7 @@ The core library provides a function for handling errors.
556555

557556
```js
558557
export function handleFirebaseError(
559-
ui: FirebaseUIConfiguration,
558+
ui: FirebaseUI,
560559
error: any,
561560
opts?: {
562561
enableHandleExistingCredential?: boolean;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {
2525
FirebaseUIError,
2626
completeEmailLinkSignIn,
2727
sendSignInLinkToEmail,
28-
FirebaseUIConfiguration,
28+
FirebaseUI,
2929
} from "@firebase-ui/core";
3030
import { firstValueFrom } from "rxjs";
3131

@@ -75,7 +75,7 @@ export class EmailLinkFormComponent implements OnInit {
7575
formError: string | null = null;
7676
emailSent = false;
7777
private formSchema: any;
78-
private config: FirebaseUIConfiguration;
78+
private config: FirebaseUI;
7979

8080
form = injectForm({
8181
defaultValues: {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { TermsAndPrivacyComponent } from "../../../components/terms-and-privacy/
2323
import {
2424
createEmailFormSchema,
2525
EmailFormSchema,
26-
FirebaseUIConfiguration,
26+
FirebaseUI,
2727
FirebaseUIError,
2828
signInWithEmailAndPassword,
2929
} from "@firebase-ui/core";
@@ -111,7 +111,7 @@ export class EmailPasswordFormComponent implements OnInit {
111111

112112
formError: string | null = null;
113113
private formSchema: any;
114-
private config: FirebaseUIConfiguration;
114+
private config: FirebaseUI;
115115

116116
form = injectForm({
117117
defaultValues: {

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,7 @@ import { FirebaseUI } from "../../../provider";
2121
import { Auth } from "@angular/fire/auth";
2222
import { ButtonComponent } from "../../../components/button/button.component";
2323
import { TermsAndPrivacyComponent } from "../../../components/terms-and-privacy/terms-and-privacy.component";
24-
import {
25-
createForgotPasswordFormSchema,
26-
FirebaseUIConfiguration,
27-
FirebaseUIError,
28-
sendPasswordResetEmail,
29-
} from "@firebase-ui/core";
24+
import { createForgotPasswordFormSchema, FirebaseUI, FirebaseUIError, sendPasswordResetEmail } from "@firebase-ui/core";
3025
import { firstValueFrom } from "rxjs";
3126
import { Router } from "@angular/router";
3227

@@ -85,7 +80,7 @@ export class ForgotPasswordFormComponent implements OnInit {
8580
formError: string | null = null;
8681
emailSent = false;
8782
private formSchema: any;
88-
private config: FirebaseUIConfiguration;
83+
private config: FirebaseUI;
8984

9085
form = injectForm({
9186
defaultValues: {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import {
3131
formatPhoneNumberWithCountry,
3232
confirmPhoneNumber,
3333
signInWithPhoneNumber,
34-
FirebaseUIConfiguration,
34+
FirebaseUI,
3535
} from "@firebase-ui/core";
3636
import { interval, Subscription, firstValueFrom } from "rxjs";
3737
import { Router } from "@angular/router";
@@ -103,7 +103,7 @@ export class PhoneNumberFormComponent implements OnInit, OnDestroy {
103103
recaptchaVerifier: RecaptchaVerifier | null = null;
104104
selectedCountry: CountryData = countryData[0];
105105
private formSchema: any;
106-
private config: FirebaseUIConfiguration;
106+
private config: FirebaseUI;
107107

108108
form = injectForm({
109109
defaultValues: {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import {
2424
EmailFormSchema,
2525
FirebaseUIError,
2626
createUserWithEmailAndPassword,
27-
FirebaseUIConfiguration,
27+
FirebaseUI,
2828
} from "@firebase-ui/core";
2929
import { Auth } from "@angular/fire/auth";
3030
import { TermsAndPrivacyComponent } from "../../../components/terms-and-privacy/terms-and-privacy.component";
@@ -106,7 +106,7 @@ export class RegisterFormComponent implements OnInit {
106106

107107
formError: string | null = null;
108108
private formSchema: any;
109-
private config: FirebaseUIConfiguration;
109+
private config: FirebaseUI;
110110

111111
form = injectForm({
112112
defaultValues: {

packages/core/src/auth.ts

Lines changed: 14 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ import {
3333
type PhoneInfoOptions,
3434
} from "firebase/auth";
3535
import QRCode from "qrcode-generator";
36-
import { type FirebaseUIConfiguration } from "./config";
36+
import { type FirebaseUI } from "./config";
3737
import { handleFirebaseError } from "./errors";
3838
import { hasBehavior, getBehavior } from "./behaviors/index";
3939
import { FirebaseError } from "firebase/app";
4040
import { getTranslation } from "./translations";
4141

42-
async function handlePendingCredential(_ui: FirebaseUIConfiguration, user: UserCredential): Promise<UserCredential> {
42+
async function handlePendingCredential(_ui: FirebaseUI, user: UserCredential): Promise<UserCredential> {
4343
const pendingCredString = window.sessionStorage.getItem("pendingCred");
4444
if (!pendingCredString) return user;
4545

@@ -55,7 +55,7 @@ async function handlePendingCredential(_ui: FirebaseUIConfiguration, user: UserC
5555
}
5656

5757
export async function signInWithEmailAndPassword(
58-
ui: FirebaseUIConfiguration,
58+
ui: FirebaseUI,
5959
email: string,
6060
password: string
6161
): Promise<UserCredential> {
@@ -81,7 +81,7 @@ export async function signInWithEmailAndPassword(
8181
}
8282

8383
export async function createUserWithEmailAndPassword(
84-
ui: FirebaseUIConfiguration,
84+
ui: FirebaseUI,
8585
email: string,
8686
password: string,
8787
displayName?: string
@@ -121,7 +121,7 @@ export async function createUserWithEmailAndPassword(
121121
}
122122

123123
export async function verifyPhoneNumber(
124-
ui: FirebaseUIConfiguration,
124+
ui: FirebaseUI,
125125
phoneNumber: PhoneInfoOptions | string,
126126
appVerifier: ApplicationVerifier
127127
): Promise<string> {
@@ -137,7 +137,7 @@ export async function verifyPhoneNumber(
137137
}
138138

139139
export async function confirmPhoneNumber(
140-
ui: FirebaseUIConfiguration,
140+
ui: FirebaseUI,
141141
verificationId: string,
142142
verificationCode: string
143143
): Promise<UserCredential> {
@@ -163,7 +163,7 @@ export async function confirmPhoneNumber(
163163
}
164164
}
165165

166-
export async function sendPasswordResetEmail(ui: FirebaseUIConfiguration, email: string): Promise<void> {
166+
export async function sendPasswordResetEmail(ui: FirebaseUI, email: string): Promise<void> {
167167
try {
168168
ui.setState("pending");
169169
await _sendPasswordResetEmail(ui.auth, email);
@@ -174,7 +174,7 @@ export async function sendPasswordResetEmail(ui: FirebaseUIConfiguration, email:
174174
}
175175
}
176176

177-
export async function sendSignInLinkToEmail(ui: FirebaseUIConfiguration, email: string): Promise<void> {
177+
export async function sendSignInLinkToEmail(ui: FirebaseUI, email: string): Promise<void> {
178178
try {
179179
ui.setState("pending");
180180
const actionCodeSettings = {
@@ -193,19 +193,12 @@ export async function sendSignInLinkToEmail(ui: FirebaseUIConfiguration, email:
193193
}
194194
}
195195

196-
export async function signInWithEmailLink(
197-
ui: FirebaseUIConfiguration,
198-
email: string,
199-
link: string
200-
): Promise<UserCredential> {
196+
export async function signInWithEmailLink(ui: FirebaseUI, email: string, link: string): Promise<UserCredential> {
201197
const credential = EmailAuthProvider.credentialWithLink(email, link);
202198
return signInWithCredential(ui, credential);
203199
}
204200

205-
export async function signInWithCredential(
206-
ui: FirebaseUIConfiguration,
207-
credential: AuthCredential
208-
): Promise<UserCredential> {
201+
export async function signInWithCredential(ui: FirebaseUI, credential: AuthCredential): Promise<UserCredential> {
209202
try {
210203
ui.setState("pending");
211204
if (hasBehavior(ui, "autoUpgradeAnonymousCredential")) {
@@ -227,7 +220,7 @@ export async function signInWithCredential(
227220
}
228221
}
229222

230-
export async function signInAnonymously(ui: FirebaseUIConfiguration): Promise<UserCredential> {
223+
export async function signInAnonymously(ui: FirebaseUI): Promise<UserCredential> {
231224
try {
232225
ui.setState("pending");
233226
const result = await _signInAnonymously(ui.auth);
@@ -239,10 +232,7 @@ export async function signInAnonymously(ui: FirebaseUIConfiguration): Promise<Us
239232
}
240233
}
241234

242-
export async function signInWithProvider(
243-
ui: FirebaseUIConfiguration,
244-
provider: AuthProvider
245-
): Promise<UserCredential | never> {
235+
export async function signInWithProvider(ui: FirebaseUI, provider: AuthProvider): Promise<UserCredential | never> {
246236
try {
247237
ui.setState("pending");
248238
if (hasBehavior(ui, "autoUpgradeAnonymousProvider")) {
@@ -268,10 +258,7 @@ export async function signInWithProvider(
268258
}
269259
}
270260

271-
export async function completeEmailLinkSignIn(
272-
ui: FirebaseUIConfiguration,
273-
currentUrl: string
274-
): Promise<UserCredential | null> {
261+
export async function completeEmailLinkSignIn(ui: FirebaseUI, currentUrl: string): Promise<UserCredential | null> {
275262
try {
276263
if (!_isSignInWithEmailLink(ui.auth, currentUrl)) {
277264
return null;
@@ -291,12 +278,7 @@ export async function completeEmailLinkSignIn(
291278
}
292279
}
293280

294-
export function generateTotpQrCode(
295-
ui: FirebaseUIConfiguration,
296-
secret: TotpSecret,
297-
accountName?: string,
298-
issuer?: string
299-
): string {
281+
export function generateTotpQrCode(ui: FirebaseUI, secret: TotpSecret, accountName?: string, issuer?: string): string {
300282
const currentUser = ui.auth.currentUser;
301283

302284
if (!currentUser) {

packages/core/src/behaviors/anonymous-upgrade.ts

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
import { type AuthCredential, type AuthProvider, linkWithCredential, type UserCredential } from "firebase/auth";
2-
import { type FirebaseUIConfiguration } from "~/config";
2+
import { type FirebaseUI } from "~/config";
33
import { getBehavior } from "~/behaviors";
44

5-
export type OnUpgradeCallback = (
6-
ui: FirebaseUIConfiguration,
7-
oldUserId: string,
8-
credential: UserCredential
9-
) => Promise<void> | void;
5+
export type OnUpgradeCallback = (ui: FirebaseUI, oldUserId: string, credential: UserCredential) => Promise<void> | void;
106

117
export const autoUpgradeAnonymousCredentialHandler = async (
12-
ui: FirebaseUIConfiguration,
8+
ui: FirebaseUI,
139
credential: AuthCredential,
1410
onUpgrade?: OnUpgradeCallback
1511
) => {
@@ -31,7 +27,7 @@ export const autoUpgradeAnonymousCredentialHandler = async (
3127
};
3228

3329
export const autoUpgradeAnonymousProviderHandler = async (
34-
ui: FirebaseUIConfiguration,
30+
ui: FirebaseUI,
3531
provider: AuthProvider,
3632
onUpgrade?: OnUpgradeCallback
3733
) => {
@@ -61,7 +57,7 @@ export const autoUpgradeAnonymousProviderHandler = async (
6157
};
6258

6359
export const autoUpgradeAnonymousUserRedirectHandler = async (
64-
ui: FirebaseUIConfiguration,
60+
ui: FirebaseUI,
6561
credential: UserCredential | null,
6662
onUpgrade?: OnUpgradeCallback
6763
) => {

0 commit comments

Comments
 (0)