Merge branch 'dev' of https://github.com/AzureAD/microsoft-authentication-library-for-objc into yuki/e2e-batch-3

Author: Yuki-YuXin

CHANGELOG.md

@@ -1,3 +1,10 @@
+## TBD
+* Support sendable result #2518
+
+## [1.7.0]
+* Add support for claims request in native authentication signIn (#2496)
+* Move native auth public methods to parameter class (#2492)
+
 ## [1.6.3]
 * Merge 1.6.1-hotfix
 

MSAL.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MSAL"
-  s.version      = "1.6.3"
+  s.version      = "1.7.0"
   s.summary      = "Microsoft Authentication Library (MSAL) for iOS"
   s.description  = <<-DESC
                    The MSAL library for iOS gives your app the ability to begin using the Microsoft Cloud by supporting Microsoft Azure Active Directory and Microsoft Accounts in a converged experience using industry standard OAuth2 and OpenID Connect. The library also supports Microsoft Azure B2C for those using our hosted identity management service.

MSAL/IdentityCore

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.6.3</string>
+	<string>1.7.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

MSAL/MSAL.xcodeproj/project.pbxproj

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.6.3</string>
+	<string>1.7.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>

MSAL/resources/ios/Info.plist

@@ -113,6 +113,13 @@ + (void)initialize
                                    @(MSIDErrorDeviceNotPSSORegistered) : @(MSALErrorDeviceNotPSSORegistered),
                                    @(MSIDErrorPSSOKeyIdMismatch) : @(MSALErrorPSSOKeyIdMismatch),
                                    @(MSIDErrorJITErrorHandlingConfigNotFound) : @(MSALErrorJITErrorHandlingConfigNotFound),
+                                   @(MSIDErrorPSSOBiometricPolicyMismatch) : @(MSALErrorPSSOBiometricPolicyMismatch),
+                                   @(MSIDErrorPSSOInvalidPasskeyExtension) : @(MSALErrorPSSOInvalidPasskeyExtension),
+                                   @(MSIDErrorPSSOSaveLoginConfigFailure) :@(MSALErrorPSSOSaveLoginConfigFailure),
+                                   @(MSIDErrorPSSOPasskeyLAError) :@(MSALErrorPSSOPasskeyLAError),
+                                   @(MSIDErrorPSSOBiometricsNotAvailable): @(MSALErrorPSSOBiometricsNotAvailable),
+                                   @(MSIDErrorPSSOBiometricsNotEnrolled): @(MSALErrorPSSOBiometricsNotEnrolled),
+                                
 
                                    // Oauth2 errors
                                    @(MSIDErrorServerOauth) : @(MSALInternalErrorAuthorizationFailed),

MSAL/resources/mac/Info.plist

@@ -26,8 +26,8 @@
 //------------------------------------------------------------------------------
 
 #define MSAL_VER_HIGH       1
-#define MSAL_VER_LOW        6
-#define MSAL_VER_PATCH      3
+#define MSAL_VER_LOW        7
+#define MSAL_VER_PATCH      0
 
 #define STR_HELPER(x) #x
 #define STR(x) STR_HELPER(x)

MSAL/src/MSALErrorConverter.m

@@ -81,6 +81,7 @@ class MSALNativeAuthTokenController: MSALNativeAuthBaseController {
         oobCode: String? = nil,
         grantType: MSALNativeAuthGrantType,
         includeChallengeType: Bool = true,
+        claimsRequestJson: String? = nil,
         context: MSALNativeAuthRequestContext) -> MSIDHttpRequest? {
             do {
                 let params = MSALNativeAuthTokenRequestParameters(
@@ -92,7 +93,8 @@ class MSALNativeAuthTokenController: MSALNativeAuthBaseController {
                     password: password,
                     oobCode: oobCode,
                     includeChallengeType: includeChallengeType,
-                    refreshToken: nil)
+                    refreshToken: nil,
+                    claimsRequestJson: claimsRequestJson)
                 return try requestProvider.signInWithPassword(parameters: params, context: context)
             } catch {
                 MSALLogger.log(level: .error, context: context, format: "Error creating SignIn Token Request: \(error)")
@@ -118,7 +120,8 @@ class MSALNativeAuthTokenController: MSALNativeAuthBaseController {
                     password: nil,
                     oobCode: nil,
                     includeChallengeType: false,
-                    refreshToken: refreshToken)
+                    refreshToken: refreshToken,
+                    claimsRequestJson: nil)
                 return try requestProvider.refreshToken(parameters: params, context: context)
             } catch {
                 MSALLogger.log(level: .error, context: context, format: "Error creating Refresh Token Request: \(error)")

MSAL/src/MSAL_Internal.h

@@ -24,20 +24,23 @@
 
 @_implementationOnly import MSAL_Private
 
-class MSALNativeAuthSignInParameters {
+class MSALNativeAuthInternalSignInParameters {
     let username: String
     let password: String?
     let context: MSALNativeAuthRequestContext
     let scopes: [String]?
+    let claimsRequestJson: String?
 
     init(
         username: String,
         password: String?,
         context: MSALNativeAuthRequestContext,
-        scopes: [String]?) {
+        scopes: [String]?,
+        claimsRequestJson: String?) {
         self.username = username
         self.password = password
         self.context = context
         self.scopes = scopes
+        self.claimsRequestJson = claimsRequestJson
     }
 }