Skip to content

Commit 5ad0e97

Browse files
author
kai
committed
Update enums for xpc mode naming
1 parent b2869af commit 5ad0e97

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

‎IdentityCore/src/MSIDConstants.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ typedef NS_ENUM(NSInteger, MSIDHeaderType)
9595

9696
typedef NS_ENUM(NSUInteger, MSIDXpcMode)
9797
{
98-
MSIDXpcModeDisable = 0, // Broker Xpc service call is disabled
99-
MSIDXpcModeBackup,// Broker Xpc service call is only used as a backup service when SsoExtension service failed. If SsoExtenion is not available on the device (canPerformRequest returns false), Broker Xpc service call will be disabled
100-
MSIDXpcModeFull, // Broker Xpc service call is used as a backup call when SsoExtension service failed. If SsoExtenion is not available on the device, Xpc service call will be the primary auth service
101-
MSIDXpcModeOverride // Development only: Broker Xpc service is used as main Sso service, and ignored SsoExtension service completely. This option will be ignored in production and will be treated same as MSIDXpcModeDisable
98+
MSIDXpcModeDisabled = 0, // Broker Xpc service call is disabled
99+
MSIDXpcModeSSOExtBackup,// Broker Xpc service call is only used as a backup service when SsoExtension service failed. If SsoExtenion is not available on the device (canPerformRequest returns false), Broker Xpc service call will be disabled
100+
MSIDXpcModeSSOExtCompanion, // Broker Xpc service call is used as a backup call when SsoExtension service failed. If SsoExtenion is not available on the device, Xpc service call will be the primary auth service
101+
MSIDXpcModePrimary // Development only: Broker Xpc service is used as main Sso service, and ignored SsoExtension service completely. This option will be ignored in production and will be treated same as MSIDXpcModeDisable
102102
};
103103

104104
typedef void (^MSIDRequestCompletionBlock)(MSIDTokenResult * _Nullable result, NSError * _Nullable error);

‎IdentityCore/src/controllers/MSIDRequestControllerFactory.m‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ @implementation MSIDRequestControllerFactory
4848
tokenRequestProvider:(id<MSIDTokenRequestProviding>)tokenRequestProvider
4949
error:(NSError *__autoreleasing*)error
5050
{
51-
if (parameters.xpcMode == MSIDXpcModeDisable)
51+
if (parameters.xpcMode == MSIDXpcModeDisabled)
5252
{
5353
return [self SilentControllerWithoutXpcForParameters:parameters
5454
forceRefresh:forceRefresh
@@ -165,14 +165,14 @@ @implementation MSIDRequestControllerFactory
165165

166166
MSIDSilentController *xpcController = nil;
167167
#if TARGET_OS_OSX
168-
if (parameters.xpcMode != MSIDXpcModeDisable && [MSIDXpcSilentTokenRequestController canPerformRequest])
168+
if (parameters.xpcMode != MSIDXpcModeDisabled && [MSIDXpcSilentTokenRequestController canPerformRequest])
169169
{
170170
xpcController = [[MSIDXpcSilentTokenRequestController alloc] initWithRequestParameters:parameters
171171
forceRefresh:forceRefresh
172172
tokenRequestProvider:tokenRequestProvider
173173
fallbackInteractiveController:fallbackController
174174
error:error];
175-
if (parameters.xpcMode == MSIDXpcModeFull || parameters.xpcMode == MSIDXpcModeOverride)
175+
if (parameters.xpcMode == MSIDXpcModeSSOExtCompanion || parameters.xpcMode == MSIDXpcModePrimary)
176176
{
177177
// If in Xpc full mode, the XPCController will work as a isolated controller when SsoExtension cannotPerformRequest
178178
fallbackController = xpcController;
@@ -181,7 +181,7 @@ @implementation MSIDRequestControllerFactory
181181
}
182182
#endif
183183

184-
BOOL shouldSkipSsoExtension = parameters.xpcMode == MSIDXpcModeOverride;
184+
BOOL shouldSkipSsoExtension = parameters.xpcMode == MSIDXpcModePrimary;
185185

186186
if (!shouldSkipSsoExtension && [MSIDSSOExtensionSilentTokenRequestController canPerformRequest])
187187
{
@@ -338,19 +338,19 @@ @implementation MSIDRequestControllerFactory
338338
id<MSIDRequestControlling> xpcController = nil;
339339

340340
// By default the xpc flow is disable, and should fallback to previous flow in else condition
341-
if (parameters.xpcMode != MSIDXpcModeDisable)
341+
if (parameters.xpcMode != MSIDXpcModeDisabled)
342342
{
343343
xpcController = [self xpcInteractiveController:parameters
344344
tokenRequestProvider:tokenRequestProvider
345345
fallbackController:fallbackController
346346
error:error];
347-
if (parameters.xpcMode == MSIDXpcModeBackup || parameters.xpcMode == MSIDXpcModeFull)
347+
if (parameters.xpcMode == MSIDXpcModeSSOExtBackup || parameters.xpcMode == MSIDXpcModePrimary)
348348
{
349349
id<MSIDRequestControlling> ssoExtensionController = [self ssoExtensionInteractiveController:parameters
350350
tokenRequestProvider:tokenRequestProvider
351351
fallbackController:xpcController?:fallbackController
352352
error:error];
353-
if (parameters.xpcMode == MSIDXpcModeFull && !ssoExtensionController)
353+
if (parameters.xpcMode == MSIDXpcModePrimary && !ssoExtensionController)
354354
{
355355
return xpcController;
356356
}
@@ -359,7 +359,7 @@ @implementation MSIDRequestControllerFactory
359359
}
360360
else
361361
{
362-
// Development only: MSIDXpcModeOverride
362+
// Development only: MSIDXpcModePrimary
363363
return xpcController;
364364
}
365365
}

‎IdentityCore/tests/MSIDRequestControllerFactoryTests.m‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ - (void)testWhenInteractiveXpcIsBackup_andSsoExtensionIsDisabled_controllersOrde
208208
testError:nil
209209
testWebMSAuthResponse:nil];
210210
MSIDInteractiveTokenRequestParameters *parameters = [self requestParameters];
211-
parameters.xpcMode = MSIDXpcModeBackup;
211+
parameters.xpcMode = MSIDXpcModeSSOExtBackup;
212212

213213
NSError *error;
214214
SEL selectorForMSIDSSOExtensionInteractiveTokenRequestController = NSSelectorFromString(@"canPerformRequest");
@@ -249,7 +249,7 @@ - (void)testWhenInteractiveXpcIsBackup_andSsoExtensionIsEnabled_controllersOrder
249249
testError:nil
250250
testWebMSAuthResponse:nil];
251251
MSIDInteractiveTokenRequestParameters *parameters = [self requestParameters];
252-
parameters.xpcMode = MSIDXpcModeBackup;
252+
parameters.xpcMode = MSIDXpcModeSSOExtBackup;
253253

254254
NSError *error;
255255
SEL selectorForMSIDSSOExtensionInteractiveTokenRequestController = NSSelectorFromString(@"canPerformRequest");
@@ -307,7 +307,7 @@ - (void)testWhenInteractiveXpcIsDisabled_andSsoExtensionIsEnabled_controllersOrd
307307
testError:nil
308308
testWebMSAuthResponse:nil];
309309
MSIDInteractiveTokenRequestParameters *parameters = [self requestParameters];
310-
parameters.xpcMode = MSIDXpcModeBackup;
310+
parameters.xpcMode = MSIDXpcModeSSOExtBackup;
311311

312312
NSError *error;
313313
SEL selectorForMSIDSSOExtensionInteractiveTokenRequestController = NSSelectorFromString(@"canPerformRequest");
@@ -360,7 +360,7 @@ - (void)testWhenInteractiveXpcIsDisabled_andSsoExtensionIsDisabled_controllersOr
360360
testError:nil
361361
testWebMSAuthResponse:nil];
362362
MSIDInteractiveTokenRequestParameters *parameters = [self requestParameters];
363-
parameters.xpcMode = MSIDXpcModeBackup;
363+
parameters.xpcMode = MSIDXpcModeSSOExtBackup;
364364

365365
NSError *error;
366366
SEL selectorForMSIDSSOExtensionInteractiveTokenRequestController = NSSelectorFromString(@"canPerformRequest");
@@ -404,7 +404,7 @@ - (void)testWhenInteractiveXpcIsFull_andSsoExtensionIsDisabled_controllersOrder_
404404
testError:nil
405405
testWebMSAuthResponse:nil];
406406
MSIDInteractiveTokenRequestParameters *parameters = [self requestParameters];
407-
parameters.xpcMode = MSIDXpcModeFull;
407+
parameters.xpcMode = MSIDXpcModeSSOExtCompanion;
408408

409409
NSError *error;
410410
SEL selectorForMSIDSSOExtensionInteractiveTokenRequestController = NSSelectorFromString(@"canPerformRequest");
@@ -458,7 +458,7 @@ - (void)testWhenInteractiveXpcIsFull_andSsoExtensionIsEnabled_controllersOrder_a
458458
testError:nil
459459
testWebMSAuthResponse:nil];
460460
MSIDInteractiveTokenRequestParameters *parameters = [self requestParameters];
461-
parameters.xpcMode = MSIDXpcModeFull;
461+
parameters.xpcMode = MSIDXpcModeSSOExtCompanion;
462462

463463
NSError *error;
464464
SEL selectorForMSIDSSOExtensionInteractiveTokenRequestController = NSSelectorFromString(@"canPerformRequest");
@@ -517,7 +517,7 @@ - (void)testWhenSsoExtensionIsEnabled_andXpcIsPartiallyEnabled_andSsoExtensionIs
517517
testError:nil
518518
testWebMSAuthResponse:nil];
519519
MSIDRequestParameters *parameters = [self requestParameters];
520-
parameters.xpcMode = MSIDXpcModeBackup;
520+
parameters.xpcMode = MSIDXpcModeSSOExtBackup;
521521
parameters.allowUsingLocalCachedRtWhenSsoExtFailed = YES;
522522

523523
NSError *error;
@@ -578,7 +578,7 @@ - (void)testWhenSsoExtensionIsEnabled_andXpcIsPartiallyEnabled_andSsoExtensionIs
578578
testError:nil
579579
testWebMSAuthResponse:nil];
580580
MSIDRequestParameters *parameters = [self requestParameters];
581-
parameters.xpcMode = MSIDXpcModeBackup;
581+
parameters.xpcMode = MSIDXpcModeSSOExtBackup;
582582
parameters.allowUsingLocalCachedRtWhenSsoExtFailed = YES;
583583

584584
NSError *error;
@@ -652,7 +652,7 @@ - (void)testWhenSsoExtensionIsEnabled_andXpcIsFullyEnabled_andSsoExtensionIsDisa
652652
testError:nil
653653
testWebMSAuthResponse:nil];
654654
MSIDRequestParameters *parameters = [self requestParameters];
655-
parameters.xpcMode = MSIDXpcModeFull;
655+
parameters.xpcMode = MSIDXpcModeSSOExtCompanion;
656656
parameters.allowUsingLocalCachedRtWhenSsoExtFailed = YES;
657657

658658
NSError *error;

0 commit comments

Comments
 (0)