Skip to content

Commit 85a110c

Browse files
authored
Merge pull request #1183 from AzureAD/hotfix/1.7.15
Fix a logging crash
2 parents 440729d + 66d63bb commit 85a110c

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

IdentityCore/src/workplacejoin/ios/MSIDWorkPlaceJoinUtil.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ + (MSIDRegistrationInformation *)getRegistrationInformation:(id<MSIDRequestConte
123123
identity = [self copyWPJIdentity:context sharedAccessGroup:sharedAccessGroup certificateIssuer:&certificateIssuer privateKeyDict:&keyDict];
124124
if (!identity || CFGetTypeID(identity) != SecIdentityGetTypeID())
125125
{
126-
MSID_LOG_WITH_CTX(MSIDLogLevelInfo, context, @"Failed to retrieve WPJ identity. Identity %@, typeIdMismatch %@", @(!identity), @(CFGetTypeID(identity) != SecIdentityGetTypeID()));
126+
MSID_LOG_WITH_CTX(MSIDLogLevelInfo, context, @"Failed to retrieve WPJ identity. Identity is nil: %@", @(identity == nil));
127127
CFReleaseNull(identity);
128128
return nil;
129129
}

IdentityCore/tests/MSIDWorkPlaceJoinUtilTests.m

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,12 @@ - (void)tearDown
6363
#endif
6464
}
6565

66+
- (void)testGetRegistrationInformation_withoutRegistrationInformation_andNoChallenge_shoudReturnNil
67+
{
68+
MSIDRegistrationInformation *registrationInfo = [MSIDWorkPlaceJoinUtil getRegistrationInformation:nil workplacejoinChallenge:nil];
69+
XCTAssertNil(registrationInfo);
70+
}
71+
6672
- (void)testGetWPJStringDataForIdentifier_withKeychainItem_shouldReturnValidValue
6773
{
6874
NSString *dummyKeyIdentifierValue = @"[email protected]";

changelog.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
Version 1.7.15
2+
* Fix a crash when no identiy found during getting device registration information on iOS.
3+
14
Version 1.7.14
25
* Add skip local RT when creating silent controller
36

0 commit comments

Comments
 (0)