Merge branch 'update/v1.5.6' into main

SAP · Sep 4, 2023 · 2efbab0 · 2efbab0
2 parents c9cb2ce + c96b59b
commit 2efbab0
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/GigyaSwift.xcodeproj/project.pbxproj b/GigyaSwift.xcodeproj/project.pbxproj
@@ -2590,7 +2590,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.5.5;
+				MARKETING_VERSION = 1.5.6;
 				MODULEMAP_FILE = "";
 				MODULEMAP_PRIVATE_FILE = "";
 				ONLY_ACTIVE_ARCH = NO;
@@ -2651,7 +2651,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.5.5;
+				MARKETING_VERSION = 1.5.6;
 				MODULEMAP_FILE = "";
 				MODULEMAP_PRIVATE_FILE = "";
 				ONLY_ACTIVE_ARCH = NO;

diff --git a/GigyaSwift/Global/Api/BusinessApiService.swift b/GigyaSwift/Global/Api/BusinessApiService.swift
@@ -311,9 +311,10 @@ class BusinessApiService: NSObject, BusinessApiServiceProtocol {
 
         GigyaLogger.log(with: self, message: "[finalizeRegistration] - params: \(params)")
 
-        send(dataType: T.self, api: GigyaDefinitions.API.finalizeRegistration, params: params) { result in
+        send(dataType: T.self, api: GigyaDefinitions.API.finalizeRegistration, params: params) { [weak accountService] result in
             switch result {
             case .success(let data):
+                accountService?.account = data
                 completion(.success(data: data))
 
                 GigyaLogger.log(with: BusinessApiService.self, message: "[finalizeRegistration] - success")

diff --git a/GigyaSwift/Global/Plugins/GigyaWebBridge.swift b/GigyaSwift/Global/Plugins/GigyaWebBridge.swift
@@ -85,9 +85,11 @@ final public class GigyaWebBridge<T: GigyaAccountProtocol>: NSObject, WKScriptMe
 
         GigyaLogger.log(with: self, message: "JS Interface:\n\(JSInterface)")
 
-        if #available(iOS 16.4, *), GigyaLogger.isDebug() {
-            self.webView?.isInspectable = true
-        }
+        #if compiler(>=5.8) && DEBUG
+            if #available(iOS 16.4, *), GigyaLogger.isDebug() {
+                self.webView?.isInspectable = true
+            }
+        #endif
 
     }
 

diff --git a/GigyaSwift/Models/Config/InternalConfig.swift b/GigyaSwift/Models/Config/InternalConfig.swift
@@ -10,7 +10,7 @@ import Foundation
 
 struct InternalConfig {
     struct General {
-        internal static let version = "\(GigyaDefinitions.versionPrefix ?? "")ios_swift_1.5.5"
+        internal static let version = "\(GigyaDefinitions.versionPrefix ?? "")ios_swift_1.5.6"
         internal static let sdkDomain = "com.gigya.GigyaSDK"
         internal static let defaultLang = "en"
     }

diff --git a/GigyaSwift/Network/Service/NetworkProvider.swift b/GigyaSwift/Network/Service/NetworkProvider.swift
@@ -56,6 +56,9 @@ final class NetworkProvider {
             }
         }
 
+        // Add apikey to header
+        request.setValue(config?.apiKey, forHTTPHeaderField: "apikey")
+
         request.timeoutInterval = TimeInterval(config?.requestTimeout ?? InternalConfig.Network.requestTimeoutDefult)
 
         // Encode body request to params