Skip to content

Commit b550fbd

Browse files
committed
merge dev into branch
2 parents 7b4b8e2 + fbe5509 commit b550fbd

File tree

4 files changed

+33
-2
lines changed

4 files changed

+33
-2
lines changed

MSAL/src/MSALDeviceInformation.m

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,8 @@ - (MSALPlatformSSOStatus)msalPlatformSSOStatusFromMSIDPlatformSSOStatus:(MSIDPla
116116
return MSALPlatformSSOEnabledNotRegistered;
117117
case MSIDPlatformSSOEnabledAndRegistered:
118118
return MSALPlatformSSOEnabledAndRegistered;
119+
case MSIDPlatformSSORegistrationNeedsRepair:
120+
return MSALPlatformSSORegistrationNeedsRepair;
119121

120122
default:
121123
return MSALPlatformSSONotEnabled;

MSAL/src/MSALErrorConverter.m

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,9 @@ + (void)initialize
113113
@(MSIDErrorDeviceNotPSSORegistered) : @(MSALErrorDeviceNotPSSORegistered),
114114
@(MSIDErrorPSSOKeyIdMismatch) : @(MSALErrorPSSOKeyIdMismatch),
115115
@(MSIDErrorJITErrorHandlingConfigNotFound) : @(MSALErrorJITErrorHandlingConfigNotFound),
116+
@(MSIDErrorPSSOBiometricPolicyMismatch) : @(MSALErrorPSSOBiometricPolicyMismatch),
117+
@(MSIDErrorPSSOInvalidPasskeyExtension) : @(MSALErrorPSSOInvalidPasskeyExtension),
118+
@(MSIDErrorPSSOSaveLoginConfigFailure) :@(MSALErrorPSSOSaveLoginConfigFailure),
116119

117120
// Oauth2 errors
118121
@(MSIDErrorServerOauth) : @(MSALInternalErrorAuthorizationFailed),
@@ -130,7 +133,8 @@ + (void)initialize
130133
@(MSIDErrorServerError) : @(MSALErrorServerError),
131134
@(MSIDErrorServerInvalidState) : @(MSALInternalErrorInvalidState),
132135
@(MSIDErrorServerProtectionPoliciesRequired) : @(MSALErrorServerProtectionPoliciesRequired),
133-
@(MSIDErrorServerUnhandledResponse) : @(MSALInternalErrorUnhandledResponse)
136+
@(MSIDErrorServerUnhandledResponse) : @(MSALInternalErrorUnhandledResponse),
137+
@(MSIDErrorUnexpectedHttpResponse) : @(MSALInternalErrorUnexpectedHttpResponse)
134138
}
135139
};
136140

MSAL/src/public/MSALDefinitions.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,11 @@ typedef NS_ENUM(NSUInteger, MSALPlatformSSOStatus)
175175
/*
176176
Administrator has configured Platform SSO in sso config and the device is registred with AAD via platform SSO
177177
*/
178-
MSALPlatformSSOEnabledAndRegistered
178+
MSALPlatformSSOEnabledAndRegistered,
179+
/*
180+
Platform SSO registration on device is not valid , needs repair
181+
*/
182+
MSALPlatformSSORegistrationNeedsRepair
179183
};
180184

181185
/**

MSAL/src/public/MSALError.h

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,11 @@ typedef NS_ENUM(NSInteger, MSALInternalError)
262262
*/
263263
MSALInternalErrorUnexpected = -42008,
264264

265+
/**
266+
Un expected http response with status code 403 or 404
267+
*/
268+
MSALInternalErrorUnexpectedHttpResponse = -42009,
269+
265270
/**
266271
The passed in authority URL does not pass validation.
267272
If you're trying to use B2C, you must disable authority validation by
@@ -525,4 +530,20 @@ typedef NS_ENUM(NSInteger, MSALInternalError)
525530
JIT - Error Handling config invalid or not found
526531
*/
527532
MSALErrorJITErrorHandlingConfigNotFound = -42738,
533+
534+
/**
535+
PSSO passkey - Biometric policy flag doesnt match with the loginConfig settings
536+
*/
537+
MSALErrorPSSOBiometricPolicyMismatch = -42739,
538+
539+
/**
540+
PSSO passkey - Invalid Passkey extension trying to access passkey
541+
*/
542+
MSALErrorPSSOInvalidPasskeyExtension = -42740,
543+
544+
/**
545+
PSSO save login config failure
546+
*/
547+
548+
MSALErrorPSSOSaveLoginConfigFailure = -42741,
528549
};

0 commit comments

Comments
 (0)