Merge pull request #1538 from AzureAD/mipetriu/add_camera_consent_flag

Check for both possible camera consent suppression flags in user defaults

Author: mipetriu

IdentityCore/src/webview/embeddedWebview/MSIDOAuth2EmbeddedWebviewController.m

@@ -65,7 +65,8 @@ @implementation MSIDOAuth2EmbeddedWebviewController
 
 #if AD_BROKER
 NSString *const SSO_EXTENSION_USER_DEFAULTS_KEY = @"group.com.microsoft.azureauthenticator.sso";
-NSString *const CAMERA_CONSENT_PROMPT_SUPPRESS_KEY = @"Microsoft.Broker.Feature.sdm_suppress_camera_consent";
+NSString *const CAMERA_CONSENT_PROMPT_SUPPRESS_KEY = @"Microsoft.Broker.Feature.suppress_camera_consent";
+NSString *const SDM_CAMERA_CONSENT_PROMPT_SUPPRESS_KEY = @"Microsoft.Broker.Feature.sdm_suppress_camera_consent";
 #endif
 
 - (id)initWithStartURL:(NSURL *)startURL
@@ -498,19 +499,31 @@ - (void) webView:(WKWebView *)webView
             type:(WKMediaCaptureType)type
  decisionHandler:(void (^)(WKPermissionDecision decision))decisionHandler API_AVAILABLE(ios(15.0), macos(12.0))
 {
-    
-    NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:SSO_EXTENSION_USER_DEFAULTS_KEY];
-    id cameraConsentValue = [userDefaults objectForKey:CAMERA_CONSENT_PROMPT_SUPPRESS_KEY];
-    
-    if (cameraConsentValue && ([cameraConsentValue isKindOfClass:NSNumber.class] || [cameraConsentValue isKindOfClass:NSString.class]))
+    // Prompt suppression is only allowed for the camera
+    if (type == WKMediaCaptureTypeCamera)
     {
-        if ([cameraConsentValue boolValue] && type == WKMediaCaptureTypeCamera)
+        NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:SSO_EXTENSION_USER_DEFAULTS_KEY];
+        id cameraConsentValue = [userDefaults objectForKey:CAMERA_CONSENT_PROMPT_SUPPRESS_KEY];
+        id sdmCameraConsentValue = [userDefaults objectForKey:SDM_CAMERA_CONSENT_PROMPT_SUPPRESS_KEY];
+        
+        if (cameraConsentValue && ([cameraConsentValue isKindOfClass:NSNumber.class] || [cameraConsentValue isKindOfClass:NSString.class]))
         {
-            decisionHandler(WKPermissionDecisionGrant);
-            return;
+            if ([cameraConsentValue boolValue])
+            {
+                decisionHandler(WKPermissionDecisionGrant);
+                return;
+            }
+        }
+        else if (sdmCameraConsentValue && ([sdmCameraConsentValue isKindOfClass:NSNumber.class] || [sdmCameraConsentValue isKindOfClass:NSString.class]))
+        {
+            if ([sdmCameraConsentValue boolValue])
+            {
+                decisionHandler(WKPermissionDecisionGrant);
+                return;
+            }
         }
     }
-    
+
     decisionHandler(WKPermissionDecisionPrompt);
 }
 #endif