Merge pull request #765 from AzureAD/release/1.5.3

Release common lib 1.5.3 (MSAL 1.1.5 and broker 3.1.7)

Author: oldalton

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode11
+osx_image: xcode11.5
 
 # Set up our rubygems (slather and xcpretty, namely)
 install: 

IdentityCore/IdentityCore.xcodeproj/project.pbxproj

@@ -4,6 +4,7 @@
 <dict>
 	<key>keychain-access-groups</key>
 	<array>
+		<string>$(AppIdentifierPrefix)com.microsoft.workplacejoin</string>
 		<string>$(AppIdentifierPrefix)com.microsoft.MSIDTestsHostApp</string>
 		<string>$(AppIdentifierPrefix)com.microsoft.adalcache</string>
 		<string>$(AppIdentifierPrefix)com.microsoft.intune.mam</string>

IdentityCore/MSIDTestsHostApp/MSIDTestsHostApp.entitlements

@@ -26,8 +26,13 @@
 NSString *const MSID_BROKER_ADAL_SCHEME            = @"msauth";
 NSString *const MSID_BROKER_MSAL_SCHEME            = @"msauthv2";
 NSString *const MSID_BROKER_NONCE_SCHEME           = @"msauthv3";
-NSString *const MSID_BROKER_APP_BUNDLE_ID          = @"com.microsoft.azureauthenticator";
-NSString *const MSID_BROKER_APP_BUNDLE_ID_DF       = @"com.microsoft.azureauthenticator-df";
+#if TARGET_OS_IPHONE && !TARGET_OS_MACCATALYST
+    NSString *const MSID_BROKER_APP_BUNDLE_ID          = @"com.microsoft.azureauthenticator";
+    NSString *const MSID_BROKER_APP_BUNDLE_ID_DF       = @"com.microsoft.azureauthenticator-df";
+#elif TARGET_OS_OSX
+    NSString *const MSID_BROKER_APP_BUNDLE_ID          = @"com.microsoft.CompanyPortalMac";
+    NSString *const MSID_BROKER_APP_BUNDLE_ID_DF       = @"com.microsoft.CompanyPortalMac";
+#endif
 NSString *const MSID_BROKER_MAX_PROTOCOL_VERSION   = @"max_protocol_ver";
 NSString *const MSID_BROKER_PROTOCOL_VERSION_KEY   = @"msg_protocol_ver";
 NSInteger const MSID_BROKER_PROTOCOL_VERSION_2     = 2;

IdentityCore/src/MSIDBrokerConstants.m

@@ -123,6 +123,7 @@ extern NSString *const MSID_LAST_MOD_TIME_CACHE_KEY;
 extern NSString *const MSID_LAST_MOD_APP_CACHE_KEY;
 extern NSString *const MSID_APPLICATION_IDENTIFIER_CACHE_KEY;
 extern NSString *const MSID_DEVICE_ID_CACHE_KEY;
+extern NSString *const MSID_PRT_PROTOCOL_VERSION_CACHE_KEY;
 
 extern NSString *const MSID_ACCESS_TOKEN_CACHE_TYPE;
 extern NSString *const MSID_ACCOUNT_CACHE_TYPE;

IdentityCore/src/MSIDOAuth2Constants.h

@@ -141,6 +141,7 @@
 NSString *const MSID_PRINCIPAL_ACCOUNT_ENVIRONMENT_CACHE_KEY    = @"principal_account_environment";
 NSString *const MSID_APP_METADATA_AUTHORITY_MAP_TYPE     = @"authority_map";
 NSString *const MSID_DEVICE_ID_CACHE_KEY                 = @"device_id";
+NSString *const MSID_PRT_PROTOCOL_VERSION_CACHE_KEY      = @"prt_protocol_version";
 
 NSString *const MSID_OPENID_CONFIGURATION_SUFFIX         = @".well-known/openid-configuration";
 NSString *const MSID_PREFERRED_USERNAME_MISSING          = @"Missing from the token response";

IdentityCore/src/MSIDOAuth2Constants.m

@@ -24,7 +24,6 @@
 #import "MSIDDeviceInfo.h"
 #import "MSIDConstants.h"
 #import "MSIDWorkPlaceJoinUtil.h"
-#import "MSIDRegistrationInformation.h"
 
 static NSArray *deviceModeEnumString;
 

IdentityCore/src/broker_operation/response/MSIDDeviceInfo.m

@@ -0,0 +1,44 @@
+// 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 <Foundation/Foundation.h>
+
+@class MSIDAssymetricKeyPair;
+@class MSIDAssymetricKeyLookupAttributes;
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol MSIDAssymetricKeyGenerating <NSObject>
+
+- (MSIDAssymetricKeyPair *)generateKeyPairForAttributes:(MSIDAssymetricKeyLookupAttributes *)attributes
+                                                  error:(NSError **)error;
+
+- (MSIDAssymetricKeyPair *)readOrGenerateKeyPairForAttributes:(MSIDAssymetricKeyLookupAttributes *)attributes
+                                                        error:(NSError **)error;
+
+- (MSIDAssymetricKeyPair *)readKeyPairForAttributes:(MSIDAssymetricKeyLookupAttributes *)attributes
+                                              error:(NSError **)error;
+
+@end
+
+NS_ASSUME_NONNULL_END

IdentityCore/src/cache/crypto/MSIDAssymetricKeyGenerating.h

@@ -0,0 +1,35 @@
+// 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 <Foundation/Foundation.h>
+#import "MSIDAssymetricKeyGenerating.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MSIDAssymetricKeyGeneratorFactory : NSObject
+
++ (id<MSIDAssymetricKeyGenerating>)defaultKeyGeneratorWithError:(NSError **)error;
+
+@end
+
+NS_ASSUME_NONNULL_END

IdentityCore/src/cache/crypto/MSIDAssymetricKeyGeneratorFactory.h

@@ -0,0 +1,60 @@
+// 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 "MSIDAssymetricKeyGeneratorFactory.h"
+#import "MSIDAssymetricKeyKeychainGenerator.h"
+#if !TARGET_OS_IPHONE
+#import "MSIDAssymetricKeyLoginKeychainGenerator.h"
+#endif
+
+@implementation MSIDAssymetricKeyGeneratorFactory
+
++ (id<MSIDAssymetricKeyGenerating>)defaultKeyGeneratorWithError:(NSError **)error
+{
+#if TARGET_OS_IPHONE
+    return [self iOSDefaultKeyGeneratorWithError:error];
+#else
+    return [self macDefaultKeyGeneratorWithError:error];
+#endif
+}
+
++ (id<MSIDAssymetricKeyGenerating>)iOSDefaultKeyGeneratorWithError:(NSError **)error
+{
+    return [[MSIDAssymetricKeyKeychainGenerator alloc] initWithGroup:nil error:error];
+}
+
+#if !TARGET_OS_IPHONE
++ (id<MSIDAssymetricKeyGenerating>)macDefaultKeyGeneratorWithError:(NSError **)error
+{
+    if (@available(macOS 10.15, *))
+    {
+        return [[MSIDAssymetricKeyKeychainGenerator alloc] initWithGroup:nil error:error];
+    }
+    else
+    {
+        return [[MSIDAssymetricKeyLoginKeychainGenerator alloc] initWithAccessRef:nil error:error];
+    }
+}
+#endif
+
+@end