expand use of setStateProperty to all cases

Author: hsubox76

packages/app-check/src/api.ts

@@ -23,7 +23,7 @@ import {
   PartialObserver
 } from './public-types';
 import { ERROR_FACTORY, AppCheckError } from './errors';
-import { getState, setState, AppCheckState, getDebugState } from './state';
+import { getState, setState, AppCheckState, getDebugState, setStateProperty } from './state';
 import { FirebaseApp, getApp, _getProvider } from '@firebase/app';
 import { getModularInstance, ErrorFn, NextFn } from '@firebase/util';
 import { AppCheckService } from './factory';
@@ -134,7 +134,7 @@ function _activate(
   newState.provider = provider; // Read cached token from storage if it exists and store it in memory.
   newState.cachedTokenPromise = readTokenFromStorage(app).then(cachedToken => {
     if (cachedToken && isValid(cachedToken)) {
-      setState(app, { ...getState(app), token: cachedToken });
+      setStateProperty(app, 'token', cachedToken);
       // notify all listeners with the cached token
       notifyTokenListeners(app, { token: cachedToken.token });
     }
@@ -178,7 +178,7 @@ export function setTokenAutoRefreshEnabled(
       state.tokenRefresher.stop();
     }
   }
-  setState(app, { ...state, isTokenAutoRefreshEnabled });
+  setStateProperty(app, 'isTokenAutoRefreshEnabled', isTokenAutoRefreshEnabled);
 }
 /**
  * Get the current App Check token. Attaches to the most recent

packages/app-check/src/recaptcha.ts

@@ -16,7 +16,7 @@
  */
 
 import { FirebaseApp } from '@firebase/app';
-import { getState, setState } from './state';
+import { getState, setStateProperty } from './state';
 import { Deferred } from '@firebase/util';
 import { getRecaptcha, ensureActivated } from './util';
 
@@ -28,10 +28,9 @@ export function initializeV3(
   app: FirebaseApp,
   siteKey: string
 ): Promise<GreCAPTCHA> {
-  const state = getState(app);
   const initialized = new Deferred<GreCAPTCHA>();
 
-  setState(app, { ...state, reCAPTCHAState: { initialized } });
+  setStateProperty(app, 'reCAPTCHAState', { initialized });
   const divId = makeDiv(app);
 
   const grecaptcha = getRecaptcha(false);
@@ -54,10 +53,9 @@ export function initializeEnterprise(
   app: FirebaseApp,
   siteKey: string
 ): Promise<GreCAPTCHA> {
-  const state = getState(app);
   const initialized = new Deferred<GreCAPTCHA>();
 
-  setState(app, { ...state, reCAPTCHAState: { initialized } });
+  setStateProperty(app, 'reCAPTCHAState', { initialized });
   const divId = makeDiv(app);
 
   const grecaptcha = getRecaptcha(true);
@@ -148,12 +146,9 @@ function renderInvisibleWidget(
 
   const state = getState(app);
 
-  setState(app, {
-    ...state,
-    reCAPTCHAState: {
-      ...state.reCAPTCHAState!, // state.reCAPTCHAState is set in the initialize()
-      widgetId
-    }
+  setStateProperty(app, 'reCAPTCHAState', {
+    ...state.reCAPTCHAState!, // state.reCAPTCHAState is set in the initialize()
+    widgetId
   });
 }