Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix AUT issue where multiple users are created and merge #899

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion swift-sdk/Internal/AnonymousUserManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public class AnonymousUserManager: AnonymousUserManagerProtocol {
private let notificationStateProvider: NotificationStateProviderProtocol
private var config: IterableConfig
private(set) var lastCriteriaFetch: Double = 0
private var isCriteriaMatched = false

/// Tracks an anonymous event and store it locally
public func trackAnonEvent(name: String, dataFields: [AnyHashable: Any]?) {
Expand Down Expand Up @@ -182,6 +183,7 @@ public class AnonymousUserManager: AnonymousUserManagerProtocol {
dataFields: self.localStorage.anonymousUserUpdate,
requestJson: anonSessions
).onError { error in
self.isCriteriaMatched = false
if error.httpStatusCode == 409 {
self.getAnonCriteria() // refetch the criteria
}
Expand Down Expand Up @@ -229,7 +231,8 @@ public class AnonymousUserManager: AnonymousUserManagerProtocol {
processAndStoreEvent(type: type, data: data)
}

if let criteriaId = evaluateCriteriaAndReturnID() {
if let criteriaId = evaluateCriteriaAndReturnID(), !isCriteriaMatched {
isCriteriaMatched = true
createAnonymousUser(criteriaId)
}
}
Expand Down
6 changes: 3 additions & 3 deletions tests/unit-tests/IterableApiCriteriaFetchTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class IterableApiCriteriaFetchTests: XCTestCase {

let config = IterableConfig()
config.enableAnonActivation = true
config.enableOnForegroundCriteriaFetching = true
config.enableForegroundCriteriaFetch = true

IterableAPI.initializeForTesting(apiKey: IterableApiCriteriaFetchTests.apiKey,
config: config,
Expand Down Expand Up @@ -85,7 +85,7 @@ class IterableApiCriteriaFetchTests: XCTestCase {

let config = IterableConfig()
config.enableAnonActivation = true
config.enableOnForegroundCriteriaFetching = false
config.enableForegroundCriteriaFetch = false

internalApi = InternalIterableAPI.initializeForTesting(
config: config,
Expand Down Expand Up @@ -124,7 +124,7 @@ class IterableApiCriteriaFetchTests: XCTestCase {

let config = IterableConfig()
config.enableAnonActivation = true
config.enableOnForegroundCriteriaFetching = true
config.enableForegroundCriteriaFetch = true

IterableAPI.initializeForTesting(apiKey: IterableApiCriteriaFetchTests.apiKey,
config: config,
Expand Down
43 changes: 43 additions & 0 deletions tests/unit-tests/UserMergeScenariosTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -974,6 +974,49 @@ class UserMergeScenariosTests: XCTestCase, AuthProvider {

waitForExpectations(timeout: 5, handler: nil)
}

func testCriteriaMetTwice() {
let config = IterableConfig()
config.enableAnonActivation = true

let mockSession = MockNetworkSession()

IterableAPI.initializeForTesting(apiKey: UserMergeScenariosTests.apiKey,
config: config,
networkSession: mockSession,
localStorage: localStorage)

IterableAPI.logoutUser()
guard let jsonData = mockData.data(using: .utf8) else { return }
localStorage.criteriaData = jsonData

IterableAPI.track(event: "testEvent")
IterableAPI.track(event: "testEvent")

waitForDuration(seconds: 3)

if let anonUser = localStorage.userIdAnnon {
XCTAssertFalse(anonUser.isEmpty, "Expected anon user nil")
} else {
XCTFail("Expected anon user nil but found")
}

// Verify that anon session request was made exactly once
let anonSessionRequest = mockSession.getRequest(withEndPoint: Const.Path.trackAnonSession)
XCTAssertNotNil(anonSessionRequest, "Anonymous session request should not be nil")

// Count total requests with anon session endpoint
let anonSessionRequests = mockSession.requests.filter { request in
request.url?.absoluteString.contains(Const.Path.trackAnonSession) == true
}
XCTAssertEqual(anonSessionRequests.count, 1, "Anonymous session should be called exactly once")

// Verify track events were made
let trackRequests = mockSession.requests.filter { request in
request.url?.absoluteString.contains(Const.Path.trackEvent) == true
}
XCTAssertEqual(trackRequests.count, 2, "Track event should be called twice")
}
}


Loading