From 5800ecf040b8d4632c51d1f46cd6fbf865c4f5f2 Mon Sep 17 00:00:00 2001 From: Sagi Date: Mon, 4 Sep 2023 11:00:46 +0300 Subject: [PATCH 1/4] add apikey to header. --- GigyaSwift/Network/Service/NetworkProvider.swift | 3 +++ 1 file changed, 3 insertions(+) diff --git a/GigyaSwift/Network/Service/NetworkProvider.swift b/GigyaSwift/Network/Service/NetworkProvider.swift index db2c9e53..b972f68c 100644 --- 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 From 47a8e4ca2fc31b0de20179c02fbe4305755e4b88 Mon Sep 17 00:00:00 2001 From: Sagi Date: Mon, 4 Sep 2023 11:01:12 +0300 Subject: [PATCH 2/4] fix compiler issue with old Xcode version --- GigyaSwift/Global/Plugins/GigyaWebBridge.swift | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/GigyaSwift/Global/Plugins/GigyaWebBridge.swift b/GigyaSwift/Global/Plugins/GigyaWebBridge.swift index f265ca58..32711899 100644 --- a/GigyaSwift/Global/Plugins/GigyaWebBridge.swift +++ b/GigyaSwift/Global/Plugins/GigyaWebBridge.swift @@ -85,9 +85,11 @@ final public class GigyaWebBridge: 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 } From fc4634322f472c2201025d45959d59ccb8c727a7 Mon Sep 17 00:00:00 2001 From: Sagi Date: Mon, 4 Sep 2023 11:01:47 +0300 Subject: [PATCH 3/4] fix issue with setAccount into login when TFA interrupt. --- GigyaSwift/Global/Api/BusinessApiService.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/GigyaSwift/Global/Api/BusinessApiService.swift b/GigyaSwift/Global/Api/BusinessApiService.swift index 1525527e..383fc7e1 100644 --- 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") From c96b59bdc67da0d310da28241ff250614daf6011 Mon Sep 17 00:00:00 2001 From: Sagi Date: Mon, 4 Sep 2023 11:04:30 +0300 Subject: [PATCH 4/4] update versions --- GigyaSwift.xcodeproj/project.pbxproj | 4 ++-- GigyaSwift/Models/Config/InternalConfig.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/GigyaSwift.xcodeproj/project.pbxproj b/GigyaSwift.xcodeproj/project.pbxproj index 34f23b74..d4650fba 100644 --- 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/Models/Config/InternalConfig.swift b/GigyaSwift/Models/Config/InternalConfig.swift index cd2c65b6..446548f0 100644 --- 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" }