Email param make optional

Iterable · Jul 24, 2023 · 43b5603 · 43b5603
1 parent 2d32dbd
commit 43b5603
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 20 deletions.
diff --git a/swift-sdk/Internal/ApiClient.swift b/swift-sdk/Internal/ApiClient.swift
@@ -217,12 +217,12 @@ extension ApiClient: ApiClientProtocol {
         return send(iterableRequestResult: result)
     }
 
-    func subscribeUser(_email: String, userId: String?, subscriptionId: String, subscriptionGroup: String) -> Pending<SendRequestValue, SendRequestError> {
+    func subscribeUser(_email: String?, userId: String?, subscriptionId: String, subscriptionGroup: String) -> Pending<SendRequestValue, SendRequestError> {
         let result = createRequestCreator().flatMap { $0.createSubscribeUserRequest(_email: _email, userId: userId, subscriptionId: subscriptionId, subscriptionGroup: subscriptionGroup) }
         return send(iterableRequestResult: result)
     }
 
-    func unSubscribeUser(_email: String, userId: String?, subscriptionId: String, subscriptionGroup: String) -> Pending<SendRequestValue, SendRequestError> {
+    func unSubscribeUser(_email: String?, userId: String?, subscriptionId: String, subscriptionGroup: String) -> Pending<SendRequestValue, SendRequestError> {
         let result = createRequestCreator().flatMap { $0.createUnSubscribeUserRequest(_email: _email, userId: userId, subscriptionId: subscriptionId, subscriptionGroup: subscriptionGroup) }
         return send(iterableRequestResult: result)
     }

diff --git a/swift-sdk/Internal/ApiClientProtocol.swift b/swift-sdk/Internal/ApiClientProtocol.swift
@@ -46,7 +46,7 @@ protocol ApiClientProtocol: AnyObject {
 
     func getRemoteConfiguration() -> Pending<RemoteConfiguration, SendRequestError>
 
-    @discardableResult func subscribeUser(_email: String, userId: String?, subscriptionId: String, subscriptionGroup: String) -> Pending<SendRequestValue, SendRequestError>
+    @discardableResult func subscribeUser(_email: String?, userId: String?, subscriptionId: String, subscriptionGroup: String) -> Pending<SendRequestValue, SendRequestError>
 
-    @discardableResult func unSubscribeUser(_email: String, userId: String?, subscriptionId: String, subscriptionGroup: String) -> Pending<SendRequestValue, SendRequestError>
+    @discardableResult func unSubscribeUser(_email: String?, userId: String?, subscriptionId: String, subscriptionGroup: String) -> Pending<SendRequestValue, SendRequestError>
 }
diff --git a/swift-sdk/Internal/InternalIterableAPI.swift b/swift-sdk/Internal/InternalIterableAPI.swift
@@ -408,7 +408,7 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
     }
 
     @discardableResult
-    func subscribeUser(_email: String,
+    func subscribeUser(_email: String?,
                        userId: String?,
                        subscriptionId: String,
                        subscriptionGroup: String,
@@ -418,7 +418,7 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
     }
 
     @discardableResult
-    func unSubscribeUser(_email: String,
+    func unSubscribeUser(_email: String?,
                        userId: String?,
                        subscriptionId: String,
                        subscriptionGroup: String,

diff --git a/swift-sdk/Internal/OnlineRequestProcessor.swift b/swift-sdk/Internal/OnlineRequestProcessor.swift
@@ -234,7 +234,7 @@ struct OnlineRequestProcessor: RequestProcessorProtocol {
     }
 
     @discardableResult
-    func subscribeUser(_email: String,
+    func subscribeUser(_email: String?,
                     userId: String?,
                     subscriptionId: String,
                     subscriptionGroup: String,
@@ -247,7 +247,7 @@ struct OnlineRequestProcessor: RequestProcessorProtocol {
     }
 
     @discardableResult
-    func unSubscribeUser(_email: String,
+    func unSubscribeUser(_email: String?,
                     userId: String?,
                     subscriptionId: String,
                     subscriptionGroup: String,

diff --git a/swift-sdk/Internal/RequestCreator.swift b/swift-sdk/Internal/RequestCreator.swift
@@ -442,7 +442,7 @@ struct RequestCreator {
         return .success(.get(createGetRequest(forPath: Const.Path.getRemoteConfiguration, withArgs: args as! [String: String])))
     }
 
-    func createSubscribeUserRequest(_email: String, userId: String?, subscriptionId: String, subscriptionGroup: String) -> Result<IterableRequest, IterableError> {
+    func createSubscribeUserRequest(_email: String?, userId: String?, subscriptionId: String, subscriptionGroup: String) -> Result<IterableRequest, IterableError> {
         if case .none = auth.emailOrUserId {
             ITBError(Self.authMissingMessage)
             return .failure(IterableError.general(description: Self.authMissingMessage))
@@ -453,13 +453,13 @@ struct RequestCreator {
         if !userId!.isEmpty {
             endpoint = Const.Path.subscriptions + subscriptionGroup + "/" + subscriptionId + "/byUserId/" + userId!
         } else {
-            endpoint = Const.Path.subscriptions + subscriptionGroup + "/" + subscriptionId + "/user/" + _email
+            endpoint = Const.Path.subscriptions + subscriptionGroup + "/" + subscriptionId + "/user/" + _email!
         }
 
         return .success(.patch(createPatchRequest(forPath: endpoint, withArgs: [String: String]())))
     }
 
-    func createUnSubscribeUserRequest(_email: String, userId: String?, subscriptionId: String, subscriptionGroup: String) -> Result<IterableRequest, IterableError> {
+    func createUnSubscribeUserRequest(_email: String?, userId: String?, subscriptionId: String, subscriptionGroup: String) -> Result<IterableRequest, IterableError> {
         if case .none = auth.emailOrUserId {
             ITBError(Self.authMissingMessage)
             return .failure(IterableError.general(description: Self.authMissingMessage))
@@ -470,7 +470,7 @@ struct RequestCreator {
         if !userId!.isEmpty {
             endpoint = Const.Path.subscriptions + subscriptionGroup + "/" + subscriptionId + "/byUserId/" + userId!
         } else {
-            endpoint = Const.Path.subscriptions + subscriptionGroup + "/" + subscriptionId + "/user/" + _email
+            endpoint = Const.Path.subscriptions + subscriptionGroup + "/" + subscriptionId + "/user/" + _email!
         }
 
         return .success(.delete(createDeleteRequest(forPath: endpoint, withArgs: [String: String]())))

diff --git a/swift-sdk/Internal/RequestHandler.swift b/swift-sdk/Internal/RequestHandler.swift
@@ -258,7 +258,7 @@ class RequestHandler: RequestHandlerProtocol {
     }
 
     @discardableResult
-    func subscribeUser(_email: String,
+    func subscribeUser(_email: String?,
                        userId: String?,
                        subscriptionId: String,
                        subscriptionGroup: String,
@@ -273,7 +273,7 @@ class RequestHandler: RequestHandlerProtocol {
     }
 
     @discardableResult
-    func unSubscribeUser(_email: String,
+    func unSubscribeUser(_email: String?,
                        userId: String?,
                        subscriptionId: String,
                        subscriptionGroup: String,

diff --git a/swift-sdk/Internal/RequestHandlerProtocol.swift b/swift-sdk/Internal/RequestHandlerProtocol.swift
@@ -119,15 +119,15 @@ protocol RequestHandlerProtocol: AnyObject {
                       onFailure: OnFailureHandler?) -> Pending<SendRequestValue, SendRequestError>
 
     @discardableResult
-    func subscribeUser(_email: String,
+    func subscribeUser(_email: String?,
                        userId: String?,
                        subscriptionId: String,
                        subscriptionGroup: String,
                     onSuccess: OnSuccessHandler?,
                     onFailure: OnFailureHandler?) -> Pending<SendRequestValue, SendRequestError>
 
     @discardableResult
-    func unSubscribeUser(_email: String,
+    func unSubscribeUser(_email: String?,
                        userId: String?,
                        subscriptionId: String,
                        subscriptionGroup: String,

diff --git a/swift-sdk/IterableAPI.swift b/swift-sdk/IterableAPI.swift
@@ -691,7 +691,7 @@ import UIKit
     /// Subscribe user by email or userId
     ///
     /// - Parameters:
-    ///    - email: Subscribe by email
+    ///    - email: Subscribe by email, but it's optional
     ///    - usrId: Subscribe by userId, but it's optional
     ///    - subscriptionId: Subscription Group ID
     ///    - subscriptionGroup: Subscription Group Name
@@ -700,7 +700,7 @@ import UIKit
     ///
     /// - SeeAlso: OnSuccessHandler, OnFailureHandler
     @objc(subscribeUser:userId:subscriptionId:subscriptionGroup:onSuccess:onFailure:)
-    public static func subscribeUser(_email: String,
+    public static func subscribeUser(_email: String?,
                                      userId: String?,
                                      subscriptionId: String,
                                      subscriptionGroup: String,
@@ -717,7 +717,7 @@ import UIKit
     /// UnSubscribe user by email or userId
     ///
     /// - Parameters:
-    ///    - email: Subscribe by email
+    ///    - email: Subscribe by email, but it's optional
     ///    - usrId: Subscribe by userId, but it's optional
     ///    - subscriptionId: Subscription Group ID
     ///    - subscriptionGroup: Subscription Group Name
@@ -726,7 +726,7 @@ import UIKit
     ///
     /// - SeeAlso: OnSuccessHandler, OnFailureHandler
     @objc(unSubscribeUser:userId:subscriptionId:subscriptionGroup:onSuccess:onFailure:)
-    public static func unSubscribeUser(_email: String,
+    public static func unSubscribeUser(_email: String?,
                                      userId: String?,
                                      subscriptionId: String,
                                      subscriptionGroup: String,