Merge pull request #1171 from AzureAD/hotfix/1.1.13

Hotfix/1.1.13

Author: kaisong1990

CHANGELOG.md

@@ -1,7 +1,10 @@
+## [1.1.13] - 2020-12-04
+* Adding nil check before assigning error when developers try to get account by username from MSALPublicClientApplication, this will help to prevent a crash when passing in nil as error ponter from the API
+
 ## [1.1.12] - 2020-12-02
 * Added cross-cloud B2B support.
 * Fixed logic to handle links that open in new tab for embedded webview.
-* accountForUsername from MSALPublicClientApplication will return nil back when username is nil or empty
+* AccountForUsername from MSALPublicClientApplication will return nil back when username is nil or empty, error will be provided if a valid error pointer is passed in via this API
 * Updated user guide to provide a sample Swift & ObjC code for querying a specific account and return token silently when multiple accounts are present in the cache. 
 * Added client-side fix for the known ADFS PKeyAuth issue. (#1150)
 

MSAL.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MSAL"
-  s.version      = "1.1.12"
+  s.version      = "1.1.13"
   s.summary      = "Microsoft Authentication Library (MSAL) Preview for iOS"
   s.description  = <<-DESC
                    The MSAL library preview 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/resources/ios/Info.plist

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

MSAL/resources/mac/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.12</string>
+	<string>1.1.13</string>
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>NSPrincipalClass</key>

MSAL/src/MSALPublicClientApplication.m

@@ -442,8 +442,12 @@ - (MSALAccount *)accountForUsername:(NSString *)username
     MSID_LOG_WITH_CTX_PII(MSIDLogLevelInfo, nil, @"Querying MSAL account for username %@", MSID_PII_LOG_EMAIL(username));
     if ([NSString msidIsStringNilOrBlank:username])
     {
+        if (error)
+        {
+            *error = MSIDCreateError(MSIDErrorDomain, MSIDErrorInvalidInternalParameter, @"No username is provided", nil, nil, nil, nil, nil, YES);
+        }
+     
         MSID_LOG_WITH_CTX(MSIDLogLevelError, nil, @"username is nil or empty which is unexpected");
-        *error = MSIDCreateError(MSIDErrorDomain, MSIDErrorInvalidInternalParameter, @"No username is provided", nil, nil, nil, nil, nil, YES);;
         return nil;
     }
 

MSAL/src/MSAL_Internal.h

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

MSAL/test/unit/MSALPublicClientApplicationTests.m

@@ -2978,6 +2978,20 @@ - (void)testFetchAccountWithNilUsername_shouldReturnError
     XCTAssertNil(account);
 }
 
+- (void)testFetchAccountWithNilUsernameAndNilErrorPointer_shouldNotCrash
+{
+    [self msalStoreTokenResponseInCache];
+    
+    NSString *clientId = UNIT_TEST_CLIENT_ID;
+    __auto_type application = [[MSALPublicClientApplication alloc] initWithClientId:clientId error:nil];
+    application.tokenCache = self.tokenCacheAccessor;
+    
+    NSString *username = nil;
+    
+    __auto_type account = [application accountForUsername:username error:nil];
+    XCTAssertNil(account);
+}
+
 
 #pragma mark - removeAccount