Merge pull request #1318 from AzureAD/release/1.7.30

Release common core 1.7.30

Author: oldalton

IdentityCore/IdentityCore.xcodeproj/project.pbxproj

@@ -54,6 +54,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      enableASanStackUseAfterReturn = "YES"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

IdentityCore/IdentityCore.xcodeproj/xcshareddata/xcschemes/IdentityCore Mac.xcscheme

@@ -21,6 +21,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#import "MSIDBrokerConstants.h"
+
 NSString *const MSID_BROKER_RESUME_DICTIONARY_KEY  = @"adal-broker-resume-dictionary";
 NSString *const MSID_BROKER_SYMMETRIC_KEY_TAG      = @"com.microsoft.adBrokerKey\0";
 NSString *const MSID_BROKER_ADAL_SCHEME            = @"msauth";

IdentityCore/src/MSIDBrokerConstants.m

@@ -28,6 +28,8 @@
 @class MSIDDeviceInfo;
 @class MSIDPrtHeader;
 @class MSIDDeviceHeader;
+@class MSIDPasskeyAssertion;
+@class MSIDPasskeyCredential;
 
 typedef NS_ENUM(NSInteger, MSIDWebviewType)
 {
@@ -97,6 +99,8 @@ typedef void (^MSIDGetAccountsRequestCompletionBlock)(NSArray<MSIDAccount *> * _
 typedef void (^MSIDGetDeviceInfoRequestCompletionBlock)(MSIDDeviceInfo * _Nullable deviceInfo, NSError * _Nullable error);
 typedef void (^MSIDGetSsoCookiesRequestCompletionBlock)(NSArray<MSIDPrtHeader *> * _Nullable prtHeaders, NSArray<MSIDDeviceHeader *> * _Nullable deviceHeaders, NSError * _Nullable error);
 typedef void (^MSIDSsoExtensionWrapperErrorBlock)(NSError * _Nullable error);
+typedef void (^MSIDPasskeyAssertionRequestCompletionBlock)(MSIDPasskeyAssertion * _Nullable passkeyAssertion, NSError * _Nullable error);
+typedef void (^MSIDPasskeyCredentialRequestCompletionBlock)(MSIDPasskeyCredential * _Nullable passkeyCredential, NSError * _Nullable error);
 
 #if TARGET_OS_IPHONE
 #import <UIKit/UIKit.h>

IdentityCore/src/MSIDConstants.h

@@ -51,4 +51,7 @@
 /*! Returns OS version number */
 + (NSString *)deviceOSVersion;
 
+/*! Returns device hardware type */
++ (NSString *)deviceHardwareType;
+
 @end

IdentityCore/src/MSIDDeviceId.h

@@ -25,6 +25,7 @@
 #import "MSIDVersion.h"
 #import "MSIDConstants.h"
 #import "MSIDOAuth2Constants.h"
+#import "sys/utsname.h"
 
 #if !TARGET_OS_IPHONE
 #include <CoreFoundation/CoreFoundation.h>
@@ -198,4 +199,13 @@ + (void)setIdValue:(NSString *)value
     [(NSMutableDictionary *)[self deviceId] setObject:value forKey:key];
 }
 
++ (NSString *)deviceHardwareType
+{
+    struct utsname sysinfo;
+    int retVal = uname(&sysinfo);
+    if (EXIT_SUCCESS != retVal) return nil;
+    
+    return [NSString stringWithUTF8String:sysinfo.machine];
+}
+
 @end

IdentityCore/src/MSIDDeviceId.m

@@ -317,6 +317,9 @@ typedef NS_ENUM(NSInteger, MSIDErrorCode)
     // JIT - Troubleshooting - Acquire token error
     MSIDErrorJITTroubleshootingAcquireToken        =   -51836,
 
+    // Device is not PSSO registered
+    MSIDErrorDeviceNotPSSORegistered               =   -51837,
+    
     // Throttling errors
     MSIDErrorThrottleCacheNoRecord = -51900,
     MSIDErrorThrottleCacheInvalidSignature = -51901,

IdentityCore/src/MSIDError.h

@@ -195,7 +195,8 @@ MSIDErrorCode MSIDErrorCodeForOAuthErrorWithSubErrorCode(NSString *oauthError, M
                       @(MSIDErrorJITTroubleshootingCreateController),
                       @(MSIDErrorJITTroubleshootingResultUnknown),
                       @(MSIDErrorJITTroubleshootingAcquireToken),
-
+                      @(MSIDErrorDeviceNotPSSORegistered),
+                      
                       ],
               MSIDOAuthErrorDomain : @[// Server Errors
                       @(MSIDErrorServerOauth),
@@ -395,6 +396,8 @@ void MSIDFillAndLogError(NSError **error, MSIDErrorCode errorCode, NSString *err
             return @"MSIDErrorJITTroubleshootingResultUnknown";
         case MSIDErrorJITTroubleshootingAcquireToken:
             return @"MSIDErrorJITTroubleshootingAcquireToken";
+        case MSIDErrorDeviceNotPSSORegistered:
+            return @"MSIDErrorDeviceNotPSSORegistered";
             // Throttling errors
         case MSIDErrorThrottleCacheNoRecord:
             return @"MSIDErrorThrottleCacheNoRecord";

IdentityCore/src/MSIDError.m

@@ -37,6 +37,8 @@ extern MSIDJsonSerializableType const MSID_JSON_TYPE_OPERATION_REQUEST_GET_DEVIC
 extern MSIDJsonSerializableType const MSID_JSON_TYPE_OPERATION_REQUEST_GET_PRT;
 extern MSIDJsonSerializableType const MSID_JSON_TYPE_OPERATION_REQUEST_GET_SSO_COOKIES;
 extern MSIDJsonSerializableType const MSID_JSON_TYPE_OPERATION_REQUEST_BROWSER_NATIVE_MESSAGE;
+extern MSIDJsonSerializableType const MSID_JSON_TYPE_OPERATION_REQUEST_PASSKEY_ASSERTION;
+extern MSIDJsonSerializableType const MSID_JSON_TYPE_OPERATION_REQUEST_PASSKEY_CREDENTIAL;
 
 extern MSIDJsonSerializableType const MSID_JSON_TYPE_BROKER_OPERATION_BROWSER_NATIVE_MESSAGE_RESPONSE;
 extern MSIDJsonSerializableType const MSID_JSON_TYPE_BROKER_OPERATION_GET_ACCOUNTS_RESPONSE;
@@ -52,3 +54,5 @@ extern MSIDJsonSerializableType const MSID_JSON_TYPE_AADV2_TOKEN_RESPONSE;
 extern MSIDJsonSerializableType const MSID_JSON_TYPE_B2C_TOKEN_RESPONSE;
 extern MSIDJsonSerializableType const MSID_JSON_TYPE_CIAM_TOKEN_RESPONSE;
 extern MSIDJsonSerializableType const MSID_JSON_TYPE_BROKER_OPERATION_GET_SSO_COOKIES_RESPONSE;
+extern MSIDJsonSerializableType const MSID_JSON_TYPE_BROKER_OPERATION_PASSKEY_ASSERTION_RESPONSE;
+extern MSIDJsonSerializableType const MSID_JSON_TYPE_BROKER_OPERATION_PASSKEY_CREDENTIAL_RESPONSE;

IdentityCore/src/MSIDJsonSerializableTypes.h

@@ -35,12 +35,16 @@
 MSIDJsonSerializableType MSID_JSON_TYPE_OPERATION_REQUEST_GET_PRT = @"get_prt";
 MSIDJsonSerializableType MSID_JSON_TYPE_OPERATION_REQUEST_GET_SSO_COOKIES = @"get_sso_cookies";
 MSIDJsonSerializableType MSID_JSON_TYPE_OPERATION_REQUEST_BROWSER_NATIVE_MESSAGE = @"browser_native_message_operation";
+MSIDJsonSerializableType MSID_JSON_TYPE_OPERATION_REQUEST_PASSKEY_ASSERTION = @"passkey_assertion_operation";
+MSIDJsonSerializableType MSID_JSON_TYPE_OPERATION_REQUEST_PASSKEY_CREDENTIAL = @"passkey_credential_operation";
 
 MSIDJsonSerializableType MSID_JSON_TYPE_BROKER_OPERATION_BROWSER_NATIVE_MESSAGE_RESPONSE = @"operation_browser_native_message_response";
 MSIDJsonSerializableType MSID_JSON_TYPE_BROKER_OPERATION_GET_ACCOUNTS_RESPONSE = @"operation_get_accounts_response";
 MSIDJsonSerializableType MSID_JSON_TYPE_BROKER_OPERATION_GENERIC_RESPONSE = @"operation_generic_response";
 MSIDJsonSerializableType MSID_JSON_TYPE_BROKER_OPERATION_TOKEN_RESPONSE = @"operation_token_response";
 MSIDJsonSerializableType MSID_JSON_TYPE_BROKER_OPERATION_GET_SSO_COOKIES_RESPONSE = @"operation_get_sso_cookies_response";
+MSIDJsonSerializableType MSID_JSON_TYPE_BROKER_OPERATION_PASSKEY_ASSERTION_RESPONSE = @"operation_get_passkey_assertion_response";
+MSIDJsonSerializableType MSID_JSON_TYPE_BROKER_OPERATION_PASSKEY_CREDENTIAL_RESPONSE = @"operation_get_passkey_credential_response";
 
 MSIDJsonSerializableType MSID_JSON_TYPE_PROVIDER_AADV1 = @"provider_aad_v1";
 MSIDJsonSerializableType MSID_JSON_TYPE_PROVIDER_AADV2 = @"provider_aad_v2";