Skip to content

Commit

Permalink
Merge branch 'dev' into mipetriu/camera_consent_suppress
Browse files Browse the repository at this point in the history
merge dev to branch
  • Loading branch information
mipetriu committed Jan 22, 2025
2 parents cbb0418 + e4203f0 commit 013d4dc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ typedef NS_ENUM(NSInteger, MSIDPlatformSSOStatus)
MSIDPlatformSSONotEnabled = 0, //Platform SSO Not enabled in SSO Config
MSIDPlatformSSOEnabledNotRegistered = 1, //Platform SSO Enabled in sso config , but not Registered
MSIDPlatformSSOEnabledAndRegistered = 2, //Platform SSO Enabled in sso config and registered
MSIDPlatformSSORegistrationNeedsRepair = 3, //Platform registration needs to be repaired
};

typedef NS_ENUM(NSInteger, MSIDPreferredAuthMethod)
Expand Down
3 changes: 3 additions & 0 deletions IdentityCore/src/broker_operation/response/MSIDDeviceInfo.m
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,8 @@ - (NSString *)platformSSOStatusStringFromEnum:(MSIDPlatformSSOStatus)platformSSO
return @"platformSSOEnabledNotRegistered";
case MSIDPlatformSSOEnabledAndRegistered:
return @"platformSSOEnabledAndRegistered";
case MSIDPlatformSSORegistrationNeedsRepair:
return @"platformSSORegistrationNeedsRepair";

default:
return nil;
Expand All @@ -187,6 +189,7 @@ - (MSIDPlatformSSOStatus)platformSSOStatusEnumFromString:(NSString *)platformSSO
if ([platformSSOStatusString isEqualToString:@"platformSSONotEnabled"]) return MSIDPlatformSSONotEnabled;
if ([platformSSOStatusString isEqualToString:@"platformSSOEnabledNotRegistered"]) return MSIDPlatformSSOEnabledNotRegistered;
if ([platformSSOStatusString isEqualToString:@"platformSSOEnabledAndRegistered"]) return MSIDPlatformSSOEnabledAndRegistered;
if ([platformSSOStatusString isEqualToString:@"platformSSORegistrationNeedsRepair"]) return MSIDPlatformSSORegistrationNeedsRepair;

return MSIDPlatformSSONotEnabled;
}
Expand Down

0 comments on commit 013d4dc

Please sign in to comment.