Merge branch 'bugs-nonce' into main

SAP · Oct 26, 2021 · bbd6e68 · bbd6e68
2 parents e12af4e + fc14266
commit bbd6e68
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/Gigya.podspec b/Gigya.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name          = 'Gigya'
-  spec.version       = '1.2.4'
+  spec.version       = '1.2.5'
   spec.license       = 'Apache 2.0'
   spec.homepage      = 'https://developers.gigya.com/display/GD/Swift+SDK'
   spec.author       = 'Gigya SAP'
@@ -10,7 +10,7 @@ Pod::Spec.new do |spec|
 			your Swift application
 			DESC
 
-  spec.source        = { :git => 'https://github.com/SAP/gigya-swift-sdk.git', :tag => 'core/v1.2.4' }
+  spec.source        = { :git => 'https://github.com/SAP/gigya-swift-sdk.git', :tag => 'core/v1.2.5' }
   spec.module_name   = 'Gigya'
   spec.swift_version = '5.3'
 

diff --git a/GigyaSwift.xcodeproj/project.pbxproj b/GigyaSwift.xcodeproj/project.pbxproj
@@ -2330,7 +2330,7 @@
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 124;
+				CURRENT_PROJECT_VERSION = 125;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 52P2295V75;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2350,7 +2350,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.4;
+				MARKETING_VERSION = 1.2.5;
 				MODULEMAP_FILE = "";
 				MODULEMAP_PRIVATE_FILE = "";
 				ONLY_ACTIVE_ARCH = NO;
@@ -2389,7 +2389,7 @@
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 124;
+				CURRENT_PROJECT_VERSION = 125;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 52P2295V75;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2409,7 +2409,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.4;
+				MARKETING_VERSION = 1.2.5;
 				MODULEMAP_FILE = "";
 				MODULEMAP_PRIVATE_FILE = "";
 				ONLY_ACTIVE_ARCH = NO;

diff --git a/GigyaSwift/Gigya/GigyaCore.swift b/GigyaSwift/Gigya/GigyaCore.swift
@@ -71,11 +71,7 @@ public final class GigyaCore<T: GigyaAccountProtocol>: GigyaInstanceProtocol {
         }
 
         if let accountConfig: GigyaAccountConfig = plistConfig?.account {
-            config.accountConfig = accountConfig
-
-            if let cacheTime = accountConfig.cacheTime {
-                businessApiService.accountService.accountCacheTime = cacheTime
-            }
+            setAccountConfig(with: accountConfig)
         }
 
         // Must be registered following the init call
@@ -512,5 +508,9 @@ public final class GigyaCore<T: GigyaAccountProtocol>: GigyaInstanceProtocol {
 
     public func setAccountConfig(with account: GigyaAccountConfig) {
         config.accountConfig = account
+
+        if let cacheTime = account.cacheTime {
+            businessApiService.accountService.accountCacheTime = cacheTime
+        }
     }
 }
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.2.2"
+        internal static let version = "\(GigyaDefinitions.versionPrefix ?? "")ios_swift_1.2.5"
         internal static let sdkDomain = "com.gigya.GigyaSDK"
         internal static let defaultLang = "en"
     }

diff --git a/GigyaSwift/Network/Models/ApiRequestModel.swift b/GigyaSwift/Network/Models/ApiRequestModel.swift
@@ -14,7 +14,7 @@ public struct ApiRequestModel {
     public let isAnonymous: Bool
     var config: GigyaConfig?
 
-    public init(method: String, params: [String: Any]? = nil, isAnonymous: Bool = false, config: GigyaConfig? = nil) {
+    public init(method: String, params: [String: Any]? = [:], isAnonymous: Bool = false, config: GigyaConfig? = nil) {
         self.method = method
         self.isAnonymous = isAnonymous
         self.config = config