Skip to content

Commit 741332e

Browse files
swasti29swasti29
authored
Merge pull request #1407 from AzureAD/release/1.7.38
Merge Release/1.7.38 to main
2 parents 9ef90be + 67cae24 commit 741332e

File tree

291 files changed

+1631
-830
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

291 files changed

+1631
-830
lines changed

‎IdentityCore/IdentityCore.xcodeproj/project.pbxproj

+15
Original file line numberDiff line numberDiff line change
@@ -1826,6 +1826,9 @@
18261826
D6D9A4BD1FBE712900EFA430 /* MSIDURLExtensionsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D6D9A4BA1FBE712900EFA430 /* MSIDURLExtensionsTests.m */; };
18271827
D6D9A4BE1FBE712900EFA430 /* MSIDStringExtensionsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D6D9A4BB1FBE712900EFA430 /* MSIDStringExtensionsTests.m */; };
18281828
D6D9A4BF1FBE712900EFA430 /* MSIDStringExtensionsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D6D9A4BB1FBE712900EFA430 /* MSIDStringExtensionsTests.m */; };
1829+
E656E07A2C2627B80011FB23 /* MSIDWebUpgradeRegResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = E656E0792C2627B80011FB23 /* MSIDWebUpgradeRegResponse.m */; };
1830+
E656E07B2C2627B80011FB23 /* MSIDWebUpgradeRegResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = E656E0792C2627B80011FB23 /* MSIDWebUpgradeRegResponse.m */; };
1831+
E656E07D2C2627FB0011FB23 /* MSIDWebUpgradeRegResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = E656E07C2C2627FB0011FB23 /* MSIDWebUpgradeRegResponse.h */; };
18291832
E70C49F1258D662F00A7A07E /* MSIDLRUCache.m in Sources */ = {isa = PBXBuildFile; fileRef = E70C49F0258D662F00A7A07E /* MSIDLRUCache.m */; };
18301833
E70C49F2258D662F00A7A07E /* MSIDLRUCache.m in Sources */ = {isa = PBXBuildFile; fileRef = E70C49F0258D662F00A7A07E /* MSIDLRUCache.m */; };
18311834
E70C4A30258D68D900A7A07E /* MSIDThrottlingCacheRecord.m in Sources */ = {isa = PBXBuildFile; fileRef = E70C4A2F258D68D900A7A07E /* MSIDThrottlingCacheRecord.m */; };
@@ -3251,6 +3254,9 @@
32513254
D6D9A4B91FBE6D1C00EFA430 /* IdentityCore.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IdentityCore.pch; sourceTree = "<group>"; };
32523255
D6D9A4BA1FBE712900EFA430 /* MSIDURLExtensionsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MSIDURLExtensionsTests.m; sourceTree = "<group>"; };
32533256
D6D9A4BB1FBE712900EFA430 /* MSIDStringExtensionsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MSIDStringExtensionsTests.m; sourceTree = "<group>"; };
3257+
E656E0792C2627B80011FB23 /* MSIDWebUpgradeRegResponse.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDWebUpgradeRegResponse.m; sourceTree = "<group>"; };
3258+
E656E07C2C2627FB0011FB23 /* MSIDWebUpgradeRegResponse.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDWebUpgradeRegResponse.h; sourceTree = "<group>"; };
3259+
E6FABC0A2C2A110900611378 /* MSIDWebWPJResponse+Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MSIDWebWPJResponse+Internal.h"; sourceTree = "<group>"; };
32543260
E70C49F0258D662F00A7A07E /* MSIDLRUCache.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDLRUCache.m; sourceTree = "<group>"; };
32553261
E70C4A2F258D68D900A7A07E /* MSIDThrottlingCacheRecord.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDThrottlingCacheRecord.m; sourceTree = "<group>"; };
32563262
E70C4A74258D7E7B00A7A07E /* MSIDLRUCacheTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDLRUCacheTest.m; sourceTree = "<group>"; };
@@ -4149,13 +4155,16 @@
41494155
96235F97207D72A6007EAB36 /* MSIDWebAADAuthCodeResponse.h */,
41504156
96235F98207D72A6007EAB36 /* MSIDWebAADAuthCodeResponse.m */,
41514157
96235F9A207D72CE007EAB36 /* MSIDWebWPJResponse.h */,
4158+
E6FABC0A2C2A110900611378 /* MSIDWebWPJResponse+Internal.h */,
41524159
96235F9B207D72CE007EAB36 /* MSIDWebWPJResponse.m */,
41534160
9686C72721192BCF001FFF51 /* MSIDWebOpenBrowserResponse.h */,
41544161
9686C72821192BCF001FFF51 /* MSIDWebOpenBrowserResponse.m */,
41554162
B28BDABD221F7F230055FFE6 /* MSIDCBAWebAADAuthResponse.h */,
41564163
B28BDABE221F7F230055FFE6 /* MSIDCBAWebAADAuthResponse.m */,
41574164
B4E3BB9729AD90DB00A59B47 /* MSIDJITTroubleshootingResponse.h */,
41584165
B4E3BB9929AD91CC00A59B47 /* MSIDJITTroubleshootingResponse.m */,
4166+
E656E0792C2627B80011FB23 /* MSIDWebUpgradeRegResponse.m */,
4167+
E656E07C2C2627FB0011FB23 /* MSIDWebUpgradeRegResponse.h */,
41594168
);
41604169
path = response;
41614170
sourceTree = "<group>";
@@ -5875,6 +5884,7 @@
58755884
B2AF1D13218BCC7A0080C1A0 /* MSIDRequestControlling.h in Headers */,
58765885
B2C707FD2192530E00D917B8 /* MSIDDefaultSilentTokenRequest.h in Headers */,
58775886
1EE541402458B30300A86414 /* MSIDDevicePopManager.h in Headers */,
5887+
E656E07D2C2627FB0011FB23 /* MSIDWebUpgradeRegResponse.h in Headers */,
58785888
B286B9B32389DD78007833AD /* MSIDWebAADAuthCodeResponse.h in Headers */,
58795889
886F516E29CCA83000F09471 /* MSIDCIAMAuthorityResolver.h in Headers */,
58805890
B286B9D22389DF19007833AD /* MSIDAadAuthorityCache.h in Headers */,
@@ -6952,6 +6962,7 @@
69526962
B28686C224065442004E83FC /* MSIDLoginKeychainUtil.m in Sources */,
69536963
B2C708AF219A612D00D917B8 /* MSIDLegacyBrokerResponseHandler.m in Sources */,
69546964
583BFCA924D87BA40035B901 /* MSIDRedirectUri.m in Sources */,
6965+
E656E07B2C2627B80011FB23 /* MSIDWebUpgradeRegResponse.m in Sources */,
69556966
580E2547271A014F003D1795 /* MSIDDeviceHeader.m in Sources */,
69566967
583BFCAB24D88CED0035B901 /* MSIDRedirectUriVerifier.m in Sources */,
69576968
B253152723DD61FB00432133 /* MSIDSSOExtensionGetDeviceInfoRequest.m in Sources */,
@@ -7830,6 +7841,7 @@
78307841
96F94A3420817C1A0034676C /* MSIDNTLMHandler.m in Sources */,
78317842
6068303A20A3560F00CCA6AB /* MSIDPKeyAuthHandler.m in Sources */,
78327843
58E2A1FD24E497400027A28A /* MSIDWebResponseOperationConstants.m in Sources */,
7844+
E656E07A2C2627B80011FB23 /* MSIDWebUpgradeRegResponse.m in Sources */,
78337845
232173EE2182B195009852C6 /* MSIDIntuneInMemoryCacheDataSource.m in Sources */,
78347846
B251CC4A204105A7005E0179 /* MSIDBaseToken.m in Sources */,
78357847
2371A6142A4BAB29008A71F3 /* MSIDBrokerOperationBrowserNativeMessageResponse.m in Sources */,
@@ -8887,11 +8899,13 @@
88878899
isa = XCBuildConfiguration;
88888900
baseConfigurationReference = D6CF4E931FC3626A00CD70C5 /* identitycore__debug.xcconfig */;
88898901
buildSettings = {
8902+
CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
88908903
ENABLE_BITCODE = NO;
88918904
GCC_PREPROCESSOR_DEFINITIONS = (
88928905
"$(inherited)",
88938906
"$(MSID_WEBKIT)",
88948907
"$(MSID_SYSTEMWV)",
8908+
"$(MSAL_JS_AUTOMATION)",
88958909
);
88968910
GCC_WARN_SHADOW = YES;
88978911
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -8903,6 +8917,7 @@
89038917
isa = XCBuildConfiguration;
89048918
baseConfigurationReference = D6CF4E9C1FC3626B00CD70C5 /* identitycore__release.xcconfig */;
89058919
buildSettings = {
8920+
CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
89068921
ENABLE_BITCODE = NO;
89078922
GCC_PREPROCESSOR_DEFINITIONS = (
89088923
"$(MSID_SYSTEMWV)",

‎IdentityCore/src/MSIDBrokerConstants.h

+1
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ extern NSString * _Nonnull const MSID_BROKER_SDM_WPJ_ATTEMPTED;
9999
extern NSString * _Nonnull const MSID_EXP_RETRY_ON_NETWORK;
100100
extern NSString * _Nonnull const MSID_EXP_ENABLE_CONNECTION_CLOSE;
101101
extern NSString * _Nonnull const MSID_HTTP_CONNECTION;
102+
extern NSString * _Nonnull const MSID_CREATE_NEW_URL_SESSION;
102103
extern NSString * _Nonnull const MSID_HTTP_CONNECTION_VALUE;
103104
extern NSString * _Nonnull const MSID_FORCE_REFRESH_KEY;
104105

‎IdentityCore/src/MSIDBrokerConstants.m

+1
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
// Experiments
100100
NSString *const MSID_EXP_RETRY_ON_NETWORK = @"exp_retry_on_network";
101101
NSString *const MSID_EXP_ENABLE_CONNECTION_CLOSE = @"exp_enable_connection_close";
102+
NSString *const MSID_CREATE_NEW_URL_SESSION = @"create_new_url_session";
102103
// Http header
103104
NSString *const MSID_HTTP_CONNECTION = @"Connection";
104105
NSString *const MSID_HTTP_CONNECTION_VALUE = @"close";

‎IdentityCore/src/MSIDError.h

+6-1
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,12 @@ extern NSString * _Nonnull MSIDOAuthSubErrorKey;
2929
extern NSString * _Nonnull MSIDCorrelationIdKey;
3030
extern NSString * _Nonnull MSIDHTTPHeadersKey;
3131
extern NSString * _Nonnull MSIDHTTPResponseCodeKey;
32+
extern NSString * _Nonnull MSIDHTTPTruncatedResponseStringKey;
3233
extern NSString * _Nonnull MSIDUserDisplayableIdkey;
3334
extern NSString * _Nonnull MSIDHomeAccountIdkey;
35+
extern NSString * _Nonnull MSIDTokenProtectionRequired;
3436
extern NSString * _Nonnull MSIDBrokerVersionKey;
37+
extern NSString * _Nonnull MSIDThrottlingCacheHitKey;
3538

3639
/*!
3740
ADAL and MSID use different error domains and error codes.
@@ -204,6 +207,8 @@ typedef NS_ENUM(NSInteger, MSIDErrorCode)
204207
// Tried to open local UI in app extension
205208
MSIDErrorUINotSupportedInExtension = -51731,
206209

210+
// Workplacejoin device upgrade registration required for device.
211+
MSIDErrorInsufficientDeviceStrength = -51732,
207212
/*!
208213
=========================================================
209214
Broker flow errors (518xx and 519xx) - MSIDErrorDomain
@@ -327,7 +332,7 @@ typedef NS_ENUM(NSInteger, MSIDErrorCode)
327332

328333
// JIT - Error Handling config invalid or not found
329334
MSIDErrorJITErrorHandlingConfigNotFound = -51839,
330-
335+
331336
// Throttling errors
332337
MSIDErrorThrottleCacheNoRecord = -51900,
333338
MSIDErrorThrottleCacheInvalidSignature = -51901,

‎IdentityCore/src/MSIDError.m

+10-2
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,15 @@
2929
NSString *MSIDCorrelationIdKey = @"MSIDCorrelationIdKey";
3030
NSString *MSIDHTTPHeadersKey = @"MSIDHTTPHeadersKey";
3131
NSString *MSIDHTTPResponseCodeKey = @"MSIDHTTPResponseCodeKey";
32+
NSString *MSIDHTTPTruncatedResponseStringKey = @"MSIDHTTPResponseStringKey";
3233
NSString *MSIDDeclinedScopesKey = @"MSIDDeclinedScopesKey";
3334
NSString *MSIDGrantedScopesKey = @"MSIDGrantedScopesKey";
3435
NSString *MSIDUserDisplayableIdkey = @"MSIDUserDisplayableIdkey";
3536
NSString *MSIDHomeAccountIdkey = @"MSIDHomeAccountIdkey";
37+
NSString *MSIDTokenProtectionRequired = @"MSIDTokenProtectionRequired";
3638
NSString *MSIDBrokerVersionKey = @"MSIDBrokerVersionKey";
3739
NSString *MSIDServerUnavailableStatusKey = @"MSIDServerUnavailableStatusKey";
40+
NSString *MSIDThrottlingCacheHitKey = @"MSIDThrottlingCacheHitKey";
3841

3942
NSString *MSIDErrorDomain = @"MSIDErrorDomain";
4043
NSString *MSIDOAuthErrorDomain = @"MSIDOAuthErrorDomain";
@@ -121,6 +124,10 @@ MSIDErrorCode MSIDErrorCodeForOAuthErrorWithSubErrorCode(NSString *oauthError, M
121124
{ // When account Transfter Token is expired.
122125
return MSIDErrorUserCancel;
123126
}
127+
if (oauthError && [oauthError caseInsensitiveCompare:@"invalid_grant"] == NSOrderedSame && [subError caseInsensitiveCompare:@"insufficient_device_strength"] == NSOrderedSame)
128+
{ // Migration required for device.
129+
return MSIDErrorInsufficientDeviceStrength;
130+
}
124131
if (oauthError && [oauthError caseInsensitiveCompare:@"access_denied"] == NSOrderedSame && [subError caseInsensitiveCompare:@"tts_denied"] == NSOrderedSame)
125132
{ //when user cancels, this is the same error we return to mobile app for Account Transfer
126133
return MSIDErrorUserCancel;
@@ -159,7 +166,7 @@ MSIDErrorCode MSIDErrorCodeForOAuthErrorWithSubErrorCode(NSString *oauthError, M
159166
@(MSIDErrorNoMainViewController),
160167
@(MSIDErrorAttemptToOpenURLFromExtension),
161168
@(MSIDErrorUINotSupportedInExtension),
162-
169+
@(MSIDErrorInsufficientDeviceStrength),
163170
// Broker errors
164171
@(MSIDErrorBrokerResponseNotReceived),
165172
@(MSIDErrorBrokerNoResumeStateFound),
@@ -198,7 +205,6 @@ MSIDErrorCode MSIDErrorCodeForOAuthErrorWithSubErrorCode(NSString *oauthError, M
198205
@(MSIDErrorDeviceNotPSSORegistered),
199206
@(MSIDErrorPSSOKeyIdMismatch),
200207
@(MSIDErrorJITErrorHandlingConfigNotFound),
201-
202208
],
203209
MSIDOAuthErrorDomain : @[// Server Errors
204210
@(MSIDErrorServerOauth),
@@ -311,6 +317,8 @@ void MSIDFillAndLogError(NSError **error, MSIDErrorCode errorCode, NSString *err
311317
return @"MSIDErrorAttemptToOpenURLFromExtension";
312318
case MSIDErrorUINotSupportedInExtension:
313319
return @"MSIDErrorUINotSupportedInExtension";
320+
case MSIDErrorInsufficientDeviceStrength:
321+
return @"MSIDErrorInsufficientDeviceStrength";
314322
// Broker flow errors
315323
case MSIDErrorBrokerResponseNotReceived:
316324
return @"MSIDErrorBrokerResponseNotReceived";

‎IdentityCore/src/MSIDJsonSerializableFactory.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ This method is tread safe.
6565
+ (nullable id<MSIDJsonSerializable>)createFromJSONDictionary:(NSDictionary *)json
6666
classTypeJSONKey:(NSString *)classTypeJSONKey
6767
assertKindOfClass:(Class)aClass
68-
error:(NSError **)error;
68+
error:(NSError *__autoreleasing*)error;
6969

7070
/*!
7171
Create instance of class from the provided json payload.
@@ -77,7 +77,7 @@ This method is tread safe.
7777
+ (nullable id<MSIDJsonSerializable>)createFromJSONDictionary:(NSDictionary *)json
7878
classType:(NSString *)classType
7979
assertKindOfClass:(Class)aClass
80-
error:(NSError **)error;
80+
error:(NSError *__autoreleasing*)error;
8181

8282
@end
8383

‎IdentityCore/src/MSIDJsonSerializableFactory.m

+3-3
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ + (void)unregisterAll
8181
+ (id<MSIDJsonSerializable>)createFromJSONDictionary:(NSDictionary *)json
8282
classTypeJSONKey:(NSString *)classTypeJSONKey
8383
assertKindOfClass:(Class)aClass
84-
error:(NSError **)error
84+
error:(NSError *__autoreleasing*)error
8585
{
8686
if (![json msidAssertType:NSString.class ofKey:classTypeJSONKey required:YES error:error]) return nil;
8787
NSString *classTypeValue = json[classTypeJSONKey];
@@ -108,7 +108,7 @@ + (void)unregisterAll
108108
+ (id<MSIDJsonSerializable>)createFromJSONDictionary:(NSDictionary *)json
109109
classType:(NSString *)classTypeValue
110110
assertKindOfClass:(Class)aClass
111-
error:(NSError **)error
111+
error:(NSError *__autoreleasing*)error
112112
{
113113
return [self createFromJSONDictionary:json containerKey:classTypeValue assertKindOfClass:aClass error:error];
114114
}
@@ -129,7 +129,7 @@ + (NSString *)mappingKeyForClass:(Class)aClass key:(NSString *)key keyValue:(NSS
129129
+ (id<MSIDJsonSerializable>)createFromJSONDictionary:(NSDictionary *)json
130130
containerKey:(NSString *)containerKey
131131
assertKindOfClass:(Class)aClass
132-
error:(NSError **)error
132+
error:(NSError *__autoreleasing*)error
133133
{
134134
Class class = (Class<MSIDJsonSerializable>)s_container[containerKey];
135135

‎IdentityCore/src/MSIDJsonSerializer.m

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ - (instancetype)init
5050

5151
- (NSData *)toJsonData:(id<MSIDJsonSerializable>)serializable
5252
context:(id<MSIDRequestContext>)context
53-
error:(NSError **)error
53+
error:(NSError *__autoreleasing*)error
5454
{
5555
__auto_type jsonDictionary = [serializable jsonDictionary];
5656
return [self serializeToJsonData:jsonDictionary error:error];
@@ -59,7 +59,7 @@ - (NSData *)toJsonData:(id<MSIDJsonSerializable>)serializable
5959
- (id<MSIDJsonSerializable>)fromJsonData:(NSData *)data
6060
ofType:(Class)klass
6161
context:(id<MSIDRequestContext>)context
62-
error:(NSError **)error
62+
error:(NSError *__autoreleasing*)error
6363
{
6464
NSParameterAssert([klass conformsToProtocol:@protocol(MSIDJsonSerializable)]);
6565
if (![klass conformsToProtocol:@protocol(MSIDJsonSerializable)]) return nil;
@@ -85,7 +85,7 @@ - (NSData *)toJsonData:(id<MSIDJsonSerializable>)serializable
8585

8686
- (NSString *)toJsonString:(id<MSIDJsonSerializable>)serializable
8787
context:(id<MSIDRequestContext>)context
88-
error:(NSError **)error
88+
error:(NSError *__autoreleasing*)error
8989
{
9090
NSData *jsonData = [self toJsonData:serializable context:context error:error];
9191
if (!jsonData) return nil;
@@ -96,7 +96,7 @@ - (NSString *)toJsonString:(id<MSIDJsonSerializable>)serializable
9696
- (id<MSIDJsonSerializable>)fromJsonString:(NSString *)jsonString
9797
ofType:(Class)klass
9898
context:(id<MSIDRequestContext>)context
99-
error:(NSError **)error
99+
error:(NSError *__autoreleasing*)error
100100
{
101101
NSParameterAssert([klass conformsToProtocol:@protocol(MSIDJsonSerializable)]);
102102
if (![klass conformsToProtocol:@protocol(MSIDJsonSerializable)]) return nil;

‎IdentityCore/src/MSIDOAuth2Constants.h

+2
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@ extern NSString *const MSID_REFRESH_ON_CACHE_KEY;
120120
extern NSString *const MSID_OAUTH_TOKEN_TYPE_CACHE_KEY;
121121
extern NSString *const MSID_CACHED_AT_CACHE_KEY;
122122
extern NSString *const MSID_LAST_RECOVERY_ATTEMPT_CACHE_KEY;
123+
extern NSString *const MSID_RECOVERY_ATTEMPT_COUNT_CACHE_KEY;
124+
extern NSString *const MSID_LAST_RECOVERY_ATTEMPT_FAILED_CACHE_KEY;
123125
extern NSString *const MSID_EXTENDED_EXPIRES_ON_CACHE_KEY;
124126
extern NSString *const MSID_EXPIRES_IN_CACHE_KEY;
125127
extern NSString *const MSID_SPE_INFO_CACHE_KEY;

‎IdentityCore/src/MSIDOAuth2Constants.m

+2
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@
120120
NSString *const MSID_OAUTH_TOKEN_TYPE_CACHE_KEY = @"access_token_type";
121121
NSString *const MSID_CACHED_AT_CACHE_KEY = @"cached_at";
122122
NSString *const MSID_LAST_RECOVERY_ATTEMPT_CACHE_KEY = @"recovery_attempted_at";
123+
NSString *const MSID_RECOVERY_ATTEMPT_COUNT_CACHE_KEY = @"recovery_attempt_count";
124+
NSString *const MSID_LAST_RECOVERY_ATTEMPT_FAILED_CACHE_KEY = @"last_recovery_attempt_failed";
123125
NSString *const MSID_EXTENDED_EXPIRES_ON_CACHE_KEY = @"extended_expires_on";
124126
NSString *const MSID_EXPIRES_IN_CACHE_KEY = @"expires_in";
125127
NSString *const MSID_SPE_INFO_CACHE_KEY = @"spe_info";

‎IdentityCore/src/MSIDWebResponseOperationConstants.h

+1
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@
2626

2727
extern NSString * _Nonnull const MSID_INSTALL_BROKER_OPERATION;
2828
extern NSString * _Nonnull const MSID_OPEN_BROSWER_OPERATION;
29+
extern NSString * _Nonnull const MSID_UPGRADE_REGISTRATION_BROKER_OPERATION;

‎IdentityCore/src/MSIDWebResponseOperationConstants.m

+3-2
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,6 @@
2424

2525
#import "MSIDWebResponseOperationConstants.h"
2626

27-
NSString *const MSID_INSTALL_BROKER_OPERATION = @"install_broker_operation";
28-
NSString *const MSID_OPEN_BROSWER_OPERATION = @"open_broswer_operation";
27+
NSString *const MSID_INSTALL_BROKER_OPERATION = @"install_broker_operation";
28+
NSString *const MSID_OPEN_BROSWER_OPERATION = @"open_broswer_operation";
29+
NSString *const MSID_UPGRADE_REGISTRATION_BROKER_OPERATION = @"upgrade_registration_broker_operation";

‎IdentityCore/src/auth_scheme/MSIDAuthenticationScheme.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ - (BOOL)matchAccessTokenKeyThumbprint:(__unused MSIDAccessToken *)accessToken
8181
return YES;
8282
}
8383

84-
- (instancetype)initWithJSONDictionary:(__unused NSDictionary *)json error:(__unused NSError **)error
84+
- (instancetype)initWithJSONDictionary:(__unused NSDictionary *)json error:(__unused NSError *__autoreleasing*)error
8585
{
8686
return [self initWithSchemeParameters:[NSDictionary new]];
8787
}

‎IdentityCore/src/auth_scheme/MSIDAuthenticationSchemePop.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ - (BOOL)matchAccessTokenKeyThumbprint:(MSIDAccessToken *)accessToken
127127
return accessToken.kid && self.kid && [self.kid isEqualToString:accessToken.kid];
128128
}
129129

130-
- (instancetype)initWithJSONDictionary:(NSDictionary *)json error:(NSError **)error
130+
- (instancetype)initWithJSONDictionary:(NSDictionary *)json error:(NSError *__autoreleasing*)error
131131
{
132132
NSMutableDictionary *schemeParameters = [NSMutableDictionary new];
133133
NSString *requestConf = json[MSID_OAUTH2_REQUEST_CONFIRMATION];

‎IdentityCore/src/auth_scheme/MSIDAuthenticationSchemeSshCert.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ - (MSIDAuthScheme)authSchemeFromParameters:(NSDictionary *)schemeParameters
8888
return MSIDAuthSchemeTypeFromString(scheme);
8989
}
9090

91-
- (instancetype)initWithJSONDictionary:(NSDictionary *)json error:(NSError **)error
91+
- (instancetype)initWithJSONDictionary:(NSDictionary *)json error:(NSError *__autoreleasing*)error
9292
{
9393
NSMutableDictionary *schemeParameters = [NSMutableDictionary new];
9494
NSString *requestConf = json[MSID_OAUTH2_REQUEST_CONFIRMATION];

‎IdentityCore/src/broker_operation/request/MSIDBrokerOperationGetDeviceInfoRequest.m

+1-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ + (NSString *)operation
4141

4242
#pragma mark - MSIDJsonSerializable
4343

44-
- (instancetype)initWithJSONDictionary:(NSDictionary *)json error:(NSError **)error
44+
- (instancetype)initWithJSONDictionary:(NSDictionary *)json error:(NSError *__autoreleasing*)error
4545
{
4646
self = [super initWithJSONDictionary:json error:error];
4747

@@ -56,5 +56,3 @@ - (NSDictionary *)jsonDictionary
5656
}
5757

5858
@end
59-
60-

0 commit comments

Comments
 (0)