Adds support for new screen constructor. 0.6.1 release

Author: ren6

ApphudSDK.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'ApphudSDK'
-  s.version          = '0.6.0'
+  s.version          = '0.6.1'
   s.summary          = 'Track and control iOS auto-renewable subscriptions.'
 
   s.description      = 'Track, control and analyze iOS auto-renewable subscriptions with Apphud.'

Source/Apphud.swift

@@ -93,7 +93,7 @@ final public class Apphud: NSObject {
     /**
      Purchases product and automatically submits App Store Receipt to Apphud.
 
-     __Note__: This method automatically sends in-app purchase receipt to Apphud, so you don't need to call `submitPurchase` method.    
+     __Note__: This method automatically sends in-app purchase receipt to Apphud, so you don't need to call `submitReceipt` method.    
 
      - parameter product: Required. This is an `SKProduct` object that user wants to purchase.
      - parameter callback: Optional. Returns `ApphudSubscription` object if succeeded and an optional error otherwise.
@@ -105,7 +105,7 @@ final public class Apphud: NSObject {
     /**
         Purchases promotional offer and automatically submits App Store Receipt to Apphud.
 
-        __Note__: This method automatically sends in-app purchase receipt to Apphud, so you don't need to call `submitPurchase` method.    
+        __Note__: This method automatically sends in-app purchase receipt to Apphud, so you don't need to call `submitReceipt` method.    
 
         - parameter product: Required. This is an `SKProduct` object that user wants to purchase.
         - parameter discountID: Required. This is a `SKProductDiscount` Identifier String object that you would like to apply.
@@ -189,7 +189,7 @@ final public class Apphud: NSObject {
      Example:   
 
      ````
-     Apphud.purchasedSubscription().isActive
+     let active = Apphud.purchasedSubscription()?.isActive ?? false
      ````
 
      If you have more than one subscription group in your app, use `subscriptions()` method and get `isActive` value for your desired subscription.
@@ -235,16 +235,25 @@ final public class Apphud: NSObject {
         ApphudInternal.shared.submitAppStoreReceipt(allowsReceiptRefresh: true)
     }
 
+    /**
+     Submit device push token to Apphud.
+     - parameter token: Push token in Data class.
+     - parameter callback: Returns true if successfully sent.
+    */
     @objc public static func submitPushNotificationsToken(token: Data, callback: @escaping (Bool) -> Void){
         ApphudInternal.shared.submitPushNotificationsToken(token: token, callback: callback)
     }
 
-    /*
+    /**
+     Handles push notification payload. Apphud handles only push notifications that were created by Apphud.
+     - parameter apsInfo: Payload of push notification.
 
+     Returns true if push notification was handled by Apphud.
      */
     @discardableResult @objc public static func handlePushNotification(apsInfo: [AnyHashable : Any]) -> Bool{
         return ApphudNotificationsHandler.shared.handleNotification(apsInfo)
     }
+    
     /**
      Enables debug logs. Better to call this method before SDK initialization.
      */

Source/ApphudExtensions.swift

@@ -21,6 +21,16 @@ internal func apphudLog(_ text : String, forceDisplay: Bool = false) {
     }
 }
 
+enum ApphudError: LocalizedError {
+    case error(message: String)
+    var errorDescription: String? {
+        switch self {
+        case let .error(message):
+            return message
+        }
+    }
+}
+
 internal func apphudVisibleViewController() -> UIViewController? {
     var currentVC = UIApplication.shared.keyWindow?.rootViewController
     while let presentedVC = currentVC?.presentedViewController {

Source/ApphudHttpClient.swift

@@ -43,7 +43,10 @@ public class ApphudHttpClient {
     }
 
     internal func makeScreenRequest(screenID: String) -> URLRequest? {
-        let urlString = "\(domain_url_string)/preview_screen/\(screenID)?api_key=\(apiKey)"
+        
+        let deviceID : String = ApphudInternal.shared.currentDeviceID
+        let urlString = "\(domain_url_string)/preview_screen/\(screenID)?api_key=\(apiKey)&locale=\(Locale.current.identifier)&device_id=\(deviceID)"
+        
         let url = URL(string: urlString)
         if url != nil {
             let request = URLRequest(url: url!, cachePolicy: URLRequest.CachePolicy.useProtocolCachePolicy, timeoutInterval: 20)

Source/ApphudInquiryController.swift

@@ -86,9 +86,9 @@ internal class ApphudInquiryController: UIViewController {
 
         let dismissButton = UIButton(type: .system)
         dismissButton.setTitleColor(UIColor(red: 0.04, green: 0.52, blue: 1, alpha: 1), for: .normal)
-        dismissButton.titleLabel?.font = UIFont.systemFont(ofSize: 13)
+        dismissButton.titleLabel?.font = UIFont.boldSystemFont(ofSize: 18)
         dismissButton.addTarget(self, action: #selector(dismissTapped), for: .touchUpInside)
-        dismissButton.setTitle("Dismiss", for: .normal)
+        dismissButton.setTitle("╳", for: .normal)
         self.view.addSubview(dismissButton)
         dismissButton.translatesAutoresizingMaskIntoConstraints = false
         NSLayoutConstraint.activate([

Source/ApphudInternal.swift

@@ -10,7 +10,7 @@ import Foundation
 import AdSupport
 import StoreKit
 
-let sdk_version = "0.6.0"
+let sdk_version = "0.6.1"
 
 final class ApphudInternal {
 
@@ -72,34 +72,14 @@ final class ApphudInternal {
     }
 
     private func continueToRegisteringUser(){
-        registerUser { (result, dictionary, error) in
-            
-            var hasSubscriptionChanges = false
-            if result {
-                hasSubscriptionChanges = self.parseUser(dictionary)
-            }
-            
-            if result && self.currentUser != nil {
-                
-                if hasSubscriptionChanges {
-                    self.delegate?.apphudSubscriptionsUpdated?(self.currentUser!.subscriptions!)
-                }
-                
+        createOrGetUser { success in
+            if success {
                 apphudLog("User successfully registered")
-                
-                self.performAllUserRegisteredBlocks()
-                
-                if UserDefaults.standard.bool(forKey: self.requiresReceiptSubmissionKey) {
-                    self.submitAppStoreReceipt(allowsReceiptRefresh: false)
-                }
-                
+                self.performAllUserRegisteredBlocks()                
                 self.continueToUpdateProducts()
-                
                 self.listenForAwakeNotification()
                 self.checkForUnreadNotifications()
-                
-            } else {
-                apphudLog("Failed to register user, error:\(error?.localizedDescription ?? "")")
+            } else {                
                 self.userRegisteredCallbacks.removeAll()
             }
         }
@@ -152,6 +132,7 @@ final class ApphudInternal {
 
         if Date().timeIntervalSince(lastCheckDate) >  minCheckInterval{
             self.checkForUnreadNotifications()
+            self.refreshCurrentUser()
         }
     }
 
@@ -245,7 +226,7 @@ final class ApphudInternal {
 
     // MARK: API Requests
 
-    private func registerUser(callback: @escaping ApphudBoolDictionaryCallback) {
+    private func createOrGetUser(callback: @escaping (Bool) -> Void) {
 
         var params : [String : String] = ["device_id" : self.currentDeviceID]
         if self.currentUserID != nil {
@@ -255,7 +236,30 @@ final class ApphudInternal {
         let deviceParams = currentDeviceParameters()
         params.merge(deviceParams) { (current, new) in current}
 
-        httpClient.startRequest(path: "customers", params: params, method: .post, callback: callback)        
+        httpClient.startRequest(path: "customers", params: params, method: .post) { (result, response, error) in
+            
+            var hasSubscriptionChanges = false
+            if result {
+                hasSubscriptionChanges = self.parseUser(response)
+            }
+            
+            let finalResult = result && self.currentUser != nil
+            
+            if finalResult {
+                if hasSubscriptionChanges {
+                    self.delegate?.apphudSubscriptionsUpdated?(self.currentUser!.subscriptions!)
+                }
+                if UserDefaults.standard.bool(forKey: self.requiresReceiptSubmissionKey) {
+                    self.submitAppStoreReceipt(allowsReceiptRefresh: false)
+                }
+            }
+            
+            if error != nil {
+                apphudLog("Failed to register or get user, error:\(error!.localizedDescription)")
+            }
+            
+            callback(finalResult)
+        }        
     }
 
     private func updateUserCurrencyIfNeeded(priceLocale : Locale?){
@@ -301,8 +305,8 @@ final class ApphudInternal {
         httpClient.startRequest(path: "customers", params: params, method: .post, callback: callback)
     }
 
-    private func getCurrentUser(){
-        
+    private func refreshCurrentUser(){
+        createOrGetUser { _ in }         
     }
 
     private func getProducts(callback: @escaping (([String : String]?) -> Void)) {
@@ -340,7 +344,7 @@ final class ApphudInternal {
     internal func submitReceipt(productId : String, callback : ((ApphudSubscription?, Error?) -> Void)?) {
         guard let receiptString = receiptDataString() else { 
             ApphudStoreKitWrapper.shared.refreshReceipt()
-            callback?(nil, nil)
+            callback?(nil, ApphudError.error(message: "Receipt not found on device, refreshing."))
             return 
         }
 
@@ -350,7 +354,7 @@ final class ApphudInternal {
             }            
         }
         if !exist {
-            apphudLog("Tried to make submitPurchase: \(productId) request when user is not yet registered, addind to schedule..")
+            apphudLog("Tried to make submitReceipt: \(productId) request when user is not yet registered, addind to schedule..")
         }
     }
 
@@ -360,7 +364,7 @@ final class ApphudInternal {
                 apphudLog("App Store receipt is missing on device, will refresh first then retry")
                 ApphudStoreKitWrapper.shared.refreshReceipt()
             } else {
-                // receipt is missing and can't refresh anymore because already tried to refresh
+                apphudLog("App Store receipt is missing on device and couldn't be refreshed.", forceDisplay: true)
             }
             return 
         }
@@ -425,7 +429,7 @@ final class ApphudInternal {
             if let paymentDiscount = paymentDiscount {                
                 ApphudInternal.shared.purchasePromo(product: product, discount: paymentDiscount, callback: callback)
             } else {
-                // Signing error occurred, probably because you didn't add Subscription Key file to Apphud.
+                callback?(nil, ApphudError.error(message: "Could not sign offer id: \(discountID), product id: \(product.productIdentifier)"))
             }
         }
     }
@@ -460,9 +464,8 @@ final class ApphudInternal {
                 }
             }
 
-            //            let error = ApphudError("Could not sign promo offer: \(discountID)")
-            
-            callback?(nil, nil)
+            let error = ApphudError.error(message: "Could not sign promo offer id: \(discountID), product id: \(productID)")
+            callback?(nil, error)
         }
     }
 

Source/ApphudScreen.swift

@@ -12,19 +12,17 @@ struct ApphudScreen {
 
     var identifier: String
     var name: String
-    var product_id: String
-    var offer_id: String?
     var terms_url: String?
     var privacy_url: String?
     var status_bar_color: String?
+    var products_offers_map : [[String : Any]]?
 
     init(dictionary: [String : Any]) {
-        product_id = dictionary["product_id"] as? String ?? ""
         name = dictionary["name"] as? String ?? ""
         identifier = dictionary["identifier"] as? String ?? ""
-        offer_id = dictionary["offer_id"] as? String ?? ""
         terms_url = dictionary["terms_url"] as? String ?? ""
         privacy_url = dictionary["privacy_url"] as? String ?? ""        
         status_bar_color = dictionary["status_bar_color"] as? String ?? ""
+        products_offers_map = dictionary["products"] as? [[String : Any]]
     }
 }