Merge branch 'dev' into somalaya/flightWebCpFeature

Author: somalaya

changelog.txt

@@ -5,6 +5,7 @@ vNext
 - [MINOR] Native auth: Make native auth MFA feature more backward compatible(#2669)
 - [MINOR] Flighting webcp in webview (#2686)
 - [MINOR] Construct broker app link redirect based on broker pkg name (#2682)
+- [MINOR] Update keyword to suppress camera consent (#2694)
 
 Version 21.3.0
 ----------

common/src/main/java/com/microsoft/identity/common/internal/broker/IRestrictionsManager.kt

@@ -37,7 +37,12 @@ interface IRestrictionsManager {
         // String keys
         const val PREFERRED_AUTH_CONFIG = "preferred_auth_config"
         // Boolean keys
-        const val SUPPRESS_CAMERA_CONSENT = "sdm_suppress_camera_consent"
+        // SDM_SUPPRESS_CAMERA_CONSENT key was used in the past to suppress camera consent for the SDM QR PIN mode.
+        // It is now deprecated and replaced with the new key SUPPRESS_CAMERA_CONSENT.
+        // This key is kept for backward compatibility.
+        @Deprecated("Use SUPPRESS_CAMERA_CONSENT instead")
+        const val SDM_SUPPRESS_CAMERA_CONSENT = "sdm_suppress_camera_consent"
+        const val SUPPRESS_CAMERA_CONSENT = "suppress_camera_consent"
 
         /**
          * Creates a request bundle with the keys to be requested from the app restrictions manager.

common/src/main/java/com/microsoft/identity/common/internal/broker/SdmQrPinManager.kt

@@ -23,7 +23,9 @@
 package com.microsoft.identity.common.internal.broker
 
 import com.microsoft.identity.common.internal.broker.IRestrictionsManager.BrokerRestrictionsManagerKeys.PREFERRED_AUTH_CONFIG
+import com.microsoft.identity.common.internal.broker.IRestrictionsManager.BrokerRestrictionsManagerKeys.SDM_SUPPRESS_CAMERA_CONSENT
 import com.microsoft.identity.common.internal.broker.IRestrictionsManager.BrokerRestrictionsManagerKeys.SUPPRESS_CAMERA_CONSENT
+import com.microsoft.identity.common.internal.broker.IRestrictionsManager.BrokerRestrictionsManagerKeys.buildMultiValueRequest
 import com.microsoft.identity.common.logging.Logger
 
 /**
@@ -80,11 +82,15 @@ object SdmQrPinManager {
         val methodTag = "$TAG:isCameraConsentSuppressed"
         val defaultValue = false
         restrictionsManager?.let { manager ->
-            return manager.getBoolean(
-                key = SUPPRESS_CAMERA_CONSENT,
+            val multiValueRequest = buildMultiValueRequest(
+                booleanKeys = setOf(SUPPRESS_CAMERA_CONSENT, SDM_SUPPRESS_CAMERA_CONSENT)
+            )
+            val values = manager.getMultiValues(
                 brokerAppPackageName = authenticatorPackageName,
-                defaultValue = defaultValue
+                bundleOfKeys = multiValueRequest
             )
+            return values.getBoolean(SUPPRESS_CAMERA_CONSENT, defaultValue) ||
+                    values.getBoolean(SDM_SUPPRESS_CAMERA_CONSENT, defaultValue)
         } ?: run {
             Logger.warn(methodTag, "Broker restrictions manager is not initialized.")
             return defaultValue