Skip to content

Commit ad115f9

Browse files
antrix1989antrix1989
authored
Merge pull request #1487 from AzureAD/sedemche/cocoapod_build
Fix cocoa pod build #1486
2 parents 79b568a + 5f80a2f commit ad115f9

File tree

6 files changed

+25
-21
lines changed

6 files changed

+25
-21
lines changed

‎IdentityCore/IdentityCore.xcodeproj/project.pbxproj‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@
106106
230847A82082C5830024CE7C /* MSIDHttpRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 230847A52082C5830024CE7C /* MSIDHttpRequest.m */; };
107107
2309391B2189301600EAC95D /* MSIDJsonSerializing.h in Headers */ = {isa = PBXBuildFile; fileRef = 2309391A2189301600EAC95D /* MSIDJsonSerializing.h */; };
108108
230C2C412CF7D6F100E767B6 /* MSIDSwitchBrowserResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 230C2C402CF7D6F100E767B6 /* MSIDSwitchBrowserResponse.m */; };
109-
230C2C442CF94C4000E767B6 /* MSIDSwitchBrowserOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 230C2C432CF94C4000E767B6 /* MSIDSwitchBrowserOperation.m */; };
110109
230C2C472CF95DBC00E767B6 /* MSIDSwitchBrowserResumeResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 230C2C462CF95DBC00E767B6 /* MSIDSwitchBrowserResumeResponse.m */; };
111110
230FF0D624BE93BE00A4DC6B /* MSIDLoggerConnecting.h in Headers */ = {isa = PBXBuildFile; fileRef = 230FF0D524BE93BE00A4DC6B /* MSIDLoggerConnecting.h */; };
112111
2317FFBD2A43988900E3DAA2 /* MSIDBrokerOperationBrowserNativeMessageRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 23C548042A2A5DBF00633DC0 /* MSIDBrokerOperationBrowserNativeMessageRequest.m */; };
@@ -224,6 +223,8 @@
224223
235480D420DDF88200246F72 /* MSIDAADAuthority.h in Headers */ = {isa = PBXBuildFile; fileRef = 235480D220DDF88000246F72 /* MSIDAADAuthority.h */; };
225224
235480D520DDF88200246F72 /* MSIDAADAuthority.m in Sources */ = {isa = PBXBuildFile; fileRef = 235480D320DDF88100246F72 /* MSIDAADAuthority.m */; };
226225
235480D620DDF88200246F72 /* MSIDAADAuthority.m in Sources */ = {isa = PBXBuildFile; fileRef = 235480D320DDF88100246F72 /* MSIDAADAuthority.m */; };
226+
235C2B022D6FAF7900DEFEFB /* MSIDSwitchBrowserResumeOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 235C2B002D6FAF7900DEFEFB /* MSIDSwitchBrowserResumeOperation.m */; };
227+
235C2B032D6FAF7900DEFEFB /* MSIDSwitchBrowserOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 235C2AFE2D6FAF7900DEFEFB /* MSIDSwitchBrowserOperation.m */; };
227228
2361DE8C2048B6F8005FD48A /* MSIDAccountTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2361DE8A2048B6F8005FD48A /* MSIDAccountTests.m */; };
228229
23642AB62187D88C00F97009 /* MSIDAuthorityMock.m in Sources */ = {isa = PBXBuildFile; fileRef = 23642AB42187D88C00F97009 /* MSIDAuthorityMock.m */; };
229230
23642AB72187D88C00F97009 /* MSIDAuthorityMock.m in Sources */ = {isa = PBXBuildFile; fileRef = 23642AB42187D88C00F97009 /* MSIDAuthorityMock.m */; };
@@ -315,8 +316,6 @@
315316
239222B4243D3791009736C4 /* MSIDLastRequestTelemetry.m in Sources */ = {isa = PBXBuildFile; fileRef = 239222AF243D3791009736C4 /* MSIDLastRequestTelemetry.m */; };
316317
239222B5243D3791009736C4 /* MSIDCurrentRequestTelemetry.m in Sources */ = {isa = PBXBuildFile; fileRef = 239222B0243D3791009736C4 /* MSIDCurrentRequestTelemetry.m */; };
317318
239222B6243D3791009736C4 /* MSIDCurrentRequestTelemetry.m in Sources */ = {isa = PBXBuildFile; fileRef = 239222B0243D3791009736C4 /* MSIDCurrentRequestTelemetry.m */; };
318-
2394F1572D162B8500E44F6E /* MSIDSwitchBrowserResumeOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 2394F1562D162B8500E44F6E /* MSIDSwitchBrowserResumeOperation.m */; };
319-
2394F1582D162B8500E44F6E /* MSIDSwitchBrowserResumeOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 2394F1552D162B8500E44F6E /* MSIDSwitchBrowserResumeOperation.h */; };
320319
2394F1A02D2866F700E44F6E /* MSIDCertAuthManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 2394F19F2D2866F700E44F6E /* MSIDCertAuthManager.m */; };
321320
2394F1A12D2866F700E44F6E /* MSIDCertAuthManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 2394F19E2D2866F700E44F6E /* MSIDCertAuthManager.h */; };
322321
2394F1F92D4890BD00E44F6E /* MSIDWebOAuth2AuthCodeOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 2394F1F82D4890BD00E44F6E /* MSIDWebOAuth2AuthCodeOperation.m */; };
@@ -2062,8 +2061,6 @@
20622061
2309391A2189301600EAC95D /* MSIDJsonSerializing.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDJsonSerializing.h; sourceTree = "<group>"; };
20632062
230C2C3F2CF7D6F100E767B6 /* MSIDSwitchBrowserResponse.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDSwitchBrowserResponse.h; sourceTree = "<group>"; };
20642063
230C2C402CF7D6F100E767B6 /* MSIDSwitchBrowserResponse.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDSwitchBrowserResponse.m; sourceTree = "<group>"; };
2065-
230C2C422CF94C4000E767B6 /* MSIDSwitchBrowserOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDSwitchBrowserOperation.h; sourceTree = "<group>"; };
2066-
230C2C432CF94C4000E767B6 /* MSIDSwitchBrowserOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDSwitchBrowserOperation.m; sourceTree = "<group>"; };
20672064
230C2C452CF95DBC00E767B6 /* MSIDSwitchBrowserResumeResponse.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDSwitchBrowserResumeResponse.h; sourceTree = "<group>"; };
20682065
230C2C462CF95DBC00E767B6 /* MSIDSwitchBrowserResumeResponse.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDSwitchBrowserResumeResponse.m; sourceTree = "<group>"; };
20692066
230FF0D524BE93BE00A4DC6B /* MSIDLoggerConnecting.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDLoggerConnecting.h; sourceTree = "<group>"; };
@@ -2156,6 +2153,10 @@
21562153
235480C520DDF81000246F72 /* MSIDADFSAuthority.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MSIDADFSAuthority.m; sourceTree = "<group>"; };
21572154
235480D220DDF88000246F72 /* MSIDAADAuthority.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MSIDAADAuthority.h; sourceTree = "<group>"; };
21582155
235480D320DDF88100246F72 /* MSIDAADAuthority.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MSIDAADAuthority.m; sourceTree = "<group>"; };
2156+
235C2AFD2D6FAF7900DEFEFB /* MSIDSwitchBrowserOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDSwitchBrowserOperation.h; sourceTree = "<group>"; };
2157+
235C2AFE2D6FAF7900DEFEFB /* MSIDSwitchBrowserOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDSwitchBrowserOperation.m; sourceTree = "<group>"; };
2158+
235C2AFF2D6FAF7900DEFEFB /* MSIDSwitchBrowserResumeOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDSwitchBrowserResumeOperation.h; sourceTree = "<group>"; };
2159+
235C2B002D6FAF7900DEFEFB /* MSIDSwitchBrowserResumeOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDSwitchBrowserResumeOperation.m; sourceTree = "<group>"; };
21592160
235D13E120EEE81100F5C50D /* MSIDAuthority+Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MSIDAuthority+Internal.h"; sourceTree = "<group>"; };
21602161
2361DE8A2048B6F8005FD48A /* MSIDAccountTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDAccountTests.m; sourceTree = "<group>"; };
21612162
23642AB42187D88C00F97009 /* MSIDAuthorityMock.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MSIDAuthorityMock.m; sourceTree = "<group>"; };
@@ -2225,8 +2226,6 @@
22252226
239222AE243D3791009736C4 /* MSIDCurrentRequestTelemetry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MSIDCurrentRequestTelemetry.h; sourceTree = "<group>"; };
22262227
239222AF243D3791009736C4 /* MSIDLastRequestTelemetry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MSIDLastRequestTelemetry.m; sourceTree = "<group>"; };
22272228
239222B0243D3791009736C4 /* MSIDCurrentRequestTelemetry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MSIDCurrentRequestTelemetry.m; sourceTree = "<group>"; };
2228-
2394F1552D162B8500E44F6E /* MSIDSwitchBrowserResumeOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDSwitchBrowserResumeOperation.h; sourceTree = "<group>"; };
2229-
2394F1562D162B8500E44F6E /* MSIDSwitchBrowserResumeOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDSwitchBrowserResumeOperation.m; sourceTree = "<group>"; };
22302229
2394F19E2D2866F700E44F6E /* MSIDCertAuthManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDCertAuthManager.h; sourceTree = "<group>"; };
22312230
2394F19F2D2866F700E44F6E /* MSIDCertAuthManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDCertAuthManager.m; sourceTree = "<group>"; };
22322231
2394F1F72D4890BD00E44F6E /* MSIDWebOAuth2AuthCodeOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDWebOAuth2AuthCodeOperation.h; sourceTree = "<group>"; };
@@ -3660,6 +3659,17 @@
36603659
path = error_handler;
36613660
sourceTree = "<group>";
36623661
};
3662+
235C2B012D6FAF7900DEFEFB /* ios */ = {
3663+
isa = PBXGroup;
3664+
children = (
3665+
235C2AFD2D6FAF7900DEFEFB /* MSIDSwitchBrowserOperation.h */,
3666+
235C2AFE2D6FAF7900DEFEFB /* MSIDSwitchBrowserOperation.m */,
3667+
235C2AFF2D6FAF7900DEFEFB /* MSIDSwitchBrowserResumeOperation.h */,
3668+
235C2B002D6FAF7900DEFEFB /* MSIDSwitchBrowserResumeOperation.m */,
3669+
);
3670+
path = ios;
3671+
sourceTree = "<group>";
3672+
};
36633673
23642AB32187D88C00F97009 /* mocks */ = {
36643674
isa = PBXGroup;
36653675
children = (
@@ -4048,16 +4058,13 @@
40484058
58B81F7F24AD0F7700E8799E /* operations */ = {
40494059
isa = PBXGroup;
40504060
children = (
4061+
235C2B012D6FAF7900DEFEFB /* ios */,
40514062
58B81F7A24AD0E7A00E8799E /* MSIDWebResponseOperationFactory.h */,
40524063
58B81F7B24AD0E7A00E8799E /* MSIDWebResponseOperationFactory.m */,
40534064
58B81F8024AD0F8B00E8799E /* MSIDWebResponseBaseOperation.h */,
40544065
58B81F8124AD0F8B00E8799E /* MSIDWebResponseBaseOperation.m */,
40554066
58E2A1F524E47D560027A28A /* MSIDWebOpenBrowserResponseOperation.h */,
40564067
58E2A1F624E47D560027A28A /* MSIDWebOpenBrowserResponseOperation.m */,
4057-
230C2C422CF94C4000E767B6 /* MSIDSwitchBrowserOperation.h */,
4058-
230C2C432CF94C4000E767B6 /* MSIDSwitchBrowserOperation.m */,
4059-
2394F1552D162B8500E44F6E /* MSIDSwitchBrowserResumeOperation.h */,
4060-
2394F1562D162B8500E44F6E /* MSIDSwitchBrowserResumeOperation.m */,
40614068
2394F1F72D4890BD00E44F6E /* MSIDWebOAuth2AuthCodeOperation.h */,
40624069
2394F1F82D4890BD00E44F6E /* MSIDWebOAuth2AuthCodeOperation.m */,
40634070
2394F1FC2D4893DA00E44F6E /* MSIDWebWPJOperation.h */,
@@ -6084,7 +6091,6 @@
60846091
B2C707F32192524700D917B8 /* MSIDDefaultTokenRequestProvider.h in Headers */,
60856092
B286B9772389CE67007833AD /* MSIDWebOAuth2Response.h in Headers */,
60866093
2392229D2432A65F009736C4 /* NSError+MSIDServerTelemetryError.h in Headers */,
6087-
2394F1582D162B8500E44F6E /* MSIDSwitchBrowserResumeOperation.h in Headers */,
60886094
B251CC3E2041058D005E0179 /* MSIDAccessToken.h in Headers */,
60896095
B286B9922389DC4A007833AD /* MSIDIndividualClaimRequestAdditionalInfo.h in Headers */,
60906096
23AE9DB72148529A00B285F3 /* NSError+MSIDExtensions.h in Headers */,
@@ -7745,7 +7751,6 @@
77457751
B2C7B3BB213C69C8009FFCC1 /* MSIDDefaultErrorConverter.m in Sources */,
77467752
B2000C9F20EC65610092790A /* MSIDURLFormObject.m in Sources */,
77477753
B210F44B1FDDF5A6005A8F76 /* MSIDClientInfo.m in Sources */,
7748-
230C2C442CF94C4000E767B6 /* MSIDSwitchBrowserOperation.m in Sources */,
77497754
B2FF0830245E4C89001C7F3B /* MSIDWorkplaceJoinChallenge.m in Sources */,
77507755
96235F9C207D72CE007EAB36 /* MSIDWebWPJResponse.m in Sources */,
77517756
239E8F89233D951D00251373 /* MSIDBrokerOperationResponse.m in Sources */,
@@ -7919,6 +7924,8 @@
79197924
B2C17AED1FC796FE0070A514 /* MSIDOAuth2Constants.m in Sources */,
79207925
2392229E2432A65F009736C4 /* NSError+MSIDServerTelemetryError.m in Sources */,
79217926
600D199E20963B020004CD43 /* MSIDNTLMUIPrompt.m in Sources */,
7927+
235C2B022D6FAF7900DEFEFB /* MSIDSwitchBrowserResumeOperation.m in Sources */,
7928+
235C2B032D6FAF7900DEFEFB /* MSIDSwitchBrowserOperation.m in Sources */,
79227929
B2C708732198C42200D917B8 /* MSIDLegacyBrokerResponseHandler.m in Sources */,
79237930
886F517029CCA84200F09471 /* MSIDCIAMAuthorityResolver.m in Sources */,
79247931
238E19D82086FE28004DF483 /* MSIDAADRefreshTokenGrantRequest.m in Sources */,
@@ -8049,7 +8056,6 @@
80498056
B297E1E220A1272600F370EC /* MSIDLegacyTokenCacheQuery.m in Sources */,
80508057
60F7BE8B21DA4E2900F1BBA1 /* MSIDPrimaryRefreshToken.m in Sources */,
80518058
B214C39F1FE854FE0070C4F2 /* MSIDLegacyTokenCacheAccessor.m in Sources */,
8052-
2394F1572D162B8500E44F6E /* MSIDSwitchBrowserResumeOperation.m in Sources */,
80538059
D62600161FBD380500EE4487 /* NSDictionary+MSIDExtensions.m in Sources */,
80548060
B2B1D579204369D600DD81F0 /* MSIDAccountType.m in Sources */,
80558061
B2C707EE21924C8300D917B8 /* MSIDTokenResponseValidator.m in Sources */,

‎IdentityCore/src/webview/MSIDCertAuthManager.m‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ + (instancetype)sharedInstance
5050
return sharedInstance;
5151
}
5252

53+
#if TARGET_OS_IPHONE && !MSID_EXCLUDE_SYSTEMWV
54+
5355
- (void)setRedirectUriPrefix:(NSString *)prefix
5456
forScheme:(NSString *)scheme
5557
{
@@ -75,20 +77,16 @@ - (BOOL)completeWithCallbackURL:(NSURL *)url
7577
}
7678

7779
- (void)startWithURL:(NSURL *)startURL
78-
parentController:(UIViewController *)parentViewController
80+
parentController:(MSIDViewController *)parentViewController
7981
context:(id<MSIDRequestContext>)context
8082
completionBlock:(MSIDWebUICompletionHandler)completionBlock
8183
{
82-
#if MSID_EXCLUDE_SYSTEMWV
83-
NSError *msidError = MSIDCreateError(MSIDErrorDomain, MSIDErrorInternal, @"Cannot handle cba request: system webview is not available.", nil, nil, nil, nil, nil, YES);
84-
if (completionBlock) completionBlock(nil, msidError);
85-
#else
8684
[MSIDMainThreadUtil executeOnMainThreadIfNeeded:^{
8785
self.isCertAuthInProgress = YES;
8886

8987
NSURLComponents *requestURLComponents = [NSURLComponents componentsWithURL:startURL resolvingAgainstBaseURL:NO];
9088
NSArray<NSURLQueryItem *> *queryItems = [requestURLComponents queryItems];
91-
89+
9290
NSMutableDictionary *newQueryItems = [NSMutableDictionary new];
9391
newQueryItems[MSID_BROKER_IS_PERFORMING_CBA] = @"true";
9492

@@ -122,7 +120,7 @@ - (void)startWithURL:(NSURL *)startURL
122120

123121
[self.systemWebViewController startWithCompletionHandler:completionBlock];
124122
}];
125-
#endif
126123
}
127124

125+
#endif
128126
@end

IdentityCore/src/webview/operations/MSIDSwitchBrowserOperation.h renamed to IdentityCore/src/webview/operations/ios/MSIDSwitchBrowserOperation.h

File renamed without changes.

IdentityCore/src/webview/operations/MSIDSwitchBrowserOperation.m renamed to IdentityCore/src/webview/operations/ios/MSIDSwitchBrowserOperation.m

File renamed without changes.

IdentityCore/src/webview/operations/MSIDSwitchBrowserResumeOperation.h renamed to IdentityCore/src/webview/operations/ios/MSIDSwitchBrowserResumeOperation.h

File renamed without changes.

IdentityCore/src/webview/operations/MSIDSwitchBrowserResumeOperation.m renamed to IdentityCore/src/webview/operations/ios/MSIDSwitchBrowserResumeOperation.m

File renamed without changes.

0 commit comments

Comments
 (0)