Skip to content

Commit e17a6e5

Browse files
Yuki-YuXinYuki-YuXin
authored
Merge pull request #2527 from AzureAD/yuki/e2e-parameter
Native auth E2E test parameters change
2 parents b216b25 + 9c4d18e commit e17a6e5

8 files changed

+189
-83
lines changed

‎MSAL/test/integration/native_auth/end_to_end/credentials/MSALNativeAuthUserAccountEndToEndTests.swift

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
import Foundation
2626
import XCTest
27+
import MSAL
2728

2829
final class MSALNativeAuthUserAccountEndToEndTests: MSALNativeAuthEndToEndPasswordTestCase {
2930

@@ -40,7 +41,10 @@ final class MSALNativeAuthUserAccountEndToEndTests: MSALNativeAuthEndToEndPasswo
4041
let signInExpectation = expectation(description: "signing in")
4142
let signInDelegateSpy = SignInPasswordStartDelegateSpy(expectation: signInExpectation)
4243

43-
sut.signIn(username: username, password: password, correlationId: correlationId, delegate: signInDelegateSpy)
44+
let param = MSALNativeAuthSignInParameters(username: username)
45+
param.password = password
46+
param.correlationId = correlationId
47+
sut.signIn(parameters: param, delegate: signInDelegateSpy)
4448

4549
await fulfillment(of: [signInExpectation])
4650

@@ -52,7 +56,9 @@ final class MSALNativeAuthUserAccountEndToEndTests: MSALNativeAuthEndToEndPasswo
5256
let refreshAccessTokenExpectation = expectation(description: "refreshing access token")
5357
let credentialsDelegateSpy = CredentialsDelegateSpy(expectation: refreshAccessTokenExpectation)
5458

55-
signInDelegateSpy.result?.getAccessToken(forceRefresh: true, delegate: credentialsDelegateSpy)
59+
let tokenParam = MSALNativeAuthGetAccessTokenParameters()
60+
tokenParam.forceRefresh = true
61+
signInDelegateSpy.result?.getAccessToken(parameters: tokenParam, delegate: credentialsDelegateSpy)
5662

5763
await fulfillment(of: [refreshAccessTokenExpectation])
5864

@@ -75,7 +81,10 @@ final class MSALNativeAuthUserAccountEndToEndTests: MSALNativeAuthEndToEndPasswo
7581
let signInExpectation = expectation(description: "signing in")
7682
let signInDelegateSpy = SignInPasswordStartDelegateSpy(expectation: signInExpectation)
7783

78-
sut.signIn(username: username, password: password, correlationId: correlationId, delegate: signInDelegateSpy)
84+
let signInParam = MSALNativeAuthSignInParameters(username: username)
85+
signInParam.password = password
86+
signInParam.correlationId = correlationId
87+
sut.signIn(parameters: signInParam, delegate: signInDelegateSpy)
7988

8089
await fulfillment(of: [signInExpectation])
8190

@@ -86,7 +95,10 @@ final class MSALNativeAuthUserAccountEndToEndTests: MSALNativeAuthEndToEndPasswo
8695
let refreshAccessTokenExpectation = expectation(description: "refreshing access token")
8796
let credentialsDelegateSpy = CredentialsDelegateSpy(expectation: refreshAccessTokenExpectation)
8897

89-
signInDelegateSpy.result?.getAccessToken(scopes: ["Calendar.Read"], forceRefresh: true, delegate: credentialsDelegateSpy)
98+
let tokenParam = MSALNativeAuthGetAccessTokenParameters()
99+
tokenParam.scopes = ["Calendar.Read"]
100+
tokenParam.forceRefresh = true
101+
signInDelegateSpy.result?.getAccessToken(parameters: tokenParam, delegate: credentialsDelegateSpy)
90102

91103
await fulfillment(of: [refreshAccessTokenExpectation])
92104

‎MSAL/test/integration/native_auth/end_to_end/mfa/MSALNativeAuthSignInWithMFAEndToEndTests.swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,8 +323,12 @@ final class MSALNativeAuthSignInWithMFAEndToEndTests: MSALNativeAuthEndToEndPass
323323
}
324324
let signInExpectation = expectation(description: "signing in")
325325
let signInDelegateSpy = SignInPasswordStartDelegateSpy(expectation: signInExpectation)
326+
327+
let param = MSALNativeAuthSignInParameters(username: username)
328+
param.password = password
329+
param.correlationId = correlationId
326330

327-
application.signIn(username: username, password: password, correlationId: correlationId, delegate: signInDelegateSpy)
331+
application.signIn(parameters: param, delegate: signInDelegateSpy)
328332

329333
await fulfillment(of: [signInExpectation])
330334

‎MSAL/test/integration/native_auth/end_to_end/reset_password/MSALNativeAuthResetPasswordEndToEndTests.swift

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ final class MSALNativeAuthResetPasswordEndToEndTests: MSALNativeAuthEndToEndBase
4242
let codeRequiredExp = expectation(description: "code required")
4343
let resetPasswordStartDelegate = ResetPasswordStartDelegateSpy(expectation: codeRequiredExp)
4444

45-
sut.resetPassword(username: username, delegate: resetPasswordStartDelegate)
45+
let param = MSALNativeAuthResetPasswordParameters(username: username)
46+
sut.resetPassword(parameters: param, delegate: resetPasswordStartDelegate)
4647

4748
await fulfillment(of: [codeRequiredExp])
4849
XCTAssertTrue(resetPasswordStartDelegate.onResetPasswordCodeRequiredCalled)
@@ -282,7 +283,8 @@ final class MSALNativeAuthResetPasswordEndToEndTests: MSALNativeAuthEndToEndBase
282283
let codeRequiredExp = expectation(description: "code required")
283284
let resetPasswordStartDelegate = ResetPasswordStartDelegateSpy(expectation: codeRequiredExp)
284285

285-
sut.resetPassword(username: username, delegate: resetPasswordStartDelegate)
286+
let param = MSALNativeAuthResetPasswordParameters(username: username)
287+
sut.resetPassword(parameters: param, delegate: resetPasswordStartDelegate)
286288

287289
await fulfillment(of: [codeRequiredExp])
288290
XCTAssertTrue(resetPasswordStartDelegate.onResetPasswordCodeRequiredCalled)
@@ -321,7 +323,8 @@ final class MSALNativeAuthResetPasswordEndToEndTests: MSALNativeAuthEndToEndBase
321323
let signInAfterResetPasswordExp = expectation(description: "sign in after reset password")
322324
let signInAfterResetPasswordDelegate = SignInAfterResetPasswordDelegateSpy(expectation: signInAfterResetPasswordExp)
323325

324-
resetPasswordRequiredDelegate.signInAfterResetPasswordState?.signIn(delegate: signInAfterResetPasswordDelegate)
326+
let autoParam = MSALNativeAuthSignInAfterResetPasswordParameters()
327+
resetPasswordRequiredDelegate.signInAfterResetPasswordState?.signIn(parameters: autoParam, delegate: signInAfterResetPasswordDelegate)
325328

326329
await fulfillment(of: [signInAfterResetPasswordExp])
327330
XCTAssertTrue(signInAfterResetPasswordDelegate.onSignInCompletedCalled)

‎MSAL/test/integration/native_auth/end_to_end/sign_in/MSALNativeAuthSignInUserNameAndPasswordEndToEndTests.swift

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,12 @@ final class MSALNativeAuthSignInUsernameAndPasswordEndToEndTests: MSALNativeAuth
5858
let signInDelegateSpy = SignInPasswordStartDelegateSpy(expectation: signInExpectation)
5959

6060
let unknownUsername = UUID().uuidString + "@contoso.com"
61+
62+
let signInParam = MSALNativeAuthSignInParameters(username: unknownUsername)
63+
signInParam.password = "testpass"
64+
signInParam.correlationId = correlationId
6165

62-
sut.signIn(username: unknownUsername, password: "testpass", correlationId: correlationId, delegate: signInDelegateSpy)
66+
sut.signIn(parameters: signInParam, delegate: signInDelegateSpy)
6367

6468
await fulfillment(of: [signInExpectation])
6569

@@ -95,7 +99,11 @@ final class MSALNativeAuthSignInUsernameAndPasswordEndToEndTests: MSALNativeAuth
9599
let signInExpectation = expectation(description: "signing in")
96100
let signInDelegateSpy = SignInPasswordStartDelegateSpy(expectation: signInExpectation)
97101

98-
sut.signIn(username: username, password: password, correlationId: correlationId, delegate: signInDelegateSpy)
102+
let signInParam = MSALNativeAuthSignInParameters(username: username)
103+
signInParam.password = password
104+
signInParam.correlationId = correlationId
105+
106+
sut.signIn(parameters: signInParam, delegate: signInDelegateSpy)
99107

100108
await fulfillment(of: [signInExpectation])
101109

@@ -254,7 +262,10 @@ final class MSALNativeAuthSignInUsernameAndPasswordEndToEndTests: MSALNativeAuth
254262
let signInDelegateSpy = SignInStartDelegateSpy(expectation: signInExpectation)
255263
let signInPasswordRequiredDelegateSpy = SignInPasswordRequiredDelegateSpy(expectation: passwordRequiredExpectation)
256264

257-
sut.signIn(username: username, correlationId: correlationId, delegate: signInDelegateSpy)
265+
let signInParam = MSALNativeAuthSignInParameters(username: username)
266+
signInParam.correlationId = correlationId
267+
268+
sut.signIn(parameters: signInParam, delegate: signInDelegateSpy)
258269

259270
await fulfillment(of: [signInExpectation])
260271

‎MSAL/test/integration/native_auth/end_to_end/sign_in/MSALNativeAuthSignInUsernameEndToEndTests.swift

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
import Foundation
2626
import XCTest
27+
import MSAL
2728

2829
final class MSALNativeAuthSignInUsernameEndToEndTests: MSALNativeAuthEndToEndBaseTestCase {
2930
// Hero Scenario 2.2.1. Sign in - Use email and OTP to get token and sign in
@@ -38,7 +39,9 @@ final class MSALNativeAuthSignInUsernameEndToEndTests: MSALNativeAuthEndToEndBas
3839
let signInExpectation = expectation(description: "signing in")
3940
let signInDelegateSpy = SignInStartDelegateSpy(expectation: signInExpectation)
4041

41-
sut.signIn(username: username, correlationId: correlationId, delegate: signInDelegateSpy)
42+
let param = MSALNativeAuthSignInParameters(username: username)
43+
param.correlationId = correlationId
44+
sut.signIn(parameters: param, delegate: signInDelegateSpy)
4245

4346
await fulfillment(of: [signInExpectation])
4447

@@ -82,7 +85,9 @@ final class MSALNativeAuthSignInUsernameEndToEndTests: MSALNativeAuthEndToEndBas
8285

8386
let unknownUsername = UUID().uuidString + "@contoso.com"
8487

85-
sut.signIn(username: unknownUsername, correlationId: correlationId, delegate: signInDelegateSpy)
88+
let param = MSALNativeAuthSignInParameters(username: unknownUsername)
89+
param.correlationId = correlationId
90+
sut.signIn(parameters: param, delegate: signInDelegateSpy)
8691

8792
await fulfillment(of: [signInExpectation])
8893

@@ -102,7 +107,9 @@ final class MSALNativeAuthSignInUsernameEndToEndTests: MSALNativeAuthEndToEndBas
102107
let signInExpectation = expectation(description: "signing in")
103108
let signInDelegateSpy = SignInStartDelegateSpy(expectation: signInExpectation)
104109

105-
sut.signIn(username: username, correlationId: correlationId, delegate: signInDelegateSpy)
110+
let param = MSALNativeAuthSignInParameters(username: username)
111+
param.correlationId = correlationId
112+
sut.signIn(parameters: param, delegate: signInDelegateSpy)
106113

107114
await fulfillment(of: [signInExpectation])
108115

@@ -123,7 +130,9 @@ final class MSALNativeAuthSignInUsernameEndToEndTests: MSALNativeAuthEndToEndBas
123130
let signInExpectation = expectation(description: "signing in")
124131
let signInDelegate = SignInStartDelegateSpy(expectation: signInExpectation)
125132

126-
sut.signIn(username: username, correlationId: correlationId, delegate: signInDelegate)
133+
let param = MSALNativeAuthSignInParameters(username: username)
134+
param.correlationId = correlationId
135+
sut.signIn(parameters: param, delegate: signInDelegate)
127136

128137
await fulfillment(of: [signInExpectation])
129138

@@ -196,7 +205,9 @@ final class MSALNativeAuthSignInUsernameEndToEndTests: MSALNativeAuthEndToEndBas
196205
let signInExpectation = expectation(description: "signing in")
197206
let signInDelegateSpy = SignInStartDelegateSpy(expectation: signInExpectation)
198207

199-
sut.signIn(username: username, correlationId: correlationId, delegate: signInDelegateSpy)
208+
let param = MSALNativeAuthSignInParameters(username: username)
209+
param.correlationId = correlationId
210+
sut.signIn(parameters: param, delegate: signInDelegateSpy)
200211

201212
await fulfillment(of: [signInExpectation])
202213

@@ -233,7 +244,9 @@ final class MSALNativeAuthSignInUsernameEndToEndTests: MSALNativeAuthEndToEndBas
233244
let signInExpectation = expectation(description: "signing in")
234245
let signInDelegateSpy = SignInStartDelegateSpy(expectation: signInExpectation)
235246

236-
sut.signIn(username: username, correlationId: correlationId, delegate: signInDelegateSpy)
247+
let param = MSALNativeAuthSignInParameters(username: username)
248+
param.correlationId = correlationId
249+
sut.signIn(parameters: param, delegate: signInDelegateSpy)
237250

238251
await fulfillment(of: [signInExpectation])
239252

@@ -277,7 +290,9 @@ final class MSALNativeAuthSignInUsernameEndToEndTests: MSALNativeAuthEndToEndBas
277290
let signInExpectation = expectation(description: "signing in")
278291
let signInDelegateSpy = SignInStartDelegateSpy(expectation: signInExpectation)
279292

280-
sut.signIn(username: username, correlationId: correlationId, delegate: signInDelegateSpy)
293+
let param = MSALNativeAuthSignInParameters(username: username)
294+
param.correlationId = correlationId
295+
sut.signIn(parameters: param, delegate: signInDelegateSpy)
281296

282297
await fulfillment(of: [signInExpectation])
283298

@@ -321,7 +336,9 @@ final class MSALNativeAuthSignInUsernameEndToEndTests: MSALNativeAuthEndToEndBas
321336
let signInExpectation = expectation(description: "signing in")
322337
let signInDelegateSpy = SignInStartDelegateSpy(expectation: signInExpectation)
323338

324-
sut.signIn(username: username, correlationId: correlationId, delegate: signInDelegateSpy)
339+
let signInParam = MSALNativeAuthSignInParameters(username: username)
340+
signInParam.correlationId = correlationId
341+
sut.signIn(parameters: signInParam, delegate: signInDelegateSpy)
325342

326343
await fulfillment(of: [signInExpectation])
327344

‎MSAL/test/integration/native_auth/end_to_end/sign_out/MSALNativeAuthSignOutEndToEndTests.swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
import Foundation
2626
import XCTest
27+
import MSAL
2728

2829
final class MSALNativeAuthSignOutEndToEndTests: MSALNativeAuthEndToEndPasswordTestCase {
2930
// Hero Scenario 2.4.1. Sign out – Local sign out from app on device (no SSO)
@@ -43,7 +44,10 @@ final class MSALNativeAuthSignOutEndToEndTests: MSALNativeAuthEndToEndPasswordTe
4344
let signInExpectation = expectation(description: "signing in")
4445
let signInDelegateSpy = SignInPasswordStartDelegateSpy(expectation: signInExpectation)
4546

46-
sut.signIn(username: username, password: password, correlationId: correlationId, delegate: signInDelegateSpy)
47+
let param = MSALNativeAuthSignInParameters(username: username)
48+
param.password = password
49+
param.correlationId = correlationId
50+
sut.signIn(parameters: param, delegate: signInDelegateSpy)
4751

4852
await fulfillment(of: [signInExpectation])
4953

0 commit comments

Comments
 (0)