diff --git a/CHANGELOG.md b/CHANGELOG.md index af70146e05..cf8b9db2b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## TBD +* Integrate Broker XPC service into Mac Sample app + ## [2.0.0] * Use a single family refresh token (#2550) * Removed deprecated APIs, including legacy initializers, account management methods and token acquisition methods, and the MSALTelemetry interface (#2577) diff --git a/MSAL/IdentityCore b/MSAL/IdentityCore index bc0e612d60..b612b0e929 160000 --- a/MSAL/IdentityCore +++ b/MSAL/IdentityCore @@ -1 +1 @@ -Subproject commit bc0e612d60ab0a4a6eaa330ca6edadec070ee499 +Subproject commit b612b0e929aab7b41cd4b941e8d0d14a0bde676c diff --git a/MSAL/MSAL.xcodeproj/project.pbxproj b/MSAL/MSAL.xcodeproj/project.pbxproj index 507d6b0e65..2ace78f400 100644 --- a/MSAL/MSAL.xcodeproj/project.pbxproj +++ b/MSAL/MSAL.xcodeproj/project.pbxproj @@ -5959,7 +5959,6 @@ }; 1E614BD922558D8300EBF62F = { CreatedOnToolsVersion = 10.1; - DevelopmentTeam = UBF8T346G9; SystemCapabilities = { com.apple.Keychain = { enabled = 0; @@ -8011,12 +8010,13 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_ENTITLEMENTS = test/app/mac/MSALMacTestApp.entitlements; - CODE_SIGN_IDENTITY = "Mac Developer"; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = UBF8T346G9; + ENABLE_HARDENED_RUNTIME = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -8084,12 +8084,13 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_ENTITLEMENTS = test/app/mac/MSALMacTestApp.entitlements; - CODE_SIGN_IDENTITY = "Mac Developer"; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = UBF8T346G9; + ENABLE_HARDENED_RUNTIME = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu11; diff --git a/MSAL/MSAL.xcodeproj/xcshareddata/xcschemes/MSAL (Mac Framework).xcscheme b/MSAL/MSAL.xcodeproj/xcshareddata/xcschemes/MSAL (Mac Framework).xcscheme index 8a18238116..a5c183bbff 100644 --- a/MSAL/MSAL.xcodeproj/xcshareddata/xcschemes/MSAL (Mac Framework).xcscheme +++ b/MSAL/MSAL.xcodeproj/xcshareddata/xcschemes/MSAL (Mac Framework).xcscheme @@ -26,7 +26,8 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - shouldUseLaunchSchemeArgsEnv = "YES"> + shouldUseLaunchSchemeArgsEnv = "YES" + codeCoverageEnabled = "YES"> authenticationScheme; +#if TARGET_OS_OSX + +/** + Broker Xpc service mode defined by developer. This service can be used a backup service on top of today's Entra ID SingleSignOn extension or an isolated service if tenant has no Entra ID SingleSignOn extension deployed + */ + +@property (nonatomic) MSALXpcMode msalXpcMode; + +#endif + #pragma mark - Creating MSALTokenParameters /** diff --git a/MSAL/test/app/mac/Base.lproj/Main.storyboard b/MSAL/test/app/mac/Base.lproj/Main.storyboard index 5ca9ad8a28..b3fa35d7ab 100644 --- a/MSAL/test/app/mac/Base.lproj/Main.storyboard +++ b/MSAL/test/app/mac/Base.lproj/Main.storyboard @@ -1,9 +1,9 @@ - + - - + + @@ -734,17 +734,17 @@ - + - + - + - + @@ -752,7 +752,7 @@ - + @@ -779,10 +779,10 @@ - + - + @@ -790,7 +790,7 @@ - + @@ -817,10 +817,10 @@ - + - + @@ -828,7 +828,7 @@ - + @@ -846,10 +846,10 @@ - + - + @@ -857,7 +857,7 @@ - + @@ -875,10 +875,10 @@ - + - + @@ -886,7 +886,7 @@ - + @@ -904,10 +904,10 @@ - + - + @@ -915,7 +915,7 @@ - + @@ -939,10 +939,10 @@ - + - + @@ -950,7 +950,7 @@ - + @@ -980,10 +980,10 @@ - + - + @@ -991,7 +991,7 @@ - + @@ -1011,10 +1011,10 @@ - + - + @@ -1022,7 +1022,7 @@ - + @@ -1045,10 +1045,10 @@ - + - + @@ -1056,7 +1056,7 @@ - + @@ -1076,10 +1076,10 @@ - + - + @@ -1087,7 +1087,7 @@ - + @@ -1106,11 +1106,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -1118,7 +1182,7 @@ - + @@ -1136,10 +1200,10 @@ - +