Version 3.41.2

webim · Feb 2, 2024 · ac1780a · ac1780a
1 parent d5c0623
commit ac1780a
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ pod 'WebimMobileSDK'
 
 Add following line to your **Cartfile**:
 ```
-github "webim/webim-client-sdk-ios" ~> 3.41.1
+github "webim/webim-client-sdk-ios" ~> 3.41.2
 ```
 
 ### Swift Package Manager
@@ -41,7 +41,7 @@ Previous _Objective-C_ version (version numbers 2.x.x) can be reached from **ver
 
 ## Release notes
 
-* `send(message:compleionHandler)` fixed.
+* New method `set(requestHeader: )` .
 
 ## Example
 

diff --git a/WebimMobileSDK.podspec b/WebimMobileSDK.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name = 'WebimMobileSDK'
-  s.version = '3.41.0'
+  s.version = '3.41.2'
 
   s.author = { 'Webim.ru Ltd.' => '[email protected]' }
   s.homepage = 'https://webim.ru/integration/mobile-sdk/ios-sdk-howto/'

diff --git a/WebimMobileSDK/Backend/AbstractRequestLoop.swift b/WebimMobileSDK/Backend/AbstractRequestLoop.swift
@@ -61,11 +61,14 @@ class AbstractRequestLoop {
     private var currentDataTask: URLSessionDataTask?
     let completionHandlerExecutor: ExecIfNotDestroyedHandlerExecutor?
     let internalErrorListener: InternalErrorListener?
+    let requestHeader: [String: String]?
 
     init(completionHandlerExecutor: ExecIfNotDestroyedHandlerExecutor?,
-         internalErrorListener: InternalErrorListener?) {
+         internalErrorListener: InternalErrorListener?,
+         requestHeader: [String: String]?) {
         self.completionHandlerExecutor = completionHandlerExecutor
         self.internalErrorListener = internalErrorListener
+        self.requestHeader = requestHeader
     }
 
     // MARK: - Methods
@@ -102,7 +105,11 @@ class AbstractRequestLoop {
 
     func perform(request: URLRequest) throws -> Data {
         var requestWithUserAgent = request
-        requestWithUserAgent.setValue("iOS: Webim-Client 3.41.1; (\(UIDevice.current.model); \(UIDevice.current.systemVersion)); Bundle ID and version: \(Bundle.main.bundleIdentifier ?? "none") \(Bundle.main.infoDictionary?["CFBundleVersion"] ?? "none")", forHTTPHeaderField: "User-Agent")
+        requestWithUserAgent.setValue("iOS: Webim-Client 3.41.2; (\(UIDevice.current.model); \(UIDevice.current.systemVersion)); Bundle ID and version: \(Bundle.main.bundleIdentifier ?? "none") \(Bundle.main.infoDictionary?["CFBundleVersion"] ?? "none")", forHTTPHeaderField: "User-Agent")
+
+        for (key, value) in requestHeader ?? [:] {
+            requestWithUserAgent.setValue(value, forHTTPHeaderField: key)
+        }
 
         var errorCounter = 0
         var connectionErrorCounter = 0

diff --git a/WebimMobileSDK/Backend/ActionRequestLoop.swift b/WebimMobileSDK/Backend/ActionRequestLoop.swift
@@ -44,13 +44,14 @@ class ActionRequestLoop: AbstractRequestLoop {
 
     // MARK: - Initialization
     init(completionHandlerExecutor: ExecIfNotDestroyedHandlerExecutor,
-         internalErrorListener: InternalErrorListener, notFatalErrorHandler: NotFatalErrorHandler?) {
-        super.init(completionHandlerExecutor: completionHandlerExecutor, internalErrorListener: internalErrorListener)
+         internalErrorListener: InternalErrorListener, notFatalErrorHandler: NotFatalErrorHandler?, requestHeader: [String: String]?) {
+        super.init(completionHandlerExecutor: completionHandlerExecutor, internalErrorListener: internalErrorListener, requestHeader: requestHeader)
     }
 
     init(completionHandlerExecutor: ExecIfNotDestroyedHandlerExecutor,
-         internalErrorListener: InternalErrorListener) {
-        super.init(completionHandlerExecutor: completionHandlerExecutor, internalErrorListener: internalErrorListener)
+         internalErrorListener: InternalErrorListener,
+         requestHeader: [String: String]?) {
+        super.init(completionHandlerExecutor: completionHandlerExecutor, internalErrorListener: internalErrorListener, requestHeader: requestHeader)
     }
 
     // MARK: - Methods

diff --git a/WebimMobileSDK/Backend/DeltaRequestLoop.swift b/WebimMobileSDK/Backend/DeltaRequestLoop.swift
@@ -80,7 +80,8 @@ class DeltaRequestLoop: AbstractRequestLoop {
          visitorJSONString: String?,
          sessionID: String?,
          prechat:String?,
-         authorizationData: AuthorizationData?) {
+         authorizationData: AuthorizationData?,
+         requestHeader: [String: String]?) {
         self.deltaCallback = deltaCallback
         self.sessionParametersListener = sessionParametersListener
         self.baseURL = baseURL
@@ -97,7 +98,7 @@ class DeltaRequestLoop: AbstractRequestLoop {
         self.providedAuthenticationTokenStateListener = providedAuthenticationTokenStateListener
         self.providedAuthenticationToken = providedAuthenticationToken
         self.prechat = prechat
-        super.init(completionHandlerExecutor: completionHandlerExecutor, internalErrorListener: internalErrorListener)
+        super.init(completionHandlerExecutor: completionHandlerExecutor, internalErrorListener: internalErrorListener, requestHeader: requestHeader)
     }
 
     // MARK: - Methods
@@ -191,7 +192,7 @@ class DeltaRequestLoop: AbstractRequestLoop {
     func requestInitialization() {
         let url = URL(string: baseURL + ServerPathSuffix.initPath.rawValue + "?" + getInitializationParameterString())
         var request = URLRequest(url: url!)
-        request.setValue("3.41.1", forHTTPHeaderField: Parameter.webimSDKVersion.rawValue)
+        request.setValue("3.41.2", forHTTPHeaderField: Parameter.webimSDKVersion.rawValue)
         request.httpMethod = AbstractRequestLoop.HTTPMethods.get.rawValue
 
         do {

diff --git a/WebimMobileSDK/Backend/FAQRequestLoop.swift b/WebimMobileSDK/Backend/FAQRequestLoop.swift
@@ -43,7 +43,7 @@ class FAQRequestLoop: AbstractRequestLoop {
     // MARK: - Initialization
     init(completionHandlerExecutor: ExecIfNotDestroyedFAQHandlerExecutor) {
         self.completionFAQHandlerExecutor = completionHandlerExecutor
-        super.init(completionHandlerExecutor: nil, internalErrorListener: nil)
+        super.init(completionHandlerExecutor: nil, internalErrorListener: nil, requestHeader: nil)
     }
 
     // MARK: - Methods

diff --git a/WebimMobileSDK/Backend/WebimClient.swift b/WebimMobileSDK/Backend/WebimClient.swift
@@ -49,6 +49,7 @@ final class WebimClientBuilder {
     private var location: String?
     private var providedAuthenticationToken: String?
     private weak var providedAuthenticationTokenStateListener: ProvidedAuthorizationTokenStateListener?
+    private var requestHeader: [String: String]?
     private var sessionID: String?
     private var sessionParametersListener: SessionParametersListener?
     private var title: String?
@@ -113,6 +114,12 @@ final class WebimClientBuilder {
         return self
     }
 
+    func set(requestHeader: [String: String]?) -> WebimClientBuilder {
+        self.requestHeader = requestHeader
+
+        return self
+    }
+
     func set(sessionID: String?) -> WebimClientBuilder {
         self.sessionID = sessionID
 
@@ -178,7 +185,8 @@ final class WebimClientBuilder {
 
         let actionRequestLoop = ActionRequestLoop(completionHandlerExecutor: completionHandlerExecutor,
                                                   internalErrorListener: internalErrorListener,
-                                                  notFatalErrorHandler: notFatalErrorHandler)
+                                                  notFatalErrorHandler: notFatalErrorHandler,
+                                                  requestHeader: requestHeader)
 
         actionRequestLoop.set(authorizationData: authorizationData)
 
@@ -221,7 +229,8 @@ final class WebimClientBuilder {
                                                 visitorJSONString: visitorJSONString,
                                                 sessionID: sessionID,
                                                 prechat: prechat,
-                                                authorizationData: authorizationData
+                                                authorizationData: authorizationData,
+                                                requestHeader: requestHeader
                                                 )
 
         return WebimClient(withActionRequestLoop: actionRequestLoop,

diff --git a/WebimMobileSDK/Implementation/WebimSessionImpl.swift b/WebimMobileSDK/Implementation/WebimSessionImpl.swift
@@ -113,7 +113,8 @@ final class WebimSessionImpl {
                                 webimAlert: WebimAlert?,
                                 prechat: String?,
                                 multivisitorSection: String,
-                                onlineStatusRequestFrequencyInMillis: Int64?) -> WebimSessionImpl {
+                                onlineStatusRequestFrequencyInMillis: Int64?,
+                                requestHeader: [String: String]?) -> WebimSessionImpl {
 
         let visitorName = visitorFields?.getID() ?? "anonymous"
         let mobileChatInstance = mobileChatInstance ?? "default"
@@ -149,7 +150,8 @@ final class WebimSessionImpl {
                     webimAlert: webimAlert,
                     prechat: prechat,
                     multivisitorSection: multivisitorSection,
-                    onlineStatusRequestFrequencyInMillis: onlineStatusRequestFrequencyInMillis
+                    onlineStatusRequestFrequencyInMillis: onlineStatusRequestFrequencyInMillis,
+                    requestHeader: requestHeader
                 )
             }
             return session
@@ -229,6 +231,7 @@ final class WebimSessionImpl {
             .set(visitorJSONString: visitorJSON)
             .set(providedAuthenticationTokenStateListener: providedAuthorizationTokenStateListener,
                  providedAuthenticationToken: providedAuthorizationToken)
+            .set(requestHeader: requestHeader)
             .set(sessionID: sessionID)
             .set(authorizationData: authorizationData)
             .set(completionHandlerExecutor: ExecIfNotDestroyedHandlerExecutor(sessionDestroyer: sessionDestroyer,

diff --git a/WebimMobileSDK/Webim.swift b/WebimMobileSDK/Webim.swift
@@ -163,6 +163,7 @@ public final class SessionBuilder  {
     private weak var webimAlert: WebimAlert?
     private var prechat: String?
     private var onlineStatusRequestFrequencyInMillis: Int64?
+    private var requestHeader: [String: String]?
 
     // MARK: - Methods
 
@@ -492,6 +493,23 @@ public final class SessionBuilder  {
 
         return self
     }
+
+    /**
+     Adds header to network requests.
+     - parameter requestHeader:
+     Request header.
+     - returns:
+     `SessionBuilder` object with requestLocationFrequencyInMs parameter set.
+     - author:
+     Nikita Kaberov
+     - copyright:
+     2024 Webim
+     */
+    public func set(requestHeader: [String: String]) -> SessionBuilder {
+        self.requestHeader = requestHeader
+
+        return self
+    }
 
     /**
      Method to pass WebimLogger object.
@@ -641,7 +659,8 @@ public final class SessionBuilder  {
                                                 webimAlert: webimAlert,
                                                 prechat: prechat,
                                                 multivisitorSection: multivisitorSection,
-                                                onlineStatusRequestFrequencyInMillis: onlineStatusRequestFrequencyInMillis) as WebimSession
+                                                onlineStatusRequestFrequencyInMillis: onlineStatusRequestFrequencyInMillis,
+                                                requestHeader: requestHeader) as WebimSession
     }
 
     /**