Merge pull request #392 from Iterable/MOB-2154-add-token-to-onsuccess

[MOB-2154] add authToken parameter to onSuccess

Author: roninopf

swift-sdk/Internal/AuthManager.swift

@@ -7,7 +7,7 @@ import Foundation
 
 @objc public protocol IterableInternalAuthManagerProtocol {
     func getAuthToken() -> String?
-    func requestNewAuthToken(hasFailedPriorAuth: Bool, onSuccess: (() -> Void)?)
+    func requestNewAuthToken(hasFailedPriorAuth: Bool, onSuccess: ((String?) -> Void)?)
     func logoutUser()
 }
 
@@ -37,7 +37,7 @@ class AuthManager: IterableInternalAuthManagerProtocol {
     }
 
     // @objc attribute only needed for the pre-iOS 10 Timer constructor in queueAuthTokenExpirationRefresh
-    @objc func requestNewAuthToken(hasFailedPriorAuth: Bool = false, onSuccess: (() -> Void)? = nil) {
+    @objc func requestNewAuthToken(hasFailedPriorAuth: Bool = false, onSuccess: ((String?) -> Void)? = nil) {
         guard !self.hasFailedPriorAuth || !hasFailedPriorAuth else {
             return
         }
@@ -81,13 +81,13 @@ class AuthManager: IterableInternalAuthManagerProtocol {
         queueAuthTokenExpirationRefresh(authToken)
     }
 
-    private func onAuthTokenReceived(retrievedAuthToken: String?, onSuccess: (() -> Void)?) {
+    private func onAuthTokenReceived(retrievedAuthToken: String?, onSuccess: ((String?) -> Void)?) {
         authToken = retrievedAuthToken
 
         storeAuthToken()
 
         if authToken != nil {
-            onSuccess?()
+            onSuccess?(authToken)
         }
 
         queueAuthTokenExpirationRefresh(self.authToken)

swift-sdk/Internal/IterableAPIInternal.swift

@@ -121,7 +121,7 @@ final class IterableAPIInternal: NSObject, PushTrackerProtocol, AuthProvider {
             _email = email
             _userId = nil
 
-            authManager.requestNewAuthToken(hasFailedPriorAuth: false) { [weak self] in
+            authManager.requestNewAuthToken(hasFailedPriorAuth: false) { [weak self] authToken in
                 self?.loginNewUser()
             }
 
@@ -138,7 +138,7 @@ final class IterableAPIInternal: NSObject, PushTrackerProtocol, AuthProvider {
             _email = nil
             _userId = userId
 
-            authManager.requestNewAuthToken(hasFailedPriorAuth: false) { [weak self] in
+            authManager.requestNewAuthToken(hasFailedPriorAuth: false) { [weak self] authToken in
                 self?.loginNewUser()
             }
 

tests/swift-sdk-swift-tests/AuthTests.swift

@@ -611,8 +611,8 @@ class AuthTests: XCTestCase {
                                       dateProvider: MockDateProvider())
 
         authManager.requestNewAuthToken(hasFailedPriorAuth: false,
-                                        onSuccess: {
-                                            XCTAssertEqual(authManager.getAuthToken(), AuthTests.authToken)
+                                        onSuccess: { token in
+                                            XCTAssertEqual(token, AuthTests.authToken)
                                             condition1.fulfill()
         })