@firebase/app-check 0.12.0 → 0.13.0

package/dist/app-check-public.d.ts

@@ -37,7 +37,7 @@ export declare interface AppCheckOptions {
     /**
      * A reCAPTCHA V3 provider, reCAPTCHA Enterprise provider, or custom provider.
      */
-    provider?: CustomProvider | ReCaptchaV3Provider | ReCaptchaEnterpriseProvider;
+    provider: CustomProvider | ReCaptchaV3Provider | ReCaptchaEnterpriseProvider;
     /**
      * If set to true, enables automatic background refresh of App Check token.
      */
@@ -144,9 +144,7 @@ export declare function getToken(appCheckInstance: AppCheck, forceRefresh?: bool
  * @param options - App Check initialization options
  * @public
  */
-export declare function initializeAppCheck(app?: FirebaseApp, options?: AppCheckOptions): AppCheck;
-
-/* Excluded from this release type: _initializeAppCheckInternal */
+export declare function initializeAppCheck(app: FirebaseApp | undefined, options: AppCheckOptions): AppCheck;
 
 /**
  * Registers a listener to changes in the token state. There can be more

package/dist/app-check.d.ts

@@ -43,7 +43,7 @@ export declare interface AppCheckOptions {
     /**
      * A reCAPTCHA V3 provider, reCAPTCHA Enterprise provider, or custom provider.
      */
-    provider?: CustomProvider | ReCaptchaV3Provider | ReCaptchaEnterpriseProvider;
+    provider: CustomProvider | ReCaptchaV3Provider | ReCaptchaEnterpriseProvider;
     /**
      * If set to true, enables automatic background refresh of App Check token.
      */
@@ -166,15 +166,7 @@ export declare function getToken(appCheckInstance: AppCheck, forceRefresh?: bool
  * @param options - App Check initialization options
  * @public
  */
-export declare function initializeAppCheck(app?: FirebaseApp, options?: AppCheckOptions): AppCheck;
-
-/**
- * Internal wrapper that sets a state variable flagging that this was
- * initialized under the hood by a product SDK.
- *
- * @internal
- */
-export declare function _initializeAppCheckInternal(initializerName: string, app?: FirebaseApp, options?: AppCheckOptions): AppCheck;
+export declare function initializeAppCheck(app: FirebaseApp | undefined, options: AppCheckOptions): AppCheck;
 
 /**
  * Registers a listener to changes in the token state. There can be more

package/dist/esm/index.esm.js

@@ -67,11 +67,6 @@ const EXCHANGE_RECAPTCHA_TOKEN_METHOD = 'exchangeRecaptchaV3Token';
 const EXCHANGE_RECAPTCHA_ENTERPRISE_TOKEN_METHOD = 'exchangeRecaptchaEnterpriseToken';
 const EXCHANGE_DEBUG_TOKEN_METHOD = 'exchangeDebugToken';
 const TOKEN_REFRESH_TIME = {
-    /**
-     * The offset time before token natural expiration to run the refresh.
-     * This is currently 5 minutes.
-     */
-    OFFSET_DURATION: 5 * 60 * 1000,
     /**
      * This is the first retrial wait after an error. This is currently
      * 30 seconds.
@@ -222,9 +217,6 @@ const ERRORS = {
         'different options. To avoid this error, call initializeAppCheck() with the ' +
         'same options as when it was originally called. This will return the ' +
         'already initialized instance.',
-    ["already-internally-initialized" /* AppCheckError.ALREADY_INTERNALLY_INITIALIZED */]: 'App Check has already been automatically initialized by {$initializerName} ' +
-        'with default options. If you want to initialize App Check with custom options, ' +
-        'call initializeAppCheck() with those options before initializing {$initializerName}.',
     ["use-before-activation" /* AppCheckError.USE_BEFORE_ACTIVATION */]: 'App Check is being used before initializeAppCheck() is called for FirebaseApp {$appName}. ' +
         'Call initializeAppCheck() before instantiating other Firebase services.',
     ["fetch-network-error" /* AppCheckError.FETCH_NETWORK_ERROR */]: 'Fetch failed to connect to a network. Check Internet connection. ' +
@@ -236,8 +228,6 @@ const ERRORS = {
     ["storage-get" /* AppCheckError.STORAGE_GET */]: 'Error thrown when reading from storage. Original error: {$originalErrorMessage}.',
     ["storage-set" /* AppCheckError.STORAGE_WRITE */]: 'Error thrown when writing to storage. Original error: {$originalErrorMessage}.',
     ["recaptcha-error" /* AppCheckError.RECAPTCHA_ERROR */]: 'ReCAPTCHA error.',
-    ["no-provider" /* AppCheckError.NO_PROVIDER */]: 'No attestation provider was passed to initializeAppCheck() and ' +
-        'no ReCAPTCHA Enterprise site key was found in the Firebase config.',
     ["initial-throttle" /* AppCheckError.INITIAL_THROTTLE */]: `{$httpStatus} error. Attempts allowed again after {$time}`,
     ["throttled" /* AppCheckError.THROTTLED */]: `Requests throttled due to previous {$httpStatus} error. Attempts allowed again after {$time}`
 };
@@ -1058,7 +1048,7 @@ function internalFactory(appCheck) {
 }
 
 const name = "@firebase/app-check";
-const version = "0.12.0";
+const version = "0.13.0";
 
 /**
  * @license
@@ -1497,6 +1487,7 @@ function throwIfThrottled(throttleData) {
  */
 function initializeAppCheck(app = getApp(), options) {
     app = getModularInstance(app);
+    const provider = _getProvider(app, 'app-check');
     // Ensure initializeDebugMode() is only called once.
     if (!getDebugState().initialized) {
         initializeDebugMode();
@@ -1509,53 +1500,23 @@ function initializeAppCheck(app = getApp(), options) {
         // Not using logger because I don't think we ever want this accidentally hidden.
         console.log(`App Check debug token: ${token}. You will need to add it to your app's App Check settings in the Firebase console for it to work.`));
     }
-    let defaultProvider;
-    /**
-     * If user did not pass a provider, look for site key in project
-     * config and create a default ReCaptchaEnterpriseProvider with it.
-     */
-    if (!options?.provider && app.options.recaptchaSiteKey) {
-        defaultProvider = new ReCaptchaEnterpriseProvider(app.options.recaptchaSiteKey);
-    }
-    /**
-     * If there's no passed provider and no siteKey in project config,
-     * throw.
-     */
-    if (!options?.provider && !defaultProvider) {
-        throw ERROR_FACTORY.create("no-provider" /* AppCheckError.NO_PROVIDER */);
-    }
-    const initOptions = {
-        ...options,
-        provider: options?.provider || defaultProvider
-    };
-    const componentProvider = _getProvider(app, 'app-check');
-    if (componentProvider.isInitialized()) {
-        const existingInstance = componentProvider.getImmediate();
-        const existingOptions = componentProvider.getOptions();
-        /**
-         * Check if all AppCheckOptions previously passed to initializeAppCheck
-         * (`isTokenAutoRefreshEnabled` and `provider`) match those being passed
-         * now. If so, return previous existing instance. Otherwise throw error.
-         */
-        if (existingOptions.isTokenAutoRefreshEnabled ===
-            initOptions.isTokenAutoRefreshEnabled &&
-            existingOptions.provider?.isEqual(initOptions.provider)) {
+    if (provider.isInitialized()) {
+        const existingInstance = provider.getImmediate();
+        const initialOptions = provider.getOptions();
+        if (initialOptions &&
+            !!initialOptions.isTokenAutoRefreshEnabled ===
+                !!options.isTokenAutoRefreshEnabled &&
+            initialOptions.provider?.isEqual(options.provider)) {
             return existingInstance;
         }
         else {
-            if (typeof getStateReference(app).internallyInitializedBy === 'string') {
-                throw ERROR_FACTORY.create("already-internally-initialized" /* AppCheckError.ALREADY_INTERNALLY_INITIALIZED */, {
-                    initializerName: getStateReference(app)
-                        .internallyInitializedBy
-                });
-            }
             throw ERROR_FACTORY.create("already-initialized" /* AppCheckError.ALREADY_INITIALIZED */, {
                 appName: app.name
             });
         }
     }
-    const appCheck = componentProvider.initialize({ options: initOptions });
-    _activate(app, initOptions.provider, initOptions.isTokenAutoRefreshEnabled);
+    const appCheck = provider.initialize({ options });
+    _activate(app, options.provider, options.isTokenAutoRefreshEnabled);
     // If isTokenAutoRefreshEnabled is false, do not send any requests to the
     // exchange endpoint without an explicit call from the user either directly
     // or through another Firebase library (storage, functions, etc.)
@@ -1569,29 +1530,6 @@ function initializeAppCheck(app = getApp(), options) {
     }
     return appCheck;
 }
-/**
- * Internal wrapper that sets a state variable flagging that this was
- * initialized under the hood by a product SDK.
- *
- * @internal
- */
-function _initializeAppCheckInternal(
-// String to be used in error message if there is a future conflict.
-// Example: "Firebase AI Logic"
-initializerName, app = getApp(), options) {
-    const componentProvider = _getProvider(app, 'app-check');
-    const previouslyInitialized = componentProvider.isInitialized();
-    if (previouslyInitialized) {
-        // Product SDKs should accept any previously initialized
-        // App Check configuration without error.
-        return componentProvider.getImmediate();
-    }
-    else {
-        const appCheck = initializeAppCheck(app, options);
-        getStateReference(app).internallyInitializedBy = initializerName;
-        return appCheck;
-    }
-}
 /**
  * Activate App Check
  * @param app - Firebase app to activate App Check for.
@@ -1732,6 +1670,22 @@ onCompletion) {
  *
  * @packageDocumentation
  */
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 const APP_CHECK_NAME = 'app-check';
 const APP_CHECK_NAME_INTERNAL = 'app-check-internal';
 function registerAppCheck() {
@@ -1759,5 +1713,5 @@ function registerAppCheck() {
 }
 registerAppCheck();
 
-export { CustomProvider, ReCaptchaEnterpriseProvider, ReCaptchaV3Provider, _initializeAppCheckInternal, getLimitedUseToken, getToken, initializeAppCheck, onTokenChanged, setTokenAutoRefreshEnabled };
+export { CustomProvider, ReCaptchaEnterpriseProvider, ReCaptchaV3Provider, getLimitedUseToken, getToken, initializeAppCheck, onTokenChanged, setTokenAutoRefreshEnabled };
 //# sourceMappingURL=index.esm.js.map