Skip to content

Commit 430c215

Browse files
committed
Merge branch 'dev' into mipetriu/camera_consent_suppress
merge dev to branch
2 parents 013d4dc + bf40bc5 commit 430c215

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

IdentityCore/src/MSIDError.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,15 @@ typedef NS_ENUM(NSInteger, MSIDErrorCode)
336336

337337
// JIT - Error Handling config invalid or not found
338338
MSIDErrorJITErrorHandlingConfigNotFound = -51839,
339+
340+
// Error is thrown when PSSO biometric policy flag mismatches with the config value
341+
MSIDErrorPSSOBiometricPolicyMismatch = -51840,
342+
343+
// Error is thrown when non ENtra passkey extension tries to access the passkey
344+
MSIDErrorPSSOInvalidPasskeyExtension = -51841,
345+
346+
// Error thrown when psso save login config operation fails
347+
MSIDErrorPSSOSaveLoginConfigFailure = -51842,
339348

340349
// Throttling errors
341350
MSIDErrorThrottleCacheNoRecord = -51900,

IdentityCore/src/MSIDError.m

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,9 @@ MSIDErrorCode MSIDErrorCodeForOAuthErrorWithSubErrorCode(NSString *oauthError, M
207207
@(MSIDErrorDeviceNotPSSORegistered),
208208
@(MSIDErrorPSSOKeyIdMismatch),
209209
@(MSIDErrorJITErrorHandlingConfigNotFound),
210+
@(MSIDErrorPSSOBiometricPolicyMismatch),
211+
@(MSIDErrorPSSOInvalidPasskeyExtension),
212+
@(MSIDErrorPSSOSaveLoginConfigFailure),
210213
],
211214
MSIDOAuthErrorDomain : @[// Server Errors
212215
@(MSIDErrorServerOauth),
@@ -418,6 +421,12 @@ void MSIDFillAndLogError(NSError **error, MSIDErrorCode errorCode, NSString *err
418421
return @"MSIDErrorDeviceNotPSSORegistered";
419422
case MSIDErrorPSSOKeyIdMismatch:
420423
return @"MSIDErrorPSSOKeyIdMismatch";
424+
case MSIDErrorPSSOBiometricPolicyMismatch:
425+
return @"MSIDErrorPSSOBiometricPolicyMismatch";
426+
case MSIDErrorPSSOInvalidPasskeyExtension:
427+
return @"MSIDErrorPSSOInvalidPasskeyExtension";
428+
case MSIDErrorPSSOSaveLoginConfigFailure:
429+
return @"MSIDErrorPSSOSaveLoginConfigFailure";
421430
// Throttling errors
422431
case MSIDErrorThrottleCacheNoRecord:
423432
return @"MSIDErrorThrottleCacheNoRecord";

0 commit comments

Comments
 (0)