Merge pull request #840 from AzureAD/hotfix/1.0.7

Merge hotfix 1.0.7 into master of MSAL

Author: oldalton

CHANGELOG.md

@@ -1,3 +1,8 @@
+## [1.0.7] - 2020-01-29
+### Fixed
+- Keyed unarchiver deserialization fix for iOS 11.2
+- [Broker patch] Fixed account lookups and validation with the same email (#827)
+
 ## [1.0.6] - 2020-01-03
 ### Fixed
 - Set mobile content type for the WKWebView configuration (#810)
@@ -35,6 +40,14 @@
 - Remove arm64e architecture
 - Pass custom keychain group for broker requests
 
+# [1.0.0-hotfix2] - 2020-01-27
+### Fixed
+- [Broker patch] Keyed unarchiver deserialization fix for iOS 11.2
+
+# [1.0.0-hotfix1] - 2020-01-21
+### Fixed
+- [Broker patch] Fixed account lookups and validation with the same email (#827)
+
 ## [1.0.0] - 2019-09-26
 ### Fixed
 - Return type of the account claims

MSAL.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MSAL"
-  s.version      = "1.0.6"
+  s.version      = "1.0.7"
   s.summary      = "Microsoft Authentication Library (MSAL) Preview for iOS"
 
   s.description  = <<-DESC

MSAL/IdentityCore

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

MSAL/resources/ios/Info.plist

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

MSAL/resources/mac/Info.plist

@@ -916,6 +916,7 @@ - (void)acquireTokenWithParameters:(MSALInteractiveTokenParameters *)parameters
     msidParams.tokenExpirationBuffer = self.internalConfig.tokenExpirationBuffer;
     msidParams.extendedLifetimeEnabled = self.internalConfig.extendedLifetimeEnabled;
     msidParams.clientCapabilities = self.internalConfig.clientApplicationCapabilities;
+    msidParams.shouldValidateResultAccount = YES;
 
     msidParams.validateAuthority = _validateAuthority;
     msidParams.instanceAware = self.internalConfig.multipleCloudsSupported;

MSAL/src/MSALPublicClientApplication.m

@@ -27,7 +27,7 @@
 
 #define MSAL_VER_HIGH       1
 #define MSAL_VER_LOW        0
-#define MSAL_VER_PATCH      6
+#define MSAL_VER_PATCH      7
 
 #define STR_HELPER(x) #x
 #define STR(x) STR_HELPER(x)

MSAL/src/MSAL_Internal.h

@@ -2301,7 +2301,7 @@ - (void)testRemoveAccount_whenAccountExists_andIsFociClient_shouldRemoveAccount_
     XCTAssertEqual([application allAccounts:nil].count, 0);
 
     // 5. Make sure account and FOCI tokens are still in cache
-    MSIDAccount *cachedAccount = [self.tokenCacheAccessor getAccountForIdentifier:account.accountIdentifier authority:authority context:nil error:nil];
+    MSIDAccount *cachedAccount = [self.tokenCacheAccessor getAccountForIdentifier:account.accountIdentifier authority:authority realmHint:nil context:nil error:nil];
     XCTAssertNotNil(cachedAccount);
 
     MSIDRefreshToken *fociToken = [self.tokenCacheAccessor getRefreshTokenWithAccount:account.accountIdentifier familyId:@"1" configuration:configuration context:nil error:nil];