Merge pull request #2658 from AzureAD/release/2.2.0

Release/2.2.0

Author: jasoncoolmax

CHANGELOG.md

@@ -1,3 +1,6 @@
+## [2.2.0]
+* Make native auth MFA feature more backward compatible (#2645)
+
 ## [2.1.0]
 * Integrate Broker XPC service into Mac Sample app
 * Update minimum supported version to iOS 16.0 and macOS 11.0 (#2623)

CODEOWNERS

@@ -2,11 +2,12 @@
 # Unless a later match takes precedence, these users will be requested
 # for review whenever someone opens a pull request.
 *       @AzureAD/AppleIdentityTeam
-# @AzureAD/AppleIdentityTeam and @AzureAD/MSAL-ObjC-CIAM will be the co-owners of MSAL.project, CHANGELOG.md, Package.swift and all files under azure_pipelines
+# @AzureAD/AppleIdentityTeam and @AzureAD/MSAL-ObjC-CIAM will be the co-owners of the following files:
 /MSAL/MSAL.xcodeproj/project.pbxproj @AzureAD/AppleIdentityTeam @AzureAD/MSAL-ObjC-CIAM
 CHANGELOG.md @AzureAD/AppleIdentityTeam @AzureAD/MSAL-ObjC-CIAM
 /azure_pipelines/ @AzureAD/AppleIdentityTeam @AzureAD/MSAL-ObjC-CIAM
 /Package.swift @AzureAD/AppleIdentityTeam @AzureAD/MSAL-ObjC-CIAM
+/MSAL/src/public/MSAL.h @AzureAD/AppleIdentityTeam @AzureAD/MSAL-ObjC-CIAM
 # @AzureAD/MSAL-ObjC-CIAM owns any files in the */native_auth
 # directories, subdirectories and other files related to native auth.
 /MSAL/module.modulemap @AzureAD/MSAL-ObjC-CIAM

MSAL.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MSAL"
-  s.version      = "2.1.0"
+  s.version      = "2.2.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>2.1.0</string>
+	<string>2.2.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>2.1.0</string>
+	<string>2.2.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>

MSAL/resources/ios/Info.plist

@@ -26,7 +26,7 @@
 //------------------------------------------------------------------------------
 
 #define MSAL_VER_HIGH       2
-#define MSAL_VER_LOW        1
+#define MSAL_VER_LOW        2
 #define MSAL_VER_PATCH      0
 
 #define STR_HELPER(x) #x

MSAL/resources/mac/Info.plist

@@ -54,7 +54,14 @@ - (void)setLogCallback:(MSALLogCallback)callback
 {
     if (self.callback != nil)
     {
-        @throw @"MSAL logging callback can only be set once per process and should never changed once set.";
+#if DEBUG
+        @throw [NSException
+                exceptionWithName:NSInternalInconsistencyException
+                reason:@"MSAL logging callback can only be set once per process and should never be changed once set."
+                userInfo:nil];
+#endif
+        MSID_LOG_WITH_CTX(MSIDLogLevelError, nil, @"MSAL logging callback can only be set once per process and should never be changed once set.");
+        return;
     }
 
     static dispatch_once_t once;

MSAL/src/MSAL_Internal.h

@@ -100,7 +100,7 @@ - (NSData *)dataFromUInt64:(NSUInteger)value
     const int length = 16;
     const int lastIndex = length - 1;
     const int bitsInByte = 8;
-    char buffer[length];
+    char buffer[16];
 
     for (int idx = 0; idx < length; ++idx)
     {