Skip to content

Commit ca17c9a

Browse files
committed
Fix AppCheck typings error
1 parent 35865ee commit ca17c9a

File tree

3 files changed

+20
-6
lines changed

3 files changed

+20
-6
lines changed

packages/app-check-types/index.d.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@ export interface FirebaseAppCheck {
3232
* defaults to false and can be set in the app config.
3333
*/
3434
activate(
35-
siteKeyOrProvider: string | AppCheckProvider,
35+
siteKeyOrProvider:
36+
| string
37+
| AppCheckProvider
38+
| CustomProvider
39+
| ReCaptchaV3Provider,
3640
isTokenAutoRefreshEnabled?: boolean
3741
): void;
3842

packages/app-check/src/factory.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
import {
1919
FirebaseAppCheck,
2020
AppCheckProvider,
21-
AppCheckTokenResult
21+
AppCheckTokenResult,
22+
ReCaptchaV3Provider,
23+
CustomProvider
2224
} from '@firebase/app-check-types';
2325
import {
2426
activate,
@@ -33,6 +35,7 @@ import {
3335
addTokenListener,
3436
removeTokenListener
3537
} from './internal-api';
38+
import { ReCaptchaV3Provider as ReCaptchaV3ProviderImpl, CustomProvider as CustomProviderImpl } from './providers';
3639
import { Provider } from '@firebase/component';
3740
import { PartialObserver } from '@firebase/util';
3841

@@ -46,12 +49,15 @@ export function factory(
4649
return {
4750
app,
4851
activate: (
49-
siteKeyOrProvider: AppCheckProvider | string,
52+
siteKeyOrProvider: ReCaptchaV3Provider | CustomProvider | AppCheckProvider | string,
5053
isTokenAutoRefreshEnabled?: boolean
5154
) =>
5255
activate(
5356
app,
54-
siteKeyOrProvider,
57+
// Public types of ReCaptchaV3Provider/CustomProvider don't
58+
// expose getToken() and aren't recognized as the internal
59+
// class version of themselves.
60+
siteKeyOrProvider as (ReCaptchaV3ProviderImpl | CustomProviderImpl |AppCheckProvider | string),
5561
platformLoggerProvider,
5662
isTokenAutoRefreshEnabled
5763
),

packages/firebase/index.d.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1580,14 +1580,18 @@ declare namespace firebase.appCheck {
15801580
export interface AppCheck {
15811581
/**
15821582
* Activate AppCheck
1583-
* @param provider reCAPTCHA or custom token provider.
1583+
* @param provider reCAPTCHA provider, custom token provider, or reCAPTCHA site key.
15841584
* @param isTokenAutoRefreshEnabled If true, the SDK automatically
15851585
* refreshes App Check tokens as needed. If undefined, defaults to the
15861586
* value of `app.automaticDataCollectionEnabled`, which defaults to
15871587
* false and can be set in the app config.
15881588
*/
15891589
activate(
1590-
provider: AppCheckProvider,
1590+
provider:
1591+
| ReCaptchaV3Provider
1592+
| CustomProvider
1593+
| AppCheckProvider
1594+
| string,
15911595
isTokenAutoRefreshEnabled?: boolean
15921596
): void;
15931597

0 commit comments

Comments
 (0)