Merge branch 'fix-master' into 'master'

update master to 2.0.1

See merge request frontend/ios-sdk!2

Author: Николай Капустин

GPBonusSDK.podspec

@@ -1,11 +1,11 @@
 Pod::Spec.new do |spec|
   spec.name         = "GPBonusSDK"
-  spec.version      = ENV['LIB_VERSION'] || "2.0.0"
+  spec.version      = ENV['LIB_VERSION'] || "2.0.1"
   spec.summary      = "GazpromBonus widget integration lib"
   spec.homepage     = "https://github.com/SetPartnerstv/ios-sdk"
   spec.license      = { :type => "MIT", :file => "LICENSE" }
   spec.author       = "SetPartnerstv"
-  spec.platform     = :ios, "11.0"
+  spec.platform     = :ios, "12.0"
   spec.source       = { :git => "https://github.com/SetPartnerstv/ios-sdk.git", :tag => "#{spec.version}" }
   spec.source_files = "sdk/**/*.{swift,h,m}"
   spec.requires_arc = true

sdk/SDKViewController.swift

@@ -78,6 +78,10 @@ open class SDKViewController: UIViewController, WKScriptMessageHandler, PaymentH
                     if (window.PNWidget.onready) {
                         window.PNWidget.onready();
                     }
+            
+                    window.addEventListener('webViewClose', (e) => {
+                        window.webkit.messageHandlers.PNWidget.postMessage('webViewClose');
+                    });
                 })()
             """,
             injectionTime: WKUserScriptInjectionTime.atDocumentStart,
@@ -149,6 +153,10 @@ open class SDKViewController: UIViewController, WKScriptMessageHandler, PaymentH
         decisionHandler(.allow, pref)
     }
 
+    public func webViewWebContentProcessDidTerminate(webView: WKWebView){
+        webView.reload();
+    }
+    
     public func webView(_ webView: WKWebView,
                         decidePolicyFor navigationResponse: WKNavigationResponse,
                         decisionHandler: @escaping (WKNavigationResponsePolicy) -> Void) {
@@ -198,6 +206,13 @@ open class SDKViewController: UIViewController, WKScriptMessageHandler, PaymentH
             return;
         }
 
+        if (message.body as! String == "webViewClose") {
+            if let delegate = self.sdkViewDelegate {
+                delegate.sdkViewDismiss(error: nil)
+            }
+            return;
+        }
+        
         var options = JSONDecodingOptions()
         options.ignoreUnknownFields = true
 

sdk_demo/GazpromBonusSDK.xcodeproj/project.pbxproj

@@ -363,7 +363,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 3V7NW97R8C;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -374,6 +374,7 @@
 				);
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = GazpromBonusSDK/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = "GPBonusSDK Demo";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
@@ -384,8 +385,8 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = "ru.gpbonus.sdk-test";
+				MARKETING_VERSION = 2.0.1;
+				PRODUCT_BUNDLE_IDENTIFIER = ru.pnhub.partnerapplication;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
@@ -400,7 +401,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 3V7NW97R8C;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -411,6 +412,7 @@
 				);
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = GazpromBonusSDK/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = "GPBonusSDK Demo";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
@@ -421,8 +423,8 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = "ru.gpbonus.sdk-test";
+				MARKETING_VERSION = 2.0.1;
+				PRODUCT_BUNDLE_IDENTIFIER = ru.pnhub.partnerapplication;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;

sdk_demo/GazpromBonusSDK/ViewController.swift

@@ -6,8 +6,9 @@
 //
 
 import UIKit
+import GPBonusSDK
 
-class ViewController: UIViewController {
+class ViewController: UIViewController, SDKViewDelegate {
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -26,8 +27,13 @@ class ViewController: UIViewController {
         //TODO: place your token here
         //sdkView.token = "YOUR_TOKEN"
         sdkView.baseUrl = "https://widget.gazprombonus.ru"
+        sdkView.sdkViewDelegate = self
 
         navigationController?.pushViewController(sdkView, animated: true)
     }
+    
+    func sdkViewDismiss(error: Error?) {
+        navigationController?.popToRootViewController(animated: true)
+    }
 }
 

sdk_demo/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - GPBonusSDK (2.0.0):
+  - GPBonusSDK (2.0.1):
     - SwiftProtobuf (~> 1.14.0)
   - SwiftProtobuf (1.14.0)
 
@@ -15,9 +15,9 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  GPBonusSDK: 08cdb05b41d7d66a671f6bf872f115bb3cf37bb7
+  GPBonusSDK: 056e491789c5c965a834cbd460c47205b7d5d7bd
   SwiftProtobuf: ed465ed18402f998fd117f631da27e0168e6b59c
 
-PODFILE CHECKSUM: 872a5e1ccdd89d925717b81524605f01e0c23e29
+PODFILE CHECKSUM: 3c73ac9aac1f862646b280aa7f07de7eace745dc
 
 COCOAPODS: 1.12.1