Skip to content

Commit c3982fc

Browse files
author
kai
committed
clean ups
1 parent 16fe054 commit c3982fc

File tree

7 files changed

+44
-43
lines changed

7 files changed

+44
-43
lines changed

‎IdentityCore/IdentityCore.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -551,8 +551,8 @@
551551
2A59B43B2D78FE6B00304FB1 /* MSIDSSORemoteInteractiveTokenRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A59B4382D78FE6B00304FB1 /* MSIDSSORemoteInteractiveTokenRequest.m */; };
552552
2A59B43F2D7924E400304FB1 /* MSIDSSOXpcInteractiveTokenRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 2A59B43C2D7924E400304FB1 /* MSIDSSOXpcInteractiveTokenRequest.h */; };
553553
2A59B4402D7924E400304FB1 /* MSIDSSOXpcInteractiveTokenRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A59B43D2D7924E400304FB1 /* MSIDSSOXpcInteractiveTokenRequest.m */; };
554-
2A59B4442D7A0CB500304FB1 /* MSIDSSOXpcInteractiveTokenRequestController.h in Headers */ = {isa = PBXBuildFile; fileRef = 2A59B4412D7A0CB500304FB1 /* MSIDSSOXpcInteractiveTokenRequestController.h */; };
555-
2A59B4452D7A0CB500304FB1 /* MSIDSSOXpcInteractiveTokenRequestController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A59B4422D7A0CB500304FB1 /* MSIDSSOXpcInteractiveTokenRequestController.m */; };
554+
2A59B4442D7A0CB500304FB1 /* MSIDXpcInteractiveTokenRequestController.h in Headers */ = {isa = PBXBuildFile; fileRef = 2A59B4412D7A0CB500304FB1 /* MSIDXpcInteractiveTokenRequestController.h */; };
555+
2A59B4452D7A0CB500304FB1 /* MSIDXpcInteractiveTokenRequestController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A59B4422D7A0CB500304FB1 /* MSIDXpcInteractiveTokenRequestController.m */; };
556556
2AADDAC72DADB84D00CB7740 /* MSIDSSOXpcSilentTokenRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AADDAC62DADB84D00CB7740 /* MSIDSSOXpcSilentTokenRequest.m */; };
557557
2AADDAC82DADB84D00CB7740 /* MSIDSSOXpcSilentTokenRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AADDAC52DADB84D00CB7740 /* MSIDSSOXpcSilentTokenRequest.h */; };
558558
580E25402719FD10003D1795 /* MSIDPrtHeader.h in Headers */ = {isa = PBXBuildFile; fileRef = 580E253E2719FD10003D1795 /* MSIDPrtHeader.h */; };
@@ -2451,8 +2451,8 @@
24512451
2A59B4382D78FE6B00304FB1 /* MSIDSSORemoteInteractiveTokenRequest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDSSORemoteInteractiveTokenRequest.m; sourceTree = "<group>"; };
24522452
2A59B43C2D7924E400304FB1 /* MSIDSSOXpcInteractiveTokenRequest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDSSOXpcInteractiveTokenRequest.h; sourceTree = "<group>"; };
24532453
2A59B43D2D7924E400304FB1 /* MSIDSSOXpcInteractiveTokenRequest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDSSOXpcInteractiveTokenRequest.m; sourceTree = "<group>"; };
2454-
2A59B4412D7A0CB500304FB1 /* MSIDSSOXpcInteractiveTokenRequestController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDSSOXpcInteractiveTokenRequestController.h; sourceTree = "<group>"; };
2455-
2A59B4422D7A0CB500304FB1 /* MSIDSSOXpcInteractiveTokenRequestController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDSSOXpcInteractiveTokenRequestController.m; sourceTree = "<group>"; };
2454+
2A59B4412D7A0CB500304FB1 /* MSIDXpcInteractiveTokenRequestController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDXpcInteractiveTokenRequestController.h; sourceTree = "<group>"; };
2455+
2A59B4422D7A0CB500304FB1 /* MSIDXpcInteractiveTokenRequestController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDXpcInteractiveTokenRequestController.m; sourceTree = "<group>"; };
24562456
2AADDAC52DADB84D00CB7740 /* MSIDSSOXpcSilentTokenRequest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDSSOXpcSilentTokenRequest.h; sourceTree = "<group>"; };
24572457
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>"; };
@@ -4109,8 +4109,8 @@
41094109
children = (
41104110
2A24815C2CB08344006FCB34 /* MSIDXpcSilentTokenRequestController.h */,
41114111
2A24815D2CB08344006FCB34 /* MSIDXpcSilentTokenRequestController.m */,
4112-
2A59B4412D7A0CB500304FB1 /* MSIDSSOXpcInteractiveTokenRequestController.h */,
4113-
2A59B4422D7A0CB500304FB1 /* MSIDSSOXpcInteractiveTokenRequestController.m */,
4112+
2A59B4412D7A0CB500304FB1 /* MSIDXpcInteractiveTokenRequestController.h */,
4113+
2A59B4422D7A0CB500304FB1 /* MSIDXpcInteractiveTokenRequestController.m */,
41144114
);
41154115
path = mac;
41164116
sourceTree = "<group>";
@@ -6041,7 +6041,7 @@
60416041
B28D909A218FA97400E230D6 /* MSIDBaseRequestController.h in Headers */,
60426042
B286B9C92389DE90007833AD /* MSIDCredentialCacheItem.h in Headers */,
60436043
B286B9BB2389DDBD007833AD /* MSIDHttpRequestTelemetryHandling.h in Headers */,
6044-
2A59B4442D7A0CB500304FB1 /* MSIDSSOXpcInteractiveTokenRequestController.h in Headers */,
6044+
2A59B4442D7A0CB500304FB1 /* MSIDXpcInteractiveTokenRequestController.h in Headers */,
60456045
583BFCA724D87BA40035B901 /* MSIDRedirectUri.h in Headers */,
60466046
B223B0A022ADD87A00FB8713 /* MSIDExtendedCacheItemSerializing.h in Headers */,
60476047
B286B9932389DC64007833AD /* MSIDBrokerResponseHandler+Internal.h in Headers */,
@@ -7514,7 +7514,7 @@
75147514
96C998F120B638F60053A2D9 /* MSIDWebviewSession.m in Sources */,
75157515
96891A982190F15E00D7F437 /* MSIDWPJChallengeHandler.m in Sources */,
75167516
B26CEADB23652795009E6E54 /* MSIDMacACLKeychainAccessor.m in Sources */,
7517-
2A59B4452D7A0CB500304FB1 /* MSIDSSOXpcInteractiveTokenRequestController.m in Sources */,
7517+
2A59B4452D7A0CB500304FB1 /* MSIDXpcInteractiveTokenRequestController.m in Sources */,
75187518
A0C7DED325D4CB2800F5B5B6 /* MSIDThrottlingModelNonRecoverableServerError.m in Sources */,
75197519
96090D9A20E59B2000E42B37 /* MSIDNotifications.m in Sources */,
75207520
23D2049521D1C274009B5975 /* MSIDTokenResponseSerializer.m in Sources */,

‎IdentityCore/src/controllers/MSIDRequestControllerFactory.m‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#import "MSIDSignoutController.h"
3838
#if TARGET_OS_OSX
3939
#import "MSIDXpcSilentTokenRequestController.h"
40-
#import "MSIDSSOXpcInteractiveTokenRequestController.h"
40+
#import "MSIDXpcInteractiveTokenRequestController.h"
4141
#endif
4242

4343
@implementation MSIDRequestControllerFactory
@@ -337,6 +337,7 @@ @implementation MSIDRequestControllerFactory
337337
{
338338
id<MSIDRequestControlling> xpcController = nil;
339339

340+
// By default the xpc flow is disable, and should fallback to previous flow in else condition
340341
if (parameters.xpcMode != MSIDXpcModeDisable)
341342
{
342343
xpcController = [self xpcInteractiveController:parameters
@@ -390,16 +391,16 @@ @implementation MSIDRequestControllerFactory
390391

391392
#if TARGET_OS_OSX
392393
+ (nullable id<MSIDRequestControlling>)xpcInteractiveController:(nonnull MSIDInteractiveTokenRequestParameters *)parameters
393-
tokenRequestProvider:(nonnull id<MSIDTokenRequestProviding>)tokenRequestProvider
394-
fallbackController:(nullable id<MSIDRequestControlling>)fallbackController
395-
error:(NSError * _Nullable __autoreleasing * _Nullable)error
394+
tokenRequestProvider:(nonnull id<MSIDTokenRequestProviding>)tokenRequestProvider
395+
fallbackController:(nullable id<MSIDRequestControlling>)fallbackController
396+
error:(NSError * _Nullable __autoreleasing * _Nullable)error
396397
{
397-
if ([MSIDSSOXpcInteractiveTokenRequestController canPerformRequest])
398+
if ([MSIDXpcInteractiveTokenRequestController canPerformRequest])
398399
{
399-
return [[MSIDSSOXpcInteractiveTokenRequestController alloc] initWithInteractiveRequestParameters:parameters
400-
tokenRequestProvider:tokenRequestProvider
401-
fallbackController:fallbackController
402-
error:error];
400+
return [[MSIDXpcInteractiveTokenRequestController alloc] initWithInteractiveRequestParameters:parameters
401+
tokenRequestProvider:tokenRequestProvider
402+
fallbackController:fallbackController
403+
error:error];
403404
}
404405

405406
return nil;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
NS_ASSUME_NONNULL_BEGIN
2929

30-
@interface MSIDSSOXpcInteractiveTokenRequestController : MSIDLocalInteractiveController
30+
@interface MSIDXpcInteractiveTokenRequestController : MSIDLocalInteractiveController
3131

3232
- (nullable instancetype)initWithInteractiveRequestParameters:(nonnull MSIDInteractiveTokenRequestParameters *)parameters
3333
tokenRequestProvider:(nonnull id<MSIDTokenRequestProviding>)tokenRequestProvider

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
// THE SOFTWARE.
2424

2525

26-
#import "MSIDSSOXpcInteractiveTokenRequestController.h"
26+
#import "MSIDXpcInteractiveTokenRequestController.h"
2727
#import "MSIDLocalInteractiveController+Internal.h"
2828
#import "MSIDXpcSingleSignOnProvider.h"
2929
#import "MSIDLogger+Internal.h"
@@ -32,7 +32,7 @@
3232
#import "MSIDInteractiveTokenRequestParameters.h"
3333
#import "MSIDXpcProviderCache.h"
3434

35-
@implementation MSIDSSOXpcInteractiveTokenRequestController
35+
@implementation MSIDXpcInteractiveTokenRequestController
3636

3737
- (instancetype)initWithInteractiveRequestParameters:(MSIDInteractiveTokenRequestParameters *)parameters
3838
tokenRequestProvider:(id<MSIDTokenRequestProviding>)tokenRequestProvider

‎IdentityCore/src/requests/broker/MSIDSSORemoteInteractiveTokenRequest.m‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,9 @@ - (void)executeRequestWithCompletion:(MSIDInteractiveRequestCompletionBlock)comp
9595
NSString *upn = self.requestParameters.accountIdentifier.displayableId ?: self.requestParameters.loginHint;
9696

9797
[self.requestParameters.authority resolveAndValidate:self.requestParameters.validateAuthority
98-
userPrincipalName:upn
99-
context:self.requestParameters
100-
completionBlock:^(__unused NSURL *openIdConfigurationEndpoint,
101-
__unused BOOL validated, NSError *error)
98+
userPrincipalName:upn
99+
context:self.requestParameters
100+
completionBlock:^(__unused NSURL *openIdConfigurationEndpoint, __unused BOOL validated, NSError *error)
102101
{
103102
if (error)
104103
{

‎IdentityCore/src/requests/broker/MSIDSSORemoteSilentTokenRequest.m‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,27 +93,28 @@ - (MSIDSSOExtensionRequestDelegateCompletionBlock)getCompletionBlock
9393
self.ssoTokenResponseHandler.externalCacheSeeder = self.externalCacheSeeder;
9494
#endif
9595
[self.ssoTokenResponseHandler handleOperationResponse:operationResponse
96-
requestParameters:self.requestParameters
97-
tokenResponseValidator:self.tokenResponseValidator
98-
oauthFactory:self.oauthFactory
99-
tokenCache:self.tokenCache
100-
accountMetadataCache:self.accountMetadataCache
101-
validateAccount:NO
102-
error:error
103-
completionBlock:^(MSIDTokenResult *result, NSError *localError)
96+
requestParameters:self.requestParameters
97+
tokenResponseValidator:self.tokenResponseValidator
98+
oauthFactory:self.oauthFactory
99+
tokenCache:self.tokenCache
100+
accountMetadataCache:self.accountMetadataCache
101+
validateAccount:NO
102+
error:error
103+
completionBlock:^(MSIDTokenResult *result, NSError *localError)
104104
{
105105
MSIDRequestCompletionBlock completionBlock = self.requestCompletionBlock;
106106
self.requestCompletionBlock = nil;
107107
if (localError)
108108
{
109109
/**
110-
* If SSO-EXT responses error, we should update throttling db
110+
* If SSO-EXT/Xpc responses error, we should update throttling db
111111
*/
112112
if ([MSIDThrottlingService isThrottlingEnabled])
113113
{
114114
[self.throttlingService updateThrottlingService:localError tokenRequest:self.operationRequest];
115115
}
116116
}
117+
117118
if (completionBlock) completionBlock(result, localError);
118119
}];
119120
};

‎IdentityCore/tests/MSIDRequestControllerFactoryTests.m‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#import "MSIDSSOExtensionInteractiveTokenRequestController.h"
3737
#if TARGET_OS_OSX
3838
#import "MSIDXpcSilentTokenRequestController.h"
39-
#import "MSIDSSOXpcInteractiveTokenRequestController.h"
39+
#import "MSIDXpcInteractiveTokenRequestController.h"
4040
#endif
4141

4242
@interface MSIDBaseRequestController (Testing)
@@ -222,7 +222,7 @@ - (void)testWhenInteractiveXpcIsBackup_andSsoExtensionIsDisabled_controllersOrde
222222

223223
SEL selectorForMSIDXpcInteractiveTokenRequestController = NSSelectorFromString(@"canPerformRequest");
224224
[MSIDTestSwizzle classMethod:selectorForMSIDXpcInteractiveTokenRequestController
225-
class:[MSIDSSOXpcInteractiveTokenRequestController class]
225+
class:[MSIDXpcInteractiveTokenRequestController class]
226226
block:(id)^(void)
227227
{
228228
return YES;
@@ -263,7 +263,7 @@ - (void)testWhenInteractiveXpcIsBackup_andSsoExtensionIsEnabled_controllersOrder
263263

264264
SEL selectorForMSIDXpcInteractiveTokenRequestController = NSSelectorFromString(@"canPerformRequest");
265265
[MSIDTestSwizzle classMethod:selectorForMSIDXpcInteractiveTokenRequestController
266-
class:[MSIDSSOXpcInteractiveTokenRequestController class]
266+
class:[MSIDXpcInteractiveTokenRequestController class]
267267
block:(id)^(void)
268268
{
269269
return YES;
@@ -284,7 +284,7 @@ - (void)testWhenInteractiveXpcIsBackup_andSsoExtensionIsEnabled_controllersOrder
284284
}
285285

286286
MSIDBaseRequestController *baseController = (MSIDBaseRequestController *)controller;
287-
if (![baseController.fallbackController isMemberOfClass:MSIDSSOXpcInteractiveTokenRequestController.class])
287+
if (![baseController.fallbackController isMemberOfClass:MSIDXpcInteractiveTokenRequestController.class])
288288
{
289289
XCTFail();
290290
}
@@ -321,7 +321,7 @@ - (void)testWhenInteractiveXpcIsDisabled_andSsoExtensionIsEnabled_controllersOrd
321321

322322
SEL selectorForMSIDXpcInteractiveTokenRequestController = NSSelectorFromString(@"canPerformRequest");
323323
[MSIDTestSwizzle classMethod:selectorForMSIDXpcInteractiveTokenRequestController
324-
class:[MSIDSSOXpcInteractiveTokenRequestController class]
324+
class:[MSIDXpcInteractiveTokenRequestController class]
325325
block:(id)^(void)
326326
{
327327
return NO;
@@ -374,7 +374,7 @@ - (void)testWhenInteractiveXpcIsDisabled_andSsoExtensionIsDisabled_controllersOr
374374

375375
SEL selectorForMSIDXpcInteractiveTokenRequestController = NSSelectorFromString(@"canPerformRequest");
376376
[MSIDTestSwizzle classMethod:selectorForMSIDXpcInteractiveTokenRequestController
377-
class:[MSIDSSOXpcInteractiveTokenRequestController class]
377+
class:[MSIDXpcInteractiveTokenRequestController class]
378378
block:(id)^(void)
379379
{
380380
return NO;
@@ -418,7 +418,7 @@ - (void)testWhenInteractiveXpcIsFull_andSsoExtensionIsDisabled_controllersOrder_
418418

419419
SEL selectorForMSIDXpcInteractiveTokenRequestController = NSSelectorFromString(@"canPerformRequest");
420420
[MSIDTestSwizzle classMethod:selectorForMSIDXpcInteractiveTokenRequestController
421-
class:[MSIDSSOXpcInteractiveTokenRequestController class]
421+
class:[MSIDXpcInteractiveTokenRequestController class]
422422
block:(id)^(void)
423423
{
424424
return YES;
@@ -433,7 +433,7 @@ - (void)testWhenInteractiveXpcIsFull_andSsoExtensionIsDisabled_controllersOrder_
433433
}];
434434

435435
id<MSIDRequestControlling> controller = [MSIDRequestControllerFactory interactiveControllerForParameters:parameters tokenRequestProvider:provider error:&error];
436-
if (![controller isMemberOfClass:MSIDSSOXpcInteractiveTokenRequestController.class])
436+
if (![controller isMemberOfClass:MSIDXpcInteractiveTokenRequestController.class])
437437
{
438438
XCTFail();
439439
}
@@ -472,7 +472,7 @@ - (void)testWhenInteractiveXpcIsFull_andSsoExtensionIsEnabled_controllersOrder_a
472472

473473
SEL selectorForMSIDXpcInteractiveTokenRequestController = NSSelectorFromString(@"canPerformRequest");
474474
[MSIDTestSwizzle classMethod:selectorForMSIDXpcInteractiveTokenRequestController
475-
class:[MSIDSSOXpcInteractiveTokenRequestController class]
475+
class:[MSIDXpcInteractiveTokenRequestController class]
476476
block:(id)^(void)
477477
{
478478
return YES;
@@ -493,7 +493,7 @@ - (void)testWhenInteractiveXpcIsFull_andSsoExtensionIsEnabled_controllersOrder_a
493493
}
494494

495495
MSIDBaseRequestController *baseController = (MSIDBaseRequestController *)controller;
496-
if (![baseController.fallbackController isMemberOfClass:MSIDSSOXpcInteractiveTokenRequestController.class])
496+
if (![baseController.fallbackController isMemberOfClass:MSIDXpcInteractiveTokenRequestController.class])
497497
{
498498
XCTFail();
499499
}

0 commit comments

Comments
 (0)