Merge pull request #1199 from AzureAD/release/1.1.14

1.1.14 release

Author: oldalton

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.1.14] - 2020-01-19
+* Removed identity core classes from public api (#1158).
+* Fixed possible deadlock caused by thread explosion (#1175)
+* Added pipeline configuration to generate framework for SPM & automate MSAL release (#1194)
+* Extend iOS background tasks to silent and interactive requests.
+* Change order of FRT/MRRT lookup for silent token refreshes
+
 ## [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
 

MSAL.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MSAL"
-  s.version      = "1.1.13"
+  s.version      = "1.1.14"
   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/IdentityCore

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

MSAL/MSAL.xcodeproj/project.pbxproj

@@ -2,25 +2,25 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleShortVersionString</key>
-	<string>1.1.13</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>NSPrincipalClass</key>
-	<string></string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.1.14</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2017 Microsoft. All rights reserved.</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
 </dict>
 </plist>

MSAL/resources/ios/Info.plist

@@ -0,0 +1,36 @@
+//
+// Copyright (c) Microsoft Corporation.
+// All rights reserved.
+//
+// This code is licensed under the MIT License.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files(the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions :
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.  
+
+
+#import <MSAL/MSAL.h>
+#import "MSALAuthenticationSchemeBearer.h"
+#import "MSALAuthenticationSchemeProtocolInternal.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MSALAuthenticationSchemeBearer () <MSALAuthenticationSchemeProtocolInternal>
+
+@end
+
+NS_ASSUME_NONNULL_END

MSAL/resources/mac/Info.plist

@@ -25,7 +25,7 @@
 //
 //------------------------------------------------------------------------------
 
-#import "MSALAuthenticationSchemeBearer.h"
+#import "MSALAuthenticationSchemeBearer+Internal.h"
 #import "MSIDAuthenticationScheme.h"
 #import "MSALAuthScheme.h"
 #import "MSIDAccessToken.h"
@@ -45,6 +45,15 @@ - (instancetype)init
     return self;
 }
 
+#pragma mark - MSALAuthenticationSchemeProtocol
+
+- (NSString *)authenticationScheme
+{
+    return MSALParameterStringForAuthScheme(self.scheme);
+}
+
+#pragma mark - MSALAuthenticationSchemeProtocolInternal
+
 - (MSIDAuthenticationScheme *)createMSIDAuthenticationSchemeWithParams:(nullable NSDictionary *)params
 {
     return [[MSIDAuthenticationScheme alloc] initWithSchemeParameters:params];
@@ -60,11 +69,6 @@ - (NSString *)getClientAccessToken:(MSIDAccessToken *)accessToken popManager:(nu
     return accessToken.accessToken;
 }
 
-- (NSString *)authenticationScheme
-{
-    return MSALParameterStringForAuthScheme(self.scheme);
-}
-
 - (NSString *)getAuthorizationHeader:(NSString *)accessToken
 {
     return [NSString stringWithFormat:@"%@%@%@", self.authenticationScheme, keyDelimiter, accessToken];

MSAL/src/MSALAuthenticationSchemeBearer+Internal.h

@@ -0,0 +1,36 @@
+//
+// Copyright (c) Microsoft Corporation.
+// All rights reserved.
+//
+// This code is licensed under the MIT License.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files(the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions :
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.  
+
+
+#import <MSAL/MSAL.h>
+#import "MSALAuthenticationSchemePop.h"
+#import "MSALAuthenticationSchemeProtocolInternal.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MSALAuthenticationSchemePop () <MSALAuthenticationSchemeProtocolInternal>
+
+@end
+
+NS_ASSUME_NONNULL_END

MSAL/src/MSALAuthenticationSchemeBearer.m

@@ -25,7 +25,7 @@
 //
 //------------------------------------------------------------------------------
 
-#import "MSALAuthenticationSchemePop.h"
+#import "MSALAuthenticationSchemePop+Internal.h"
 #import "MSIDAuthenticationSchemePop.h"
 #import "MSALHttpMethod.h"
 #import "MSIDDevicePopManager.h"
@@ -65,6 +65,13 @@ - (instancetype)initWithHttpMethod:(MSALHttpMethod)httpMethod
     return self;
 }
 
+- (NSString *)authenticationScheme
+{
+    return MSALParameterStringForAuthScheme(self.scheme);
+}
+
+#pragma mark - MSALAuthenticationSchemeProtocolInternal
+
 - (MSIDAuthenticationScheme *)createMSIDAuthenticationSchemeWithParams:(nullable NSDictionary *)params
 {
     return [[MSIDAuthenticationSchemePop alloc] initWithSchemeParameters:params];
@@ -118,11 +125,6 @@ - (nullable NSString *)getClientAccessToken:(MSIDAccessToken *)accessToken popMa
     return signedAccessToken;
 }
 
-- (NSString *)authenticationScheme
-{
-    return MSALParameterStringForAuthScheme(self.scheme);
-}
-
 - (NSString *)getAuthorizationHeader:(NSString *)accessToken
 {
     return [NSString stringWithFormat:@"%@%@%@", self.authenticationScheme, keyDelimiter, accessToken];