department-of-veterans-affairs · Sparowhawk · Mar 15, 2024 · Mar 19, 2024 · Mar 20, 2024 · Mar 20, 2024
@@ -1425,7 +1425,7 @@ PODS:
     - React-Core
   - react-native-safe-area-context (4.10.9):
     - React-Core
-  - react-native-webview (13.10.4):
+  - react-native-webview (13.12.3):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1763,9 +1763,28 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - RNKeychain (8.2.0):
+  - RNKeychain (9.1.0):
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTRequired
+    - RCTTypeSafety
     - React-Core
-  - RNLocalize (3.2.1):
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - Yoga
+  - RNLocalize (3.3.0):
     - React-Core
   - RNReactNativeHapticFeedback (2.3.3):
     - DoubleConversion
@@ -2121,7 +2140,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   boost: 4cb898d0bf20404aab1850c656dcea009429d6c1
-  DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
+  DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5
   FBLazyVector: 7b438dceb9f904bd85ca3c31d64cce32a035472b
   Firebase: 10c8cb12fb7ad2ae0c09ffc86cd9c1ab392a0031
   FirebaseABTesting: d87f56707159bae64e269757a6e963d490f2eebe
@@ -2137,7 +2156,7 @@ SPEC CHECKSUMS:
   FirebaseSessions: dbd14adac65ce996228652c1fc3a3f576bdf3ecc
   FirebaseSharedSwift: 20530f495084b8d840f78a100d8c5ee613375f6e
   fmt: 4c2741a687cc09f0634a2e2c72a838b99f1ff120
-  glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
+  glog: 69ef571f3de08433d766d614c73a9838a06bf7eb
   GoogleAppMeasurement: bb3c564c3efb933136af0e94899e0a46167466a8
   GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
   GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
@@ -2184,7 +2203,7 @@ SPEC CHECKSUMS:
   react-native-image-picker: 2fbbafdae7a7c6db9d25df2f2b1db4442d2ca2ad
   react-native-notifications: 4601a5a8db4ced6ae7cfc43b44d35fe437ac50c4
   react-native-safe-area-context: ab8f4a3d8180913bd78ae75dd599c94cce3d5e9a
-  react-native-webview: fbafd1591cd068bd599f0d1afb0ddc19718908fa
+  react-native-webview: 926d2665cf3196e39c4449a72d136d0a53b9df8a
   React-nativeconfig: 4a9543185905fe41014c06776bf126083795aed9
   React-NativeModulesApple: 0506da59fc40d2e1e6e12a233db5e81c46face27
   React-perflogger: 3bbb82f18e9ac29a1a6931568e99d6305ef4403b
@@ -2222,16 +2241,16 @@ SPEC CHECKSUMS:
   RNFBRemoteConfig: bfb9f6a04a0269038a352d8386e5c77f4ff98125
   RNFileViewer: ce7ca3ac370e18554d35d6355cffd7c30437c592
   RNGestureHandler: 939f21fabf5d45a725c0bf175eb819dd25cf2e70
-  RNKeychain: bfe3d12bf4620fe488771c414530bf16e88f3678
-  RNLocalize: 4f22418187ecd5ca693231093ff1d912d1b3c9bc
+  RNKeychain: 958a200b26c2df5036222105550290ac0ed98c90
+  RNLocalize: 298e85ce16540a11de40c1a588ead39fc5e9a072
   RNReactNativeHapticFeedback: 0d591ea1e150f36cb96d868d4e8d77272243d78a
   RNScreens: 19719a9c326e925498ac3b2d35c4e50fe87afc06
   RNSVG: 963a95f1f5d512a13d11ffd50d351c87fb5c6890
   SDWebImage: 8a6b7b160b4d710e2a22b6900e25301075c34cb3
   SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
   SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
-  Yoga: 1354c027ab07c7736f99a3bef16172d6f1b12b47
+  Yoga: 4ef80d96a5534f0e01b3055f17d1e19a9fc61b63
 
 PODFILE CHECKSUM: 528e5ac3a06c35c8645d8271610e36fdcca33735
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2
@@ -495,6 +495,7 @@
 				"${PODS_CONFIGURATION_BUILD_DIR}/React-cxxreact/React-cxxreact_privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/boost/boost_privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/glog/glog_privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/react-native-blob-util/ReactNativeBlobUtilPrivacyInfo.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
@@ -512,6 +513,7 @@
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-cxxreact_privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SDWebImage.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/boost_privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/glog_privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ReactNativeBlobUtilPrivacyInfo.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -552,6 +554,7 @@
 				"${PODS_CONFIGURATION_BUILD_DIR}/React-cxxreact/React-cxxreact_privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/boost/boost_privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/glog/glog_privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/react-native-blob-util/ReactNativeBlobUtilPrivacyInfo.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
@@ -569,6 +572,7 @@
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-cxxreact_privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SDWebImage.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/boost_privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/glog_privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ReactNativeBlobUtilPrivacyInfo.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;

@@ -59,6 +59,8 @@ jest.mock('../src/store/api', () => ({
   setAccessToken: jest.fn(),
   getAccessToken: jest.fn(),
   setRefreshToken: jest.fn(),
+  setlogout: jest.fn(),
+  setRefreshAccessToken: jest.fn(),
 }))
 
 jest.mock('../src/utils/hooks', () => {

@@ -3,8 +3,8 @@ import { Linking } from 'react-native'
 
 import { screen } from '@testing-library/react-native'
 
-import { handleTokenCallbackUrl, initialAuthState } from 'store/slices'
-import { context, render } from 'testUtils'
+import { authKeys } from 'api/auth'
+import { QueriesData, context, render } from 'testUtils'
 
 import { AuthGuard } from './App'
 
@@ -13,15 +13,6 @@ jest.mock('./utils/remoteConfig', () => ({
   featureEnabled: jest.fn(() => false),
 }))
 
-jest.mock('./store/slices', () => {
-  const original = jest.requireActual('./store/slices')
-  return {
-    ...original,
-    handleTokenCallbackUrl: jest.fn(() => ({ type: 'FOO' })),
-    initializeAuth: jest.fn(() => ({ type: 'FOO' })),
-  }
-})
-
 jest.mock('react-native-keyboard-manager', () => ({
   setEnable: jest.fn(() => {}),
   setKeyboardDistanceFromTextField: jest.fn(() => {}),
@@ -43,63 +34,48 @@ context('App', () => {
     it('should render loading spinner while initializing', () => {
       render(<AuthGuard />, {
         preloadedState: {
-          auth: { ...initialAuthState, initializing: true },
+          settings: {
+            loadingRemoteConfig: true,
+          },
         },
       })
 
       expect(screen.getByTestId('Splash-page')).toBeTruthy()
     })
 
-    it('should initilize by registering for linking', () => {
-      render(<AuthGuard />, {
-        preloadedState: {
-          auth: { ...initialAuthState },
+    it('should render Login when not authorized', () => {
+      const queriesData: QueriesData = [
+        {
+          queryKey: authKeys.settings,
+          data: {
+            firstTimeLogin: false,
+          },
         },
-      })
-      expect(Linking.addEventListener).toHaveBeenCalled()
-    })
-
-    it('should dispatch handleTokenCallbackUrl when auth token result comes back', () => {
-      render(<AuthGuard />, {
-        preloadedState: {
-          auth: { ...initialAuthState, initializing: false },
+        {
+          queryKey: authKeys.biometrics,
+          data: {
+            canStoreWithBiometric: false,
+            displayBiometricsPreferenceScreen: false,
+            shouldStoreWithBiometric: false,
+            supportedBiometric: undefined,
+          },
         },
-      })
-
-      const spy = Linking.addEventListener as jest.Mock
-      const listeners = spy.mock.calls
-      listeners.forEach((k) => {
-        const listener = k[1]
-        listener({ url: 'vamobile://login-success?code=123&state=5434' })
-      })
-      expect(Linking.addEventListener).toHaveBeenCalled()
-      expect(handleTokenCallbackUrl).toHaveBeenCalled()
-    })
-
-    it('should not dispatch handleTokenCallbackUrl when not an auth result url', () => {
+      ]
       render(<AuthGuard />, {
         preloadedState: {
-          auth: { ...initialAuthState, initializing: false },
+          settings: {
+            loadingRemoteConfig: false,
+          },
+          auth: {
+            loading: false,
+            loggedIn: false,
+            loggingOut: false,
+            syncing: false,
+          },
         },
+        queriesData: queriesData,
       })
-
       expect(Linking.addEventListener).toHaveBeenCalled()
-      const spy = Linking.addEventListener as jest.Mock
-      const listeners = spy.mock.calls
-      listeners.forEach((k) => {
-        const listener = k[1]
-        listener({ url: 'vamobile://foo?code=123&state=5434' })
-      })
-
-      expect(handleTokenCallbackUrl).not.toHaveBeenCalled()
-    })
-
-    it('should render Login when not authorized', () => {
-      render(<AuthGuard />, {
-        preloadedState: {
-          auth: { ...initialAuthState, initializing: false },
-        },
-      })
       expect(screen.queryByText('Profile')).toBeFalsy()
       expect(screen.queryByText('Home')).toBeFalsy()
       expect(screen.queryByText('Benefits')).toBeFalsy()
@@ -108,17 +84,36 @@ context('App', () => {
     })
 
     it('should render AuthedApp when authorized', () => {
+      const queriesData: QueriesData = [
+        {
+          queryKey: authKeys.settings,
+          data: {
+            firstTimeLogin: false,
+          },
+        },
+        {
+          queryKey: authKeys.biometrics,
+          data: {
+            canStoreWithBiometric: false,
+            displayBiometricsPreferenceScreen: false,
+            shouldStoreWithBiometric: false,
+            supportedBiometric: undefined,
+          },
+        },
+      ]
       render(<AuthGuard />, {
         preloadedState: {
-          auth: {
-            ...initialAuthState,
-            initializing: false,
-            loggedIn: true,
-          },
           settings: {
             remoteConfigActivated: true,
           },
+          auth: {
+            loading: false,
+            loggedIn: true,
+            loggingOut: false,
+            syncing: false,
+          },
         },
+        queriesData: queriesData,
       })
 
       expect(screen.getByText('Profile')).toBeTruthy()