Merge pull request #2508 from AzureAD/sedemche/duna_cba

antrix1989 · web-flow · commit 1bfd768e8462 · 2025-02-20T21:07:10.000-08:00
Support DUNA protocol for CBA flow
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## TBD
 * Support sendable result #2518
+* Support DUNA protocol for CBA flow #2508
 
 ## [1.7.0]
 * Add support for claims request in native authentication signIn (#2496)
diff --git a/MSAL/IdentityCore b/MSAL/IdentityCore
@@ -1 +1 @@
-Subproject commit 3e00e5b7458a7002b5e8769f13938d3d6409b022
+Subproject commit 1562cd0aa83fe3e899d9e4975b928943448abbe5
diff --git a/MSAL/MSAL.xcodeproj/project.pbxproj b/MSAL/MSAL.xcodeproj/project.pbxproj
@@ -5811,8 +5811,6 @@
 					};
 					D61A64321E5A29580086D120 = {
 						CreatedOnToolsVersion = 8.2.1;
-						DevelopmentTeam = UBF8T346G9;
-						ProvisioningStyle = Manual;
 						SystemCapabilities = {
 							com.apple.Keychain = {
 								enabled = 1;
@@ -8783,9 +8781,8 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "";
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CODE_SIGN_ENTITLEMENTS = "MSAL Test App.entitlements";
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = UBF8T346G9;
 				ENABLE_BITCODE = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -8797,7 +8794,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.MSALTestApp;
 				PROVISIONING_PROFILE = "";
-				PROVISIONING_PROFILE_SPECIFIER = "iOS Team Provisioning Profile";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				USER_HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"$IDCORE_PATH/src/**",
diff --git a/MSAL/MSAL.xcodeproj/xcshareddata/xcschemes/MSAL Test App (iOS).xcscheme b/MSAL/MSAL.xcodeproj/xcshareddata/xcschemes/MSAL Test App (iOS).xcscheme
@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:MSAL.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
             ReferencedContainer = "container:MSAL.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/MSAL/src/MSALPublicClientApplication.m b/MSAL/src/MSALPublicClientApplication.m
@@ -89,7 +89,6 @@
 #import "MSALWebviewParameters.h"
 #import "MSIDAccountIdentifier.h"
 #if TARGET_OS_IPHONE
-#import "MSIDCertAuthHandler+iOS.h"
 #import "MSIDBrokerInteractiveController.h"
 #import <UIKit/UIKit.h>
 #else
@@ -113,6 +112,7 @@
 #import "MSALWipeCacheForAllAccountsConfig.h"
 #import "NSString+MSIDTelemetryExtensions.h"
 #import "MSIDVersion.h"
+#import "MSIDCertAuthManager.h"
 
 @interface MSALPublicClientApplication()
 {
@@ -142,7 +142,7 @@ + (void)load
     MSIDNotifications.webAuthWillSwitchToBrokerAppNotificationName = MSALWebAuthWillSwitchToBrokerApp;
     MSIDNotifications.webAuthDidReceiveResponseFromBrokerNotificationName = MSALWebAuthDidReceiveResponseFromBroker;
     #if TARGET_OS_IPHONE && !AD_BROKER && !MSID_EXCLUDE_SYSTEMWV
-        [MSIDCertAuthHandler setUseAuthSession:YES];
+    MSIDCertAuthManager.sharedInstance.useAuthSession = YES;
     #endif
 }
 
@@ -626,8 +626,8 @@ + (BOOL)handleMSALResponse:(NSURL *)response
     {
         return YES;
     }
-
-    if ([MSIDCertAuthHandler completeCertAuthChallenge:response])
+    
+    if ([MSIDCertAuthManager.sharedInstance completeWithCallbackURL:response])
     {
         return YES;
     }
diff --git a/MSAL/test/unit/MSALAcquireTokenTests.m b/MSAL/test/unit/MSALAcquireTokenTests.m
@@ -84,6 +84,8 @@
 #import "MSALSilentTokenParameters.h"
 #import "XCTestCase+HelperMethods.h"
 #import "MSIDLRUCache.h"
+#import "MSIDFlightManager.h"
+#import "MSIDConstants.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
@@ -654,6 +656,12 @@ - (void)testAcquireTokenInteractive_whenClaimsIsPassedViaOverloadedAcquireToken_
             } mutableCopy];
          [expectedQPs addEntriesFromDictionary:[MSIDDeviceId deviceId]];
          [expectedQPs addEntriesFromDictionary: [self getAppMetadata]];
+        
+        if ([MSIDFlightManager.sharedInstance boolForKey:MSID_FLIGHT_SUPPORT_DUNA_CBA])
+        {
+            expectedQPs[@"switch_browser"] = @"1";
+        }
+        
          XCTAssertTrue([expectedQPs compareAndPrintDiff:QPs]);
          
          NSString *responseString = [NSString stringWithFormat:UNIT_TEST_DEFAULT_REDIRECT_URI"?code=%@&state=%@&client_info=%@", @"iamauthcode", QPs[@"state"], @"eyJ1aWQiOiI5ZjQ4ODBkOC04MGJhLTRjNDAtOTdiYy1mN2EyM2M3MDMwODQiLCJ1dGlkIjoiZjY0NWFkOTItZTM4ZC00ZDFhLWI1MTAtZDFiMDlhNzRhOGNhIn0"];
@@ -947,6 +955,11 @@ - (void)testAcquireTokenInteractive_whenCapabilitiesSet_shouldSendCapabilitiesTo
             } mutableCopy];
          [expectedQPs addEntriesFromDictionary:[MSIDDeviceId deviceId]];
          [expectedQPs addEntriesFromDictionary: [self getAppMetadata]];
+        
+        if ([MSIDFlightManager.sharedInstance boolForKey:MSID_FLIGHT_SUPPORT_DUNA_CBA])
+        {
+            expectedQPs[@"switch_browser"] = @"1";
+        }
          
          XCTAssertTrue([expectedQPs compareAndPrintDiff:QPs]);
          
@@ -1043,7 +1056,12 @@ - (void)testAcquireTokenInteractive_whenClaimsIsPassedAndCapabilitiesSet_shouldS
             } mutableCopy];
          [expectedQPs addEntriesFromDictionary:[MSIDDeviceId deviceId]];
          [expectedQPs addEntriesFromDictionary: [self getAppMetadata]];
-         
+        
+        if ([MSIDFlightManager.sharedInstance boolForKey:MSID_FLIGHT_SUPPORT_DUNA_CBA])
+        {
+            expectedQPs[@"switch_browser"] = @"1";
+        }
+        
          XCTAssertTrue([expectedQPs compareAndPrintDiff:QPs]);
          
          NSString *responseString = [NSString stringWithFormat:UNIT_TEST_DEFAULT_REDIRECT_URI"?code=%@&state=%@&client_info=%@", @"iamauthcode", QPs[@"state"], @"eyJ1aWQiOiI5ZjQ4ODBkOC04MGJhLTRjNDAtOTdiYy1mN2EyM2M3MDMwODQiLCJ1dGlkIjoiZjY0NWFkOTItZTM4ZC00ZDFhLWI1MTAtZDFiMDlhNzRhOGNhIn0"];
@@ -1140,6 +1158,12 @@ - (void)testAcquireTokenInteractive_whenClaimsIsPassedAndLoginHintNotNil_shouldS
             } mutableCopy];
          [expectedQPs addEntriesFromDictionary:[MSIDDeviceId deviceId]];
          [expectedQPs addEntriesFromDictionary:[self getAppMetadata]];
+        
+        if ([MSIDFlightManager.sharedInstance boolForKey:MSID_FLIGHT_SUPPORT_DUNA_CBA])
+        {
+            expectedQPs[@"switch_browser"] = @"1";
+        }
+        
          XCTAssertTrue([expectedQPs compareAndPrintDiff:QPs]);
          
          NSString *responseString = [NSString stringWithFormat:UNIT_TEST_DEFAULT_REDIRECT_URI"?code=%@&state=%@&client_info=%@", @"iamanauthcode", QPs[@"state"], @"eyJ1aWQiOiI5ZjQ4ODBkOC04MGJhLTRjNDAtOTdiYy1mN2EyM2M3MDMwODQiLCJ1dGlkIjoiZjY0NWFkOTItZTM4ZC00ZDFhLWI1MTAtZDFiMDlhNzRhOGNhIn0"];
@@ -1237,6 +1261,11 @@ - (void)testAcquireTokenInteractive_whenInstanceAware_shouldReturnCloudAuthority
             } mutableCopy];
          [expectedQPs addEntriesFromDictionary:[MSIDDeviceId deviceId]];
          [expectedQPs addEntriesFromDictionary: [self getAppMetadata]];
+        
+        if ([MSIDFlightManager.sharedInstance boolForKey:MSID_FLIGHT_SUPPORT_DUNA_CBA])
+        {
+            expectedQPs[@"switch_browser"] = @"1";
+        }
          
          XCTAssertTrue([expectedQPs compareAndPrintDiff:QPs]);
          

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,6 @@`
`89`	`89`	`#import "MSALWebviewParameters.h"`
`90`	`90`	`#import "MSIDAccountIdentifier.h"`
`91`	`91`	`#if TARGET_OS_IPHONE`
`92`		`-#import "MSIDCertAuthHandler+iOS.h"`
`93`	`92`	`#import "MSIDBrokerInteractiveController.h"`
`94`	`93`	`#import <UIKit/UIKit.h>`
`95`	`94`	`#else`
`@@ -113,6 +112,7 @@`
`113`	`112`	`#import "MSALWipeCacheForAllAccountsConfig.h"`
`114`	`113`	`#import "NSString+MSIDTelemetryExtensions.h"`
`115`	`114`	`#import "MSIDVersion.h"`
	`115`	`+#import "MSIDCertAuthManager.h"`
`116`	`116`
`117`	`117`	`@interface MSALPublicClientApplication()`
`118`	`118`	`{`
`@@ -142,7 +142,7 @@ + (void)load`
`142`	`142`	`MSIDNotifications.webAuthWillSwitchToBrokerAppNotificationName = MSALWebAuthWillSwitchToBrokerApp;`
`143`	`143`	`MSIDNotifications.webAuthDidReceiveResponseFromBrokerNotificationName = MSALWebAuthDidReceiveResponseFromBroker;`
`144`	`144`	`#if TARGET_OS_IPHONE && !AD_BROKER && !MSID_EXCLUDE_SYSTEMWV`
`145`		`- [MSIDCertAuthHandler setUseAuthSession:YES];`
	`145`	`+ MSIDCertAuthManager.sharedInstance.useAuthSession = YES;`
`146`	`146`	`#endif`
`147`	`147`	`}`
`148`	`148`
`@@ -626,8 +626,8 @@ + (BOOL)handleMSALResponse:(NSURL *)response`
`626`	`626`	`{`
`627`	`627`	`return YES;`
`628`	`628`	`}`
`629`		`-`
`630`		`- if ([MSIDCertAuthHandler completeCertAuthChallenge:response])`
	`629`	`+`
	`630`	`+ if ([MSIDCertAuthManager.sharedInstance completeWithCallbackURL:response])`
`631`	`631`	`{`
`632`	`632`	`return YES;`
`633`	`633`	`}`