Revert "Consolidate IStorageSupplier (in common) (#1812)" (#1815)

rpdome · web-flow · commit 68ccf7873397 · 2023-05-02T13:35:46.000-05:00
This reverts commit 47dbbc0.
diff --git a/common b/common
@@ -1 +1 @@
-Subproject commit 6891572b0798a4d19eefef00af14e0096751de8d
+Subproject commit 18123be5fd7914141de254bb114f0cd020fdfadf
diff --git a/msal/src/test/java/com/microsoft/identity/client/e2e/tests/mocked/CrossCloudGuestAccountTest.java b/msal/src/test/java/com/microsoft/identity/client/e2e/tests/mocked/CrossCloudGuestAccountTest.java
@@ -190,7 +190,7 @@ public void setup() {
     @After
     public void cleanup() {
         super.cleanup();
-        mComponents.getStorageSupplier().getFileStore(SHARED_PREFERENCES_NAME)
+        mComponents.getEncryptedFileStore(SHARED_PREFERENCES_NAME, mComponents.getStorageEncryptionManager())
                 .clear();
     }
 
@@ -293,8 +293,8 @@ public void onError(@NonNull MsalException exception) {
         RoboTestUtils.flushScheduler();
 
         // assert
-        final IMultiTypeNameValueStorage sharedPreferences = mComponents.getStorageSupplier()
-                .getFileStore(SHARED_PREFERENCES_NAME);
+        final IMultiTypeNameValueStorage sharedPreferences = mComponents.getEncryptedFileStore(SHARED_PREFERENCES_NAME,
+                mComponents.getStorageEncryptionManager());
         final Map<String, ?> cacheValues = sharedPreferences.getAll();
 
         assertEquals("Verify number of Cache records (AT, RT, IdToken, AccountRecord) for non removed account",
