Use Active Broker cache specifically for Client SDK

AzureAD · Aug 31, 2023 · ab51806 · ab51806
1 parent aa7fd85
commit ab51806
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/changelog b/changelog
@@ -1,6 +1,7 @@
 MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-android/wiki
 V.NEXT
 ----------
+- [MINOR] Use Active Broker cache specifically for Client SDK (#1892)
 - [MINOR] MSA UI tests for Brokered Auth (#1856)
 - [MINOR] Updated target, compile SDK, AGP and gradle versions(#1882)
 

diff --git a/common b/common
diff --git a/msal/src/main/java/com/microsoft/identity/client/PublicClientApplication.java b/msal/src/main/java/com/microsoft/identity/client/PublicClientApplication.java
@@ -2301,7 +2301,7 @@ public boolean isValidBrokerPackage(@NonNull final Context context,
      **/
     @Nullable
     public String getActiveBrokerPackageName(@NonNull final Context context) {
-        final BrokerData activeBroker = BrokerDiscoveryClientFactory.getInstance(context,
+        final BrokerData activeBroker = BrokerDiscoveryClientFactory.getInstanceForClientSdk(context,
                         AndroidPlatformComponentsFactory.createFromContext(context))
                 .getActiveBroker(false);
 

diff --git a/...src/main/java/com/microsoft/identity/client/internal/controllers/MSALControllerFactory.kt b/...src/main/java/com/microsoft/identity/client/internal/controllers/MSALControllerFactory.kt
@@ -43,7 +43,7 @@ class MSALControllerFactory(
     private val platformComponents: IPlatformComponents,
     private val applicationConfiguration: PublicClientApplicationConfiguration) {
 
-    private val discoveryClient = BrokerDiscoveryClientFactory.getInstance(
+    private val discoveryClient = BrokerDiscoveryClientFactory.getInstanceForClientSdk(
         context = applicationContext,
         platformComponents = platformComponents
     )

diff --git a/...pps/testapp/src/main/java/com/microsoft/identity/client/testapp/AcquireTokenFragment.java b/...pps/testapp/src/main/java/com/microsoft/identity/client/testapp/AcquireTokenFragment.java
@@ -180,7 +180,7 @@ public void onClick(View v) {
         mDebugBrokers.setTextOn("Debug Brokers");
         mDebugBrokers.setChecked(BrokerData.getShouldTrustDebugBrokers());
 
-        mCache = ClientActiveBrokerCache.Companion.getCache(
+        mCache = ClientActiveBrokerCache.getClientSdkCache(
                 AndroidPlatformComponentsFactory.createFromContext(getContext()).getStorageSupplier()
         );
+1 −0		changelog.txt
+3 −4		common/src/main/java/com/microsoft/identity/common/internal/activebrokerdiscovery/BrokerDiscoveryClient.kt
+29 −3		.../src/main/java/com/microsoft/identity/common/internal/activebrokerdiscovery/BrokerDiscoveryClientFactory.kt
+30 −7		common/src/main/java/com/microsoft/identity/common/internal/cache/ClientActiveBrokerCache.kt
+1 −1		common/src/main/java/com/microsoft/identity/common/internal/controllers/BrokerMsalController.java