Skip to content

Commit 440c559

Browse files
author
kai
committed
Cleanups after merging to latest dev
1 parent dc230f1 commit 440c559

File tree

8 files changed

+30
-28
lines changed

8 files changed

+30
-28
lines changed

‎IdentityCore/IdentityCore.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -533,8 +533,6 @@
533533
2A24814D2CB06A1A006FCB34 /* MSIDSSORemoteSilentTokenRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A24814C2CB06A1A006FCB34 /* MSIDSSORemoteSilentTokenRequest.m */; };
534534
2A24814E2CB06A1A006FCB34 /* MSIDSSORemoteSilentTokenRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 2A24814B2CB06A1A006FCB34 /* MSIDSSORemoteSilentTokenRequest.h */; };
535535
2A24814F2CB06A1A006FCB34 /* MSIDSSORemoteSilentTokenRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A24814C2CB06A1A006FCB34 /* MSIDSSORemoteSilentTokenRequest.m */; };
536-
2A2481532CB07BCC006FCB34 /* MSIDSSOXpcSilentTokenRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A2481512CB07BCC006FCB34 /* MSIDSSOXpcSilentTokenRequest.m */; };
537-
2A2481542CB07BCC006FCB34 /* MSIDSSOXpcSilentTokenRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 2A2481502CB07BCC006FCB34 /* MSIDSSOXpcSilentTokenRequest.h */; };
538536
2A2481582CB08050006FCB34 /* MSIDXpcSingleSignOnProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A2481562CB08050006FCB34 /* MSIDXpcSingleSignOnProvider.m */; };
539537
2A2481592CB08050006FCB34 /* MSIDXpcSingleSignOnProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 2A2481552CB08050006FCB34 /* MSIDXpcSingleSignOnProvider.h */; };
540538
2A24815F2CB08344006FCB34 /* MSIDXpcSilentTokenRequestController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A24815D2CB08344006FCB34 /* MSIDXpcSilentTokenRequestController.m */; };
@@ -555,6 +553,8 @@
555553
2A59B4402D7924E400304FB1 /* MSIDSSOXpcInteractiveTokenRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A59B43D2D7924E400304FB1 /* MSIDSSOXpcInteractiveTokenRequest.m */; };
556554
2A59B4442D7A0CB500304FB1 /* MSIDSSOXpcInteractiveTokenRequestController.h in Headers */ = {isa = PBXBuildFile; fileRef = 2A59B4412D7A0CB500304FB1 /* MSIDSSOXpcInteractiveTokenRequestController.h */; };
557555
2A59B4452D7A0CB500304FB1 /* MSIDSSOXpcInteractiveTokenRequestController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A59B4422D7A0CB500304FB1 /* MSIDSSOXpcInteractiveTokenRequestController.m */; };
556+
2AADDAC72DADB84D00CB7740 /* MSIDSSOXpcSilentTokenRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AADDAC62DADB84D00CB7740 /* MSIDSSOXpcSilentTokenRequest.m */; };
557+
2AADDAC82DADB84D00CB7740 /* MSIDSSOXpcSilentTokenRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AADDAC52DADB84D00CB7740 /* MSIDSSOXpcSilentTokenRequest.h */; };
558558
580E25402719FD10003D1795 /* MSIDPrtHeader.h in Headers */ = {isa = PBXBuildFile; fileRef = 580E253E2719FD10003D1795 /* MSIDPrtHeader.h */; };
559559
580E25412719FD10003D1795 /* MSIDPrtHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 580E253F2719FD10003D1795 /* MSIDPrtHeader.m */; };
560560
580E25422719FD10003D1795 /* MSIDPrtHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 580E253F2719FD10003D1795 /* MSIDPrtHeader.m */; };
@@ -2435,8 +2435,6 @@
24352435
2A0278A22D6E3787005655B4 /* MSIDLastRequestTelemetry+Tests.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MSIDLastRequestTelemetry+Tests.h"; sourceTree = "<group>"; };
24362436
2A24814B2CB06A1A006FCB34 /* MSIDSSORemoteSilentTokenRequest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDSSORemoteSilentTokenRequest.h; sourceTree = "<group>"; };
24372437
2A24814C2CB06A1A006FCB34 /* MSIDSSORemoteSilentTokenRequest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDSSORemoteSilentTokenRequest.m; sourceTree = "<group>"; };
2438-
2A2481502CB07BCC006FCB34 /* MSIDSSOXpcSilentTokenRequest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDSSOXpcSilentTokenRequest.h; sourceTree = "<group>"; };
2439-
2A2481512CB07BCC006FCB34 /* MSIDSSOXpcSilentTokenRequest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDSSOXpcSilentTokenRequest.m; sourceTree = "<group>"; };
24402438
2A2481552CB08050006FCB34 /* MSIDXpcSingleSignOnProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDXpcSingleSignOnProvider.h; sourceTree = "<group>"; };
24412439
2A2481562CB08050006FCB34 /* MSIDXpcSingleSignOnProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDXpcSingleSignOnProvider.m; sourceTree = "<group>"; };
24422440
2A24815C2CB08344006FCB34 /* MSIDXpcSilentTokenRequestController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDXpcSilentTokenRequestController.h; sourceTree = "<group>"; };
@@ -2455,6 +2453,8 @@
24552453
2A59B43D2D7924E400304FB1 /* MSIDSSOXpcInteractiveTokenRequest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDSSOXpcInteractiveTokenRequest.m; sourceTree = "<group>"; };
24562454
2A59B4412D7A0CB500304FB1 /* MSIDSSOXpcInteractiveTokenRequestController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDSSOXpcInteractiveTokenRequestController.h; sourceTree = "<group>"; };
24572455
2A59B4422D7A0CB500304FB1 /* MSIDSSOXpcInteractiveTokenRequestController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDSSOXpcInteractiveTokenRequestController.m; sourceTree = "<group>"; };
2456+
2AADDAC52DADB84D00CB7740 /* MSIDSSOXpcSilentTokenRequest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDSSOXpcSilentTokenRequest.h; sourceTree = "<group>"; };
2457+
2AADDAC62DADB84D00CB7740 /* MSIDSSOXpcSilentTokenRequest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDSSOXpcSilentTokenRequest.m; sourceTree = "<group>"; };
24582458
51E364572863C0F300A97F82 /* MSIDTelemetryConditionalCompile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MSIDTelemetryConditionalCompile.h; sourceTree = "<group>"; };
24592459
580E253E2719FD10003D1795 /* MSIDPrtHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDPrtHeader.h; sourceTree = "<group>"; };
24602460
580E253F2719FD10003D1795 /* MSIDPrtHeader.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDPrtHeader.m; sourceTree = "<group>"; };
@@ -4109,15 +4109,19 @@
41094109
children = (
41104110
2A24815C2CB08344006FCB34 /* MSIDXpcSilentTokenRequestController.h */,
41114111
2A24815D2CB08344006FCB34 /* MSIDXpcSilentTokenRequestController.m */,
4112+
2A59B4412D7A0CB500304FB1 /* MSIDSSOXpcInteractiveTokenRequestController.h */,
4113+
2A59B4422D7A0CB500304FB1 /* MSIDSSOXpcInteractiveTokenRequestController.m */,
41124114
);
41134115
path = mac;
41144116
sourceTree = "<group>";
41154117
};
41164118
2A953DF72DA45B3100A748BA /* mac */ = {
41174119
isa = PBXGroup;
41184120
children = (
4119-
2A2481502CB07BCC006FCB34 /* MSIDSSOXpcSilentTokenRequest.h */,
4120-
2A2481512CB07BCC006FCB34 /* MSIDSSOXpcSilentTokenRequest.m */,
4121+
2AADDAC52DADB84D00CB7740 /* MSIDSSOXpcSilentTokenRequest.h */,
4122+
2AADDAC62DADB84D00CB7740 /* MSIDSSOXpcSilentTokenRequest.m */,
4123+
2A59B43C2D7924E400304FB1 /* MSIDSSOXpcInteractiveTokenRequest.h */,
4124+
2A59B43D2D7924E400304FB1 /* MSIDSSOXpcInteractiveTokenRequest.m */,
41214125
);
41224126
path = mac;
41234127
sourceTree = "<group>";
@@ -5204,12 +5208,8 @@
52045208
B443EFF12AD629A300782168 /* MSIDSSOExtensionPasskeyCredentialRequest.m */,
52055209
2A24814B2CB06A1A006FCB34 /* MSIDSSORemoteSilentTokenRequest.h */,
52065210
2A24814C2CB06A1A006FCB34 /* MSIDSSORemoteSilentTokenRequest.m */,
5207-
2A2481502CB07BCC006FCB34 /* MSIDSSOXpcSilentTokenRequest.h */,
5208-
2A2481512CB07BCC006FCB34 /* MSIDSSOXpcSilentTokenRequest.m */,
52095211
2A59B4372D78FE6B00304FB1 /* MSIDSSORemoteInteractiveTokenRequest.h */,
52105212
2A59B4382D78FE6B00304FB1 /* MSIDSSORemoteInteractiveTokenRequest.m */,
5211-
2A59B43C2D7924E400304FB1 /* MSIDSSOXpcInteractiveTokenRequest.h */,
5212-
2A59B43D2D7924E400304FB1 /* MSIDSSOXpcInteractiveTokenRequest.m */,
52135213
);
52145214
path = broker;
52155215
sourceTree = "<group>";
@@ -5221,8 +5221,6 @@
52215221
B286B9A22389DCDD007833AD /* ios */,
52225222
23B5DF7A234031ED002C530F /* MSIDSSOExtensionInteractiveTokenRequestController.h */,
52235223
23B5DF7C234031EE002C530F /* MSIDSSOExtensionInteractiveTokenRequestController.m */,
5224-
2A59B4412D7A0CB500304FB1 /* MSIDSSOXpcInteractiveTokenRequestController.h */,
5225-
2A59B4422D7A0CB500304FB1 /* MSIDSSOXpcInteractiveTokenRequestController.m */,
52265224
23B5DF79234031ED002C530F /* MSIDSSOExtensionSilentTokenRequestController.h */,
52275225
23B5DF7B234031ED002C530F /* MSIDSSOExtensionSilentTokenRequestController.m */,
52285226
B217863623A5994300839CE8 /* MSIDSSOExtensionSignoutController.h */,
@@ -6290,7 +6288,6 @@
62906288
74F04D4D246CB5B100094017 /* MSIDCurrentRequestTelemetrySerializedItem+Internal.h in Headers */,
62916289
238E19DD2086FE28004DF483 /* MSIDAADAuthorizationCodeRequest.h in Headers */,
62926290
B227037622A4C29800030ADC /* MSIDExtendedTokenCacheDataSource.h in Headers */,
6293-
2A2481542CB07BCC006FCB34 /* MSIDSSOXpcSilentTokenRequest.h in Headers */,
62946291
B251CC49204105A7005E0179 /* MSIDIdToken.h in Headers */,
62956292
B2F671EC2467AB4500649855 /* MSIDInteractiveRequestControlling.h in Headers */,
62966293
B443F0002AD6327700782168 /* MSIDBrokerOperationPasskeyCredentialRequest.h in Headers */,
@@ -6375,6 +6372,7 @@
63756372
B28D90A5218FD1E800E230D6 /* MSIDLegacyTokenResponseValidator.h in Headers */,
63766373
B2C708AA219A5A3D00D917B8 /* MSIDLegacySilentTokenRequest.h in Headers */,
63776374
96F21B3120A65896002B87C3 /* MSIDWebviewAuthorization.h in Headers */,
6375+
2AADDAC82DADB84D00CB7740 /* MSIDSSOXpcSilentTokenRequest.h in Headers */,
63786376
B286B9C52389DE78007833AD /* MSIDAccountMetadata.h in Headers */,
63796377
B2F671E32467A30400649855 /* MSIDInteractiveAuthorizationCodeRequest.h in Headers */,
63806378
1E707FE02407336300716148 /* MSIDBrokerBrowserOperationResponse.h in Headers */,
@@ -7201,13 +7199,13 @@
72017199
583BFCAB24D88CED0035B901 /* MSIDRedirectUriVerifier.m in Sources */,
72027200
B253152723DD61FB00432133 /* MSIDSSOExtensionGetDeviceInfoRequest.m in Sources */,
72037201
2A24815F2CB08344006FCB34 /* MSIDXpcSilentTokenRequestController.m in Sources */,
7202+
2AADDAC72DADB84D00CB7740 /* MSIDSSOXpcSilentTokenRequest.m in Sources */,
72047203
23C548062A2A5DBF00633DC0 /* MSIDBrokerOperationBrowserNativeMessageRequest.m in Sources */,
72057204
238D5D8C22B353830091A135 /* MSIDAADV2TokenResponseForV1Request.m in Sources */,
72067205
2352AF342AA7C7B700FA2253 /* MSIDBrowserNativeMessageGetTokenResponse.m in Sources */,
72077206
589BDB292718F18800BF3799 /* MSIDCredentialHeader.m in Sources */,
72087207
B25A356F1FC4D70300C7FD43 /* MSIDLogger.m in Sources */,
72097208
5887EBF32BBF6490005F9634 /* MSIDAuthenticationSchemeSshCert.m in Sources */,
7210-
2A2481532CB07BCC006FCB34 /* MSIDSSOXpcSilentTokenRequest.m in Sources */,
72117209
B2C7088F2198E48E00D917B8 /* NSData+AES.m in Sources */,
72127210
96F21B3320A65896002B87C3 /* MSIDWebviewAuthorization.m in Sources */,
72137211
B27893832470CFE700627C28 /* MSIDAssymetricKeyGeneratorFactory.m in Sources */,

‎IdentityCore/src/controllers/MSIDRequestControllerFactory.m‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -337,19 +337,19 @@ @implementation MSIDRequestControllerFactory
337337
{
338338
id<MSIDRequestControlling> xpcController = nil;
339339

340-
if (parameters.msidXpcMode != MSIDXpcModeDisable)
340+
if (parameters.xpcMode != MSIDXpcModeDisable)
341341
{
342342
xpcController = [self xpcInteractiveController:parameters
343343
tokenRequestProvider:tokenRequestProvider
344344
fallbackController:fallbackController
345345
error:error];
346-
if (parameters.msidXpcMode == MSIDXpcModeBackup || parameters.msidXpcMode == MSIDXpcModeFull)
346+
if (parameters.xpcMode == MSIDXpcModeBackup || parameters.xpcMode == MSIDXpcModeFull)
347347
{
348348
id<MSIDRequestControlling> ssoExtensionController = [self ssoExtensionInteractiveController:parameters
349349
tokenRequestProvider:tokenRequestProvider
350350
fallbackController:xpcController?:fallbackController
351351
error:error];
352-
if (parameters.msidXpcMode == MSIDXpcModeFull && !ssoExtensionController)
352+
if (parameters.xpcMode == MSIDXpcModeFull && !ssoExtensionController)
353353
{
354354
return xpcController;
355355
}
@@ -358,6 +358,7 @@ @implementation MSIDRequestControllerFactory
358358
}
359359
else
360360
{
361+
// Development only: MSIDXpcModeOverride
361362
return xpcController;
362363
}
363364
}

IdentityCore/src/controllers/broker/MSIDSSOXpcInteractiveTokenRequestController.h renamed to IdentityCore/src/controllers/broker/mac/MSIDSSOXpcInteractiveTokenRequestController.h

File renamed without changes.

IdentityCore/src/controllers/broker/MSIDSSOXpcInteractiveTokenRequestController.m renamed to IdentityCore/src/controllers/broker/mac/MSIDSSOXpcInteractiveTokenRequestController.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#import "MSIDThrottlingService.h"
3131
#import "MSIDInteractiveTokenRequest+Internal.h"
3232
#import "MSIDInteractiveTokenRequestParameters.h"
33+
#import "MSIDXpcProviderCache.h"
3334

3435
@implementation MSIDSSOXpcInteractiveTokenRequestController
3536

@@ -84,7 +85,7 @@ - (void)acquireToken:(MSIDRequestCompletionBlock)completionBlock
8485
+ (BOOL)canPerformRequest
8586
{
8687
if (@available(macOS 13, *)) {
87-
return [MSIDXpcSingleSignOnProvider canPerformRequest];
88+
return [MSIDXpcSingleSignOnProvider canPerformRequest:MSIDXpcProviderCache.sharedInstance];
8889
} else {
8990
return NO;
9091
}

IdentityCore/src/requests/broker/MSIDSSOXpcInteractiveTokenRequest.h renamed to IdentityCore/src/requests/broker/mac/MSIDSSOXpcInteractiveTokenRequest.h

File renamed without changes.

IdentityCore/src/requests/broker/MSIDSSOXpcInteractiveTokenRequest.m renamed to IdentityCore/src/requests/broker/mac/MSIDSSOXpcInteractiveTokenRequest.m

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#import "MSIDInteractiveTokenRequestParameters.h"
3131
#import "MSIDBrokerOperationTokenResponse.h"
3232
#import "MSIDMainThreadUtil.h"
33+
#import "MSIDXpcProviderCache.h"
3334

3435
@interface MSIDSSOXpcInteractiveTokenRequest()
3536

@@ -103,6 +104,7 @@ - (void)performXpcRequest:(NSDictionary *)xpcRequest
103104
[self.xpcSingleSignOnProvider handleRequestParam:parameters
104105
parentViewFrame:self.requestParameters.parentViewController.view.window.frame
105106
assertKindOfResponseClass:MSIDBrokerOperationTokenResponse.class
107+
xpcProviderCache:MSIDXpcProviderCache.sharedInstance
106108
context:self.context
107109
continueBlock:^(id _Nullable response, NSError * _Nullable error) {
108110
self.completionBlock(response, error);

‎IdentityCore/src/util/mac/MSIDXpcSingleSignOnProvider.m‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,8 @@ + (BOOL)canPerformRequest:(id<MSIDXpcProviderCaching>)xpcProviderCache
209209
}];
210210

211211
// waiting expired in 1 sec
212-
dispatch_time_t timeout = dispatch_time(DISPATCH_TIME_NOW, 1 * NSEC_PER_SEC);
213-
dispatch_group_wait(group, timeout);
212+
// dispatch_time_t timeout = dispatch_time(DISPATCH_TIME_NOW, 1 * NSEC_PER_SEC);
213+
dispatch_group_wait(group, DISPATCH_TIME_FOREVER);
214214
}
215215

216216
if (!xpcProviderCache.xpcConfiguration)
@@ -262,8 +262,8 @@ + (BOOL)canPerformRequest:(id<MSIDXpcProviderCaching>)xpcProviderCache
262262
}];
263263

264264
// waiting expired in 1 sec
265-
dispatch_time_t timeout = dispatch_time(DISPATCH_TIME_NOW, 1 * NSEC_PER_SEC);
266-
dispatch_group_wait(xpcGroup, timeout);
265+
// dispatch_time_t timeout = dispatch_time(DISPATCH_TIME_NOW, 1 * NSEC_PER_SEC);
266+
dispatch_group_wait(xpcGroup, DISPATCH_TIME_FOREVER);
267267

268268
return result;
269269

‎IdentityCore/tests/MSIDRequestControllerFactoryTests.m‎

Lines changed: 6 additions & 6 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.msidXpcMode = MSIDXpcModeBackup;
211+
parameters.xpcMode = MSIDXpcModeBackup;
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.msidXpcMode = MSIDXpcModeBackup;
252+
parameters.xpcMode = MSIDXpcModeBackup;
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.msidXpcMode = MSIDXpcModeBackup;
310+
parameters.xpcMode = MSIDXpcModeBackup;
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.msidXpcMode = MSIDXpcModeBackup;
363+
parameters.xpcMode = MSIDXpcModeBackup;
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.msidXpcMode = MSIDXpcModeFull;
407+
parameters.xpcMode = MSIDXpcModeFull;
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.msidXpcMode = MSIDXpcModeFull;
461+
parameters.xpcMode = MSIDXpcModeFull;
462462

463463
NSError *error;
464464
SEL selectorForMSIDSSOExtensionInteractiveTokenRequestController = NSSelectorFromString(@"canPerformRequest");

0 commit comments

Comments
 (0)