Skip to content

Commit d23a6f1

Browse files
swasti29swasti29
authored
Merge pull request #2577 from AzureAD/swagup/remove_deprecated_apis
[MSAL 2.x] Cleaning up deprecated APIs
2 parents 3387a15 + 28f3eae commit d23a6f1

36 files changed

+485
-1405
lines changed

‎MSAL/MSAL.xcodeproj/project.pbxproj

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@
3939
04A6B5CF226937800035C7C2 /* MSALRedirectUriVerifier.h in Headers */ = {isa = PBXBuildFile; fileRef = B21E07AF210E542C007E3A3C /* MSALRedirectUriVerifier.h */; };
4040
04A6B5D0226937810035C7C2 /* MSALRedirectUriVerifier.h in Headers */ = {isa = PBXBuildFile; fileRef = B21E07AF210E542C007E3A3C /* MSALRedirectUriVerifier.h */; };
4141
04A6B5D1226937850035C7C2 /* MSALRedirectUriVerifier.m in Sources */ = {isa = PBXBuildFile; fileRef = B21E07B0210E542C007E3A3C /* MSALRedirectUriVerifier.m */; };
42-
04A6B5D5226937930035C7C2 /* MSALTelemetry.m in Sources */ = {isa = PBXBuildFile; fileRef = 96D9A5471E4AB22900674A85 /* MSALTelemetry.m */; };
43-
04A6B5D6226937940035C7C2 /* MSALTelemetry.m in Sources */ = {isa = PBXBuildFile; fileRef = 96D9A5471E4AB22900674A85 /* MSALTelemetry.m */; };
4442
04A6B5DD226937AA0035C7C2 /* MSALAccountsProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = B2A3C2882145FD0F0082525C /* MSALAccountsProvider.m */; };
4543
04A6B5DE226937AA0035C7C2 /* MSALAccountsProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = B2A3C2882145FD0F0082525C /* MSALAccountsProvider.m */; };
4644
04A6B5DF226937AC0035C7C2 /* MSALAccountsProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = B2A3C2872145FD0F0082525C /* MSALAccountsProvider.h */; };
@@ -55,8 +53,6 @@
5553
04A6B5F4226937DE0035C7C2 /* MSALAuthority.h in Headers */ = {isa = PBXBuildFile; fileRef = 94E876CA1E492D6000FB96ED /* MSALAuthority.h */; settings = {ATTRIBUTES = (Public, ); }; };
5654
04A6B5F6226937EA0035C7C2 /* MSALAccountId.h in Headers */ = {isa = PBXBuildFile; fileRef = B221CED920C0AC60002F5E94 /* MSALAccountId.h */; settings = {ATTRIBUTES = (Public, ); }; };
5755
04A6B5F7226937EB0035C7C2 /* MSALAccountId.h in Headers */ = {isa = PBXBuildFile; fileRef = B221CED920C0AC60002F5E94 /* MSALAccountId.h */; settings = {ATTRIBUTES = (Public, ); }; };
58-
04A6B5F8226937F10035C7C2 /* MSALTelemetry.h in Headers */ = {isa = PBXBuildFile; fileRef = 96D9A5431E4AB1DC00674A85 /* MSALTelemetry.h */; settings = {ATTRIBUTES = (Public, ); }; };
59-
04A6B5F9226937F20035C7C2 /* MSALTelemetry.h in Headers */ = {isa = PBXBuildFile; fileRef = 96D9A5431E4AB1DC00674A85 /* MSALTelemetry.h */; settings = {ATTRIBUTES = (Public, ); }; };
6056
04A6B5FC226937FE0035C7C2 /* MSALAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = D65A6F861E3FF3D900C69FBA /* MSALAccount.h */; settings = {ATTRIBUTES = (Public, ); }; };
6157
04A6B5FD226937FE0035C7C2 /* MSALAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = D65A6F861E3FF3D900C69FBA /* MSALAccount.h */; settings = {ATTRIBUTES = (Public, ); }; };
6258
04A6B5FE226938040035C7C2 /* MSALResult.h in Headers */ = {isa = PBXBuildFile; fileRef = D65A6F851E3FF3D900C69FBA /* MSALResult.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -471,7 +467,6 @@
471467
96CF95252268FD0500D97374 /* MSALB2CAuthority.h in Headers */ = {isa = PBXBuildFile; fileRef = 23A68A7820F538B90071E435 /* MSALB2CAuthority.h */; settings = {ATTRIBUTES = (Public, ); }; };
472468
96CF95262268FD0500D97374 /* MSALADFSAuthority.h in Headers */ = {isa = PBXBuildFile; fileRef = 23A68A7E20F538DE0071E435 /* MSALADFSAuthority.h */; settings = {ATTRIBUTES = (Public, ); }; };
473469
96CF95272268FD0500D97374 /* MSALLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = D65A6F831E3FF3D900C69FBA /* MSALLogger.h */; settings = {ATTRIBUTES = (Public, ); }; };
474-
96CF95282268FD0500D97374 /* MSALTelemetry.h in Headers */ = {isa = PBXBuildFile; fileRef = 96D9A5431E4AB1DC00674A85 /* MSALTelemetry.h */; settings = {ATTRIBUTES = (Public, ); }; };
475470
96CF95292268FD0500D97374 /* MSALRedirectUri.h in Headers */ = {isa = PBXBuildFile; fileRef = B203459221AF77FB00B221AA /* MSALRedirectUri.h */; settings = {ATTRIBUTES = (Public, ); }; };
476471
96CF952A2268FD0500D97374 /* MSALPublicClientStatusNotifications.h in Headers */ = {isa = PBXBuildFile; fileRef = B28BBD312211DC7D00F51723 /* MSALPublicClientStatusNotifications.h */; settings = {ATTRIBUTES = (Public, ); }; };
477472
96CF952B2268FD0500D97374 /* MSALTokenParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 232D68C8223DB00500594BBD /* MSALTokenParameters.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -483,8 +478,6 @@
483478
96CF95312268FD0500D97374 /* MSALJsonSerializable.h in Headers */ = {isa = PBXBuildFile; fileRef = 232D616922498EDF00260C42 /* MSALJsonSerializable.h */; settings = {ATTRIBUTES = (Public, ); }; };
484479
96CF95322268FD0500D97374 /* MSALJsonDeserializable.h in Headers */ = {isa = PBXBuildFile; fileRef = 23FB5C1C22542B99002BF1EB /* MSALJsonDeserializable.h */; settings = {ATTRIBUTES = (Public, ); }; };
485480
96CFA00B1E6E3460003BFCDC /* MSALTestAppScopesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 96CFA0091E6E3454003BFCDC /* MSALTestAppScopesViewController.m */; };
486-
96D9A5451E4AB1DC00674A85 /* MSALTelemetry.h in Headers */ = {isa = PBXBuildFile; fileRef = 96D9A5431E4AB1DC00674A85 /* MSALTelemetry.h */; settings = {ATTRIBUTES = (Public, ); }; };
487-
96D9A54A1E4AB23100674A85 /* MSALTelemetry.m in Sources */ = {isa = PBXBuildFile; fileRef = 96D9A5471E4AB22900674A85 /* MSALTelemetry.m */; };
488481
9B235D9D2A3CC71C00657331 /* NativeAuthEndToEndTestPlan.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = 9B235D952A3CC71C00657331 /* NativeAuthEndToEndTestPlan.xctestplan */; };
489482
9B2BBA2F2A3293330075F702 /* MSALNativeAuthResetPasswordStartValidatedErrorTypeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B2BBA2D2A3292400075F702 /* MSALNativeAuthResetPasswordStartValidatedErrorTypeTests.swift */; };
490483
9B2BBA312A3296010075F702 /* MSALNativeAuthResetPasswordChallengeResponseErrorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B2BBA302A3296010075F702 /* MSALNativeAuthResetPasswordChallengeResponseErrorTests.swift */; };
@@ -938,7 +931,6 @@
938931
D61BD2B11EBD09F90007E484 /* MSALResult.m in Sources */ = {isa = PBXBuildFile; fileRef = D65A6F791E3FF3D900C69FBA /* MSALResult.m */; };
939932
D61BD2B21EBD09F90007E484 /* MSALAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = D65A6F7A1E3FF3D900C69FBA /* MSALAccount.m */; };
940933
D61BD2B31EBD09F90007E484 /* MSALPromptType.m in Sources */ = {isa = PBXBuildFile; fileRef = D69ADB1A1E50531300952049 /* MSALPromptType.m */; };
941-
D61BD2BD1EBD0A010007E484 /* MSALTelemetry.m in Sources */ = {isa = PBXBuildFile; fileRef = 96D9A5471E4AB22900674A85 /* MSALTelemetry.m */; };
942934
D61BD2C91EBD0A0F0007E484 /* MSALAuthority.m in Sources */ = {isa = PBXBuildFile; fileRef = 94E876CB1E492D6000FB96ED /* MSALAuthority.m */; };
943935
D61F5BC01E5913BE00912CB8 /* SFSafariViewController+TestOverrides.m in Sources */ = {isa = PBXBuildFile; fileRef = D61F5BBF1E5913BE00912CB8 /* SFSafariViewController+TestOverrides.m */; };
944936
D61F5BC31E59193500912CB8 /* MSALFakeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D61F5BC21E59193500912CB8 /* MSALFakeViewController.m */; };
@@ -2182,8 +2174,6 @@
21822174
96B5E6F12256D197002232F9 /* MSALExtraQueryParameters.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSALExtraQueryParameters.m; sourceTree = "<group>"; };
21832175
96CFA0081E6E3454003BFCDC /* MSALTestAppScopesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MSALTestAppScopesViewController.h; sourceTree = "<group>"; };
21842176
96CFA0091E6E3454003BFCDC /* MSALTestAppScopesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MSALTestAppScopesViewController.m; sourceTree = "<group>"; };
2185-
96D9A5431E4AB1DC00674A85 /* MSALTelemetry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MSALTelemetry.h; sourceTree = "<group>"; };
2186-
96D9A5471E4AB22900674A85 /* MSALTelemetry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MSALTelemetry.m; sourceTree = "<group>"; };
21872177
9B235D952A3CC71C00657331 /* NativeAuthEndToEndTestPlan.xctestplan */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = NativeAuthEndToEndTestPlan.xctestplan; sourceTree = "<group>"; };
21882178
9B235D9E2A3CFB4300657331 /* MSALNativeAuthEndToEndBaseTestCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MSALNativeAuthEndToEndBaseTestCase.swift; sourceTree = "<group>"; };
21892179
9B235DA02A3CFC4500657331 /* MSALNativeAuthSignInUsernameEndToEndTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MSALNativeAuthSignInUsernameEndToEndTests.swift; sourceTree = "<group>"; };
@@ -3395,7 +3385,6 @@
33953385
96D9A5461E4AB21400674A85 /* telemetry */ = {
33963386
isa = PBXGroup;
33973387
children = (
3398-
96D9A5471E4AB22900674A85 /* MSALTelemetry.m */,
33993388
233E96F922653EFC007FCE2A /* MSALTelemetryEventsObservingProxy.h */,
34003389
233E96FA22653EFC007FCE2A /* MSALTelemetryEventsObservingProxy.m */,
34013390
);
@@ -3925,7 +3914,6 @@
39253914
23A68A7E20F538DE0071E435 /* MSALADFSAuthority.h */,
39263915
D65A6F831E3FF3D900C69FBA /* MSALLogger.h */,
39273916
886F515729CCA50300F09471 /* MSALCIAMAuthority.h */,
3928-
96D9A5431E4AB1DC00674A85 /* MSALTelemetry.h */,
39293917
B203459221AF77FB00B221AA /* MSALRedirectUri.h */,
39303918
B28BBD312211DC7D00F51723 /* MSALPublicClientStatusNotifications.h */,
39313919
2338294D22D7DC9E001B8AD6 /* MSALWebviewParameters.h */,
@@ -5031,7 +5019,6 @@
50315019
B273D0AC226E8581005A7BB4 /* MSALTelemetryApiId.h in Headers */,
50325020
B273D088226E8520005A7BB4 /* MSALClaimsRequest.h in Headers */,
50335021
B273D08C226E852A005A7BB4 /* MSALIndividualClaimRequestAdditionalInfo.h in Headers */,
5034-
04A6B5F9226937F20035C7C2 /* MSALTelemetry.h in Headers */,
50355022
04A6B5CF226937800035C7C2 /* MSALRedirectUriVerifier.h in Headers */,
50365023
04A6B6152269383D0035C7C2 /* MSALOauth2ProviderFactory.h in Headers */,
50375024
B273D082226E850E005A7BB4 /* MSALTokenParameters.h in Headers */,
@@ -5159,7 +5146,6 @@
51595146
B273D075226E84D6005A7BB4 /* MSALTelemetryConfig.h in Headers */,
51605147
238BA014227BCAED00A5BACD /* MSALTenantProfile.h in Headers */,
51615148
B2D478A2230E3E46005AE186 /* MSALLegacySharedAccountsProvider.h in Headers */,
5162-
04A6B5F8226937F10035C7C2 /* MSALTelemetry.h in Headers */,
51635149
04A6B604226938180035C7C2 /* MSALError.h in Headers */,
51645150
B2472CA5226FDC46008F22AB /* MSALB2CAuthority_Internal.h in Headers */,
51655151
B273D081226E850D005A7BB4 /* MSALTokenParameters.h in Headers */,
@@ -5246,7 +5232,6 @@
52465232
1EE776C4246C98E700F7EBFC /* MSALAuthenticationSchemePop.h in Headers */,
52475233
96CF95192268FD0400D97374 /* MSALTelemetryConfig.h in Headers */,
52485234
A0274CDB24B54A7000BD198D /* MSALDevicePopManagerUtil.h in Headers */,
5249-
96CF95282268FD0500D97374 /* MSALTelemetry.h in Headers */,
52505235
B273D0A9226E857F005A7BB4 /* MSALTelemetryApiId.h in Headers */,
52515236
B273D0CC226E85C8005A7BB4 /* MSALHTTPConfig+Internal.h in Headers */,
52525237
B223B0B922ADF8E600FB8713 /* MSALLegacySharedMSAAccount.h in Headers */,
@@ -5340,7 +5325,6 @@
53405325
B253153623DD692600432133 /* MSALDeviceInformation+Internal.h in Headers */,
53415326
23A68A8120F538DE0071E435 /* MSALADFSAuthority.h in Headers */,
53425327
D65A6FAA1E3FF3D900C69FBA /* MSALLogger.h in Headers */,
5343-
96D9A5451E4AB1DC00674A85 /* MSALTelemetry.h in Headers */,
53445328
1EF395FE246DFAD200647FDB /* MSALAuthScheme.h in Headers */,
53455329
B2A3C28A2145FD0F0082525C /* MSALAccountsProvider.h in Headers */,
53465330
B273D0D2226E85D0005A7BB4 /* MSALTelemetryConfig+Internal.h in Headers */,
@@ -6305,7 +6289,6 @@
63056289
04A6B5C7226937660035C7C2 /* MSALLogger.m in Sources */,
63066290
04A6B5B1226936FE0035C7C2 /* MSIDVersion.m in Sources */,
63076291
B273D0A0226E8571005A7BB4 /* MSALClaimsRequest.m in Sources */,
6308-
04A6B5D6226937940035C7C2 /* MSALTelemetry.m in Sources */,
63096292
DE9244DE2A31E1D500C0389F /* MSALCIAMOauth2Provider.m in Sources */,
63106293
B2D478AD230E3E88005AE186 /* MSALLegacySharedMSAAccount.m in Sources */,
63116294
B273D0EA226E85FF005A7BB4 /* MSALPublicClientStatusNotifications.m in Sources */,
@@ -6371,7 +6354,6 @@
63716354
04A6B5C6226937650035C7C2 /* MSALLogger.m in Sources */,
63726355
04A6B5B0226936FE0035C7C2 /* MSIDVersion.m in Sources */,
63736356
B273D09F226E8570005A7BB4 /* MSALClaimsRequest.m in Sources */,
6374-
04A6B5D5226937930035C7C2 /* MSALTelemetry.m in Sources */,
63756357
B273D0EB226E85FF005A7BB4 /* MSALPublicClientStatusNotifications.m in Sources */,
63766358
B273D0D4226E85D3005A7BB4 /* MSALTelemetryConfig.m in Sources */,
63776359
B2D478C4230E3EC4005AE186 /* MSALAccountEnumerationParameters.m in Sources */,
@@ -6706,7 +6688,6 @@
67066688
DE8EC8742A026BA0003FA561 /* MSALNativeAuthSignInRequestProvider.swift in Sources */,
67076689
232D616422485BA700260C42 /* MSALIndividualClaimRequestAdditionalInfo.m in Sources */,
67086690
285F58652C5BCA8900F4EFA4 /* MSALNativeAuthSignInIntrospectValidatedResponse.swift in Sources */,
6709-
D61BD2BD1EBD0A010007E484 /* MSALTelemetry.m in Sources */,
67106691
DEE34F60D170B71C00BC302A /* MSALNativeAuthResetPasswordStartResponseError.swift in Sources */,
67116692
9BE7E3CB2A1CB70700CC3A62 /* MSALNativeAuthResetPasswordStartRequestProviderParameters.swift in Sources */,
67126693
DE54B5912A434B9B00460B34 /* MSALNativeAuthTokenController.swift in Sources */,
@@ -6884,7 +6865,6 @@
68846865
DE8DC4652C66219600534E8F /* MSALNativeAuthCredentialsController.swift in Sources */,
68856866
DE8DC4932C6621A600534E8F /* MSALNativeAuthUserAccountResult+Internal.swift in Sources */,
68866867
DE8DC4692C66219600534E8F /* MSALNativeAuthTokenController.swift in Sources */,
6887-
96D9A54A1E4AB23100674A85 /* MSALTelemetry.m in Sources */,
68886868
DECE0F4D2BE3EB2B0036738C /* DelegateDispatcher.swift in Sources */,
68896869
6077D4AA22498D87001798A2 /* MSALTenantProfile.m in Sources */,
68906870
DE8DC4642C66219600534E8F /* ResetPasswordResults.swift in Sources */,

‎MSAL/MSAL.xcodeproj/xcshareddata/xcschemes/MSAL Test App (Mac).xcscheme

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30-
<Testables>
31-
</Testables>
3230
<MacroExpansion>
3331
<BuildableReference
3432
BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
3836
ReferencedContainer = "container:MSAL.xcodeproj">
3937
</BuildableReference>
4038
</MacroExpansion>
41-
<AdditionalOptions>
42-
</AdditionalOptions>
39+
<Testables>
40+
</Testables>
4341
</TestAction>
4442
<LaunchAction
4543
buildConfiguration = "Debug"
@@ -62,8 +60,6 @@
6260
ReferencedContainer = "container:MSAL.xcodeproj">
6361
</BuildableReference>
6462
</BuildableProductRunnable>
65-
<AdditionalOptions>
66-
</AdditionalOptions>
6763
</LaunchAction>
6864
<ProfileAction
6965
buildConfiguration = "Release"

‎MSAL/src/MSALInteractiveTokenParameters.m

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -47,54 +47,4 @@ - (instancetype)initWithScopes:(NSArray<NSString *> *)scopes
4747
return self;
4848
}
4949

50-
- (instancetype)initWithScopes:(NSArray<NSString *> *)scopes
51-
{
52-
return [self initWithScopes:scopes
53-
webviewParameters:[MSALWebviewParameters new]];
54-
}
55-
56-
#if TARGET_OS_IPHONE
57-
58-
- (void)setParentViewController:(UIViewController *)parentViewController
59-
{
60-
self.webviewParameters.parentViewController = parentViewController;
61-
}
62-
63-
- (UIViewController *)parentViewController
64-
{
65-
return self.webviewParameters.parentViewController;
66-
}
67-
68-
- (void)setPresentationStyle:(UIModalPresentationStyle)presentationStyle
69-
{
70-
self.webviewParameters.presentationStyle = presentationStyle;
71-
}
72-
73-
- (UIModalPresentationStyle)presentationStyle
74-
{
75-
return self.webviewParameters.presentationStyle;
76-
}
77-
78-
#endif
79-
80-
- (void)setWebviewType:(MSALWebviewType)webviewType
81-
{
82-
self.webviewParameters.webviewType = webviewType;
83-
}
84-
85-
- (MSALWebviewType)webviewType
86-
{
87-
return self.webviewParameters.webviewType;
88-
}
89-
90-
- (void)setCustomWebview:(WKWebView *)customWebview
91-
{
92-
self.webviewParameters.customWebview = customWebview;
93-
}
94-
95-
- (WKWebView *)customWebview
96-
{
97-
return self.webviewParameters.customWebview;
98-
}
99-
10050
@end

‎MSAL/src/MSALLogger.m

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,6 @@ - (void)setCallback:(MSALLogCallback)callback
4848
[MSALGlobalConfig.loggerConfig setLogCallback:callback];
4949
}
5050

51-
#pragma mark - Pii logging
52-
53-
- (void)setPiiLoggingEnabled:(BOOL)PiiLoggingEnabled
54-
{
55-
MSALGlobalConfig.loggerConfig.piiEnabled = PiiLoggingEnabled;
56-
}
57-
58-
- (BOOL)PiiLoggingEnabled
59-
{
60-
return MSALGlobalConfig.loggerConfig.piiEnabled;
61-
}
62-
6351
#pragma mark - Level
6452

6553
- (void)setLevel:(MSALLogLevel)level

0 commit comments

Comments
 (0)