@tyrads.com/tyrads-sdk 2.0.0-beta.2 → 2.0.0

package/android/src/main/java/com/tyradssdk/TyradsSdkPackage.kt

@@ -1,21 +1,18 @@
-package com.tyradssdk
-
-import com.facebook.react.ReactPackage
-import com.facebook.react.bridge.NativeModule
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.uimanager.ViewManager
-
-
-class TyradsSdkPackage : ReactPackage {
-
-  override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
-    return listOf(TyradsSdkModule(reactContext))
-  }
-
-  override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-    return emptyList()
-  }
-  // override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-  //   return listOf(ComposeViewManager())
-  // }
-}
+package com.tyradssdk
+
+import com.facebook.react.ReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.uimanager.ViewManager
+
+
+class TyradsSdkPackage : ReactPackage {
+
+  override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
+    return listOf(TyradsSdkModule(reactContext))
+  }
+
+  override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
+    return listOf(ComposeViewManager())
+  }
+}

package/ios/Tyrads/AcmoConfig.swift

@@ -1,31 +1,32 @@
-//
-//  AcmoConfig.swift
-//  TyradsSdk
-//
-//  Created by ibnShamas on 8/13/24.
-//
-
-import Foundation
-import UIKit
-
-struct AcmoConfig {
-    static let API_VERSION = "1.1"
-    static let BUILD_VERSION = "2"
-    static let SDK_VERSION = "\(API_VERSION).\(BUILD_VERSION)"
-    static let SDK_PLATFORM = "React Native"
-    static let BASE_URL = "https://api.tyrads.com/v\(API_VERSION)/"
-    static let TAG = "TyrAds SDK"
-
-    static let PRIMARY_COLOR = UIColor(red: 0/255, green: 36/255, blue: 51/255, alpha: 1)
-    static let PRIMARY_COLOR_LIGHT = UIColor(red: 153/255, green: 145/255, blue: 145/255, alpha: 1)
-    static let PRIMARY_COLOR_DARK = UIColor.black
-
-    static let SECONDARY_COLOR = UIColor(red: 44/255, green: 179/255, blue: 136/255, alpha: 1)
-    static let SECONDARY_COLOR_LIGHT = UIColor(red: 203/255, green: 235/255, blue: 207/255, alpha: 1)
-    static let SIDEBAR_BACKGROUND_COLOR_LIGHT = UIColor(white: 1, alpha: 0.54)
-    static let SIDEBAR_BACKGROUND_COLOR_DARK = UIColor(red: 17/255, green: 45/255, blue: 30/255, alpha: 1)
-    static let APPBAR_BG = UIColor(red: 0/255, green: 33/255, blue: 48/255, alpha: 1)
-
-    // Note: ThemeMode.light doesn't have a direct equivalent in iOS
-    // You would typically handle this in your app's theme configuration
-}
+//
+//  AcmoConfig.swift
+//  TyradsSdk
+//
+//  Created by ibnShamas on 8/13/24.
+//
+
+import Foundation
+import UIKit
+
+struct AcmoConfig {
+    static let API_VERSION = "2.0"
+    static let BUILD_VERSION = "1"
+    static let ACMO_VERSION = "3"
+    static let SDK_VERSION = "\(API_VERSION).\(BUILD_VERSION)"
+    static let SDK_PLATFORM = "React Native"
+    static let BASE_URL = "https://api.tyrads.com/v\(API_VERSION)/"
+    static let TAG = "TyrAds SDK"
+
+    static let PRIMARY_COLOR = UIColor(red: 0/255, green: 36/255, blue: 51/255, alpha: 1)
+    static let PRIMARY_COLOR_LIGHT = UIColor(red: 153/255, green: 145/255, blue: 145/255, alpha: 1)
+    static let PRIMARY_COLOR_DARK = UIColor.black
+
+    static let SECONDARY_COLOR = UIColor(red: 44/255, green: 179/255, blue: 136/255, alpha: 1)
+    static let SECONDARY_COLOR_LIGHT = UIColor(red: 203/255, green: 235/255, blue: 207/255, alpha: 1)
+    static let SIDEBAR_BACKGROUND_COLOR_LIGHT = UIColor(white: 1, alpha: 0.54)
+    static let SIDEBAR_BACKGROUND_COLOR_DARK = UIColor(red: 17/255, green: 45/255, blue: 30/255, alpha: 1)
+    static let APPBAR_BG = UIColor(red: 0/255, green: 33/255, blue: 48/255, alpha: 1)
+
+    // Note: ThemeMode.light doesn't have a direct equivalent in iOS
+    // You would typically handle this in your app's theme configuration
+}

package/ios/Tyrads/ApiHeaders.swift

@@ -0,0 +1,12 @@
+public struct ApiHeaders {
+    let xApiKey: String
+    let xApiSecret: String
+    let xUserId: String
+    let xSdkPlatform: String?
+    let xSdkVersion: String?
+    let userAgent: String
+    let languageCode: String
+    let premiumColor: String
+    let headerColor: String
+    let mainColor: String
+}

package/ios/Tyrads/InitModel.swift

@@ -1,46 +1,48 @@
-//
-//  InitModel.swift
-//  TyradsSdk
-//
-//  Created by ibnShamas on 8/13/24.
-//
-
-import Foundation
-
-struct AcmoInitModel: Codable {
-    let data: Data
-}
-
-struct Data: Codable {
-    let newRegisteredUser: Bool
-    let user: User
-    let publisherApp: PublisherApp
-    
-    enum CodingKeys: String, CodingKey {
-        case newRegisteredUser = "newRegisteredUser"
-        case user
-        case publisherApp
-    }
-    
-    init(from decoder: Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        newRegisteredUser = try container.decodeIfPresent(Bool.self, forKey: .newRegisteredUser) ?? false
-        user = try container.decode(User.self, forKey: .user)
-        publisherApp = try container.decode(PublisherApp.self, forKey: .publisherApp)
-    }
-}
-
-struct User: Codable {
-    let publisherUserId: String
-}
-
-struct PublisherApp: Codable {
-    let headerColor: String
-    let mainColor: String
-    
-    init(from decoder: Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        headerColor = try container.decodeIfPresent(String.self, forKey: .headerColor) ?? ""
-        mainColor = try container.decodeIfPresent(String.self, forKey: .mainColor) ?? ""
-    }
-}
+//
+//  InitModel.swift
+//  TyradsSdk
+//
+//  Created by ibnShamas on 8/13/24.
+//
+
+import Foundation
+
+struct AcmoInitModel: Codable {
+    let data: Data
+}
+
+struct Data: Codable {
+    let newRegisteredUser: Bool
+    let user: User
+    let publisherApp: PublisherApp
+    
+    enum CodingKeys: String, CodingKey {
+        case newRegisteredUser = "newRegisteredUser"
+        case user
+        case publisherApp
+    }
+    
+    init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        newRegisteredUser = try container.decodeIfPresent(Bool.self, forKey: .newRegisteredUser) ?? false
+        user = try container.decode(User.self, forKey: .user)
+        publisherApp = try container.decode(PublisherApp.self, forKey: .publisherApp)
+    }
+}
+
+struct User: Codable {
+    let publisherUserId: String
+}
+
+struct PublisherApp: Codable {
+    let headerColor: String
+    let mainColor: String
+  let premiumColor: String
+    
+    init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        headerColor = try container.decodeIfPresent(String.self, forKey: .headerColor) ?? ""
+        mainColor = try container.decodeIfPresent(String.self, forKey: .mainColor) ?? ""
+      premiumColor = try container.decodeIfPresent(String.self, forKey: .premiumColor) ?? ""
+    }
+}

package/ios/Tyrads/Tyrads.swift

@@ -1,176 +1,199 @@
-import Foundation
-import UIKit
-import AppTrackingTransparency
-import AdSupport
-import WebKit
-
-
-
-/// The TyradsSdk class provides methods for configuring the SDK and displaying offers.
-public class Tyrads {
-    /// Shared instance of the TyradsSdk.
-    public static let instance = Tyrads()
-
-    private var apiKey: String = ""
-    private var apiSecret: String = ""
-    private var publisherUserID: String = ""
-    private var newUser: Bool = false
-    private var loginData: AcmoInitModel?
-    var initializationWait = DispatchSemaphore(value: 0)
-    private var debugMode: Bool = false
-
-    private func log(_ message: String) {
-        if debugMode {
-            NSLog(message)
-        }
-    }
-
-    /// Configures the Tyrads SDK with the provided API key and secret key.
-    ///
-    /// - Parameters:
-    ///   - apiKey: The API key provided by Tyrads.
-    ///   - secretKey: The secret key provided by Tyrads.
-    @objc public func configure( apiKey: String, secretKey: String, debugMode: Bool = false) {
-        self.apiKey = apiKey
-        self.apiSecret = secretKey
-        self.debugMode = debugMode
-    }
-
-    /// Logs in the user with the provided user ID or retrieves the user ID from UserDefaults.
-    ///
-    /// - Parameter userID: Optional. The user ID to log in with. If nil, the SDK will attempt to retrieve the user ID from UserDefaults.
-    @objc public func loginUser(_ userID: String? = nil) {
-        do {
-            let userId = userID ?? UserDefaults.standard.string(forKey: "acmo-tyrads-sdk-user-id") ?? ""
-
-            let identifierType = "IDFA"
-            var advertisingId = ""
-            if #available(iOS 14, *) {
-                log("Requesting tracking authorization for iOS 14+")
-                ATTrackingManager.requestTrackingAuthorization { status in
-                    switch status {
-                    case .authorized:
-                        advertisingId = ASIdentifierManager.shared().advertisingIdentifier.uuidString
-                        self.log("Tracking authorized. Advertising ID: \(advertisingId)")
-                    case .denied:
-                        advertisingId = ""
-                        self.log("Tracking denied")
-                    case .restricted:
-                        advertisingId = ""
-                        self.log("Tracking restricted")
-                    case .notDetermined:
-                        advertisingId = ""
-                        self.log("Tracking not determined")
-                    @unknown default:
-                        self.log("Unknown tracking status")
-                    }
-                }
-            } else {
-                advertisingId = ASIdentifierManager.shared().advertisingIdentifier.uuidString
-                log("iOS version < 14. Advertising ID: \(advertisingId)")
-            }
-            let fd: [String: Any] = [
-                "publisherUserId": userId,
-                "platform": "iOS",
-                "identifierType": identifierType,
-                "identifier": advertisingId
-            ]
-
-            log("Initializing with data: \(fd)")
-
-            guard let url = URL(string: AcmoConfig.BASE_URL + "initialize") else {
-                log("Failed to create URL")
-                return
-            }
-
-            var request = URLRequest(url: url)
-            request.httpMethod = "POST"
-            request.setValue(AcmoConfig.SDK_PLATFORM, forHTTPHeaderField: "X-SDK-Platform")
-            request.setValue(AcmoConfig.SDK_VERSION, forHTTPHeaderField: "X-SDK-Version")
-            request.setValue("application/json", forHTTPHeaderField: "Content-Type")
-            request.setValue(self.apiKey, forHTTPHeaderField: "X-API-Key")
-            request.setValue(self.apiSecret, forHTTPHeaderField: "X-API-Secret")
-
-            do {
-                request.httpBody = try JSONSerialization.data(withJSONObject: fd)
-            } catch {
-                log("Failed to serialize request body: \(error)")
-                return
-            }
-
-            let task = URLSession.shared.dataTask(with: request) { data, response, error in
-
-            if let error = error {
-                self.log("Network request failed: \(error)")
-                return
-            }
-
-            guard let data = data else {
-                self.log("No data received from the server")
-                return
-            }
-
-            if let responseString = String(data: data, encoding: .utf8) {
-                self.log("Received response: \(responseString)")
-
-                let jsonData = responseString.data(using: .utf8)!
-                let decoder = JSONDecoder()
-                guard let acmoInitModel = try? decoder.decode(AcmoInitModel.self, from: jsonData) else {
-                    self.log("Failed to decode response")
-                    return
-                }
-                self.loginData = acmoInitModel
-                self.publisherUserID = self.loginData?.data.user.publisherUserId ?? ""
-                self.newUser = self.loginData?.data.newRegisteredUser ?? false
-                self.log("Login successful. Publisher User ID: \(self.publisherUserID), New User: \(self.newUser)")
-                self.initializationWait.signal()
-            }
-
-
-            }
-
-            task.resume()
-            log("Network request started")
-
-
-        } catch {
-            log("An error occurred: \(error)")
-        }
-    }
-
-
-
-
-     public func showOffers(_ launchMode: Int = 3, route: String? = nil, campaignID: Int? = nil) {
-        self.initializationWait.wait()
-        var urlString =
-        "https://websdk.tyrads.com/?apiKey=\(Tyrads.instance.apiKey)&apiSecret=\(Tyrads.instance.apiSecret)&userID=\(Tyrads.instance.publisherUserID)&newUser=\(Tyrads.instance.newUser)&platform=\(AcmoConfig.SDK_PLATFORM)&hc=\(Tyrads.instance.loginData?.data.publisherApp.headerColor ?? "")&mc=\(Tyrads.instance.loginData?.data.publisherApp.mainColor ?? "")&launchMode=\(launchMode)&route=\(route ?? "")&campaignID=\(campaignID)"
-
-
-        if let url = URL(string: urlString) {
-            switch launchMode {
-            case 1, 2:
-                DispatchQueue.main.async {
-                    let webView = WKWebView(frame: UIScreen.main.bounds)
-                    webView.load(URLRequest(url: url))
-
-                    let viewController = UIViewController()
-                    viewController.view = webView
-                    viewController.modalPresentationStyle = .fullScreen // Add this line to set the presentation style
-
-                    if let rootViewController = UIApplication.shared.windows.first?.rootViewController {
-                        rootViewController.present(viewController, animated: true, completion: nil)
-                    }
-                }
-            case 3:
-                DispatchQueue.main.async {
-                    UIApplication.shared.open(url, options: [:], completionHandler: nil)
-                }
-            default:
-                DispatchQueue.main.async {
-                    UIApplication.shared.open(url, options: [:], completionHandler: nil)
-                }
-            }
-        }
-    }
-}
+import Foundation
+import UIKit
+import AppTrackingTransparency
+import AdSupport
+import WebKit
+
+
+
+/// The TyradsSdk class provides methods for configuring the SDK and displaying offers.
+public class Tyrads {
+    /// Shared instance of the TyradsSdk.
+    public static let instance = Tyrads()
+
+    private var apiKey: String = ""
+    private var apiSecret: String = ""
+    private var publisherUserID: String = ""
+    private var currentLanguage: String = "en"
+    private var newUser: Bool = false
+    private var loginData: AcmoInitModel?
+    var initializationWait = DispatchSemaphore(value: 0)
+    private var debugMode: Bool = false
+
+    private func log(_ message: String) {
+        if debugMode {
+            NSLog(message)
+        }
+    }
+
+    /// Configures the Tyrads SDK with the provided API key and secret key.
+    ///
+    /// - Parameters:
+    ///   - apiKey: The API key provided by Tyrads.
+    ///   - secretKey: The secret key provided by Tyrads.
+    @objc public func configure( apiKey: String, secretKey: String, debugMode: Bool = false) {
+        self.apiKey = apiKey
+        self.apiSecret = secretKey
+        self.debugMode = debugMode
+        self.currentLanguage = Locale.current.languageCode ?? ""
+    }
+
+    /// Logs in the user with the provided user ID or retrieves the user ID from UserDefaults.
+    ///
+    /// - Parameter userID: Optional. The user ID to log in with. If nil, the SDK will attempt to retrieve the user ID from UserDefaults.
+    public func loginUser(_ userID: String? = nil, completion: @escaping (ApiHeaders?) -> Void) {
+        let userId = userID ?? UserDefaults.standard.string(forKey: "acmo-tyrads-sdk-user-id") ?? ""
+
+        let identifierType = "IDFA"
+        var advertisingId = ""
+
+        func finalizeLogin() {
+            let fd: [String: Any] = [
+                "publisherUserId": userId,
+                "platform": "iOS",
+                "identifierType": identifierType,
+                "identifier": advertisingId
+            ]
+
+            self.log("Initializing with data: \(fd)")
+
+            guard let url = URL(string: AcmoConfig.BASE_URL + "initialize") else {
+                self.log("Failed to create URL")
+                completion(nil)
+                return
+            }
+
+            var request = URLRequest(url: url)
+            request.httpMethod = "POST"
+            request.setValue(AcmoConfig.SDK_PLATFORM, forHTTPHeaderField: "X-SDK-Platform")
+            request.setValue(AcmoConfig.SDK_VERSION, forHTTPHeaderField: "X-SDK-Version")
+            request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+            request.setValue(self.apiKey, forHTTPHeaderField: "X-API-Key")
+            request.setValue(self.apiSecret, forHTTPHeaderField: "X-API-Secret")
+
+            do {
+                request.httpBody = try JSONSerialization.data(withJSONObject: fd)
+            } catch {
+                self.log("Failed to serialize request body: \(error)")
+                completion(nil)
+                return
+            }
+
+            let task = URLSession.shared.dataTask(with: request) { data, response, error in
+                if let error = error {
+                    self.log("Network request failed: \(error)")
+                    completion(nil)
+                    return
+                }
+
+                guard let data = data else {
+                    self.log("No data received from the server")
+                    completion(nil)
+                    return
+                }
+
+                if let responseString = String(data: data, encoding: .utf8) {
+                    self.log("Received response: \(responseString)")
+
+                    guard let jsonData = responseString.data(using: .utf8),
+                          let acmoInitModel = try? JSONDecoder().decode(AcmoInitModel.self, from: jsonData) else {
+                        self.log("Failed to decode response")
+                        completion(nil)
+                        return
+                    }
+
+                    self.loginData = acmoInitModel
+                    self.publisherUserID = acmoInitModel.data.user.publisherUserId
+                    self.newUser = acmoInitModel.data.newRegisteredUser
+                    self.log("Login successful. Publisher User ID: \(self.publisherUserID), New User: \(self.newUser)")
+                    self.initializationWait.signal()
+
+                    // Build ApiHeaders object
+                    let headers = ApiHeaders(
+                        xApiKey: self.apiKey,
+                        xApiSecret: self.apiSecret,
+                        xUserId: self.publisherUserID,
+                        xSdkPlatform: AcmoConfig.SDK_PLATFORM,
+                        xSdkVersion: AcmoConfig.SDK_VERSION,
+                        userAgent: UIDevice.current.systemName + "/" + UIDevice.current.systemVersion,
+                        languageCode: Locale.current.languageCode ?? "en",
+                        premiumColor: acmoInitModel.data.publisherApp.premiumColor,
+                        headerColor: acmoInitModel.data.publisherApp.headerColor,
+                        mainColor: acmoInitModel.data.publisherApp.mainColor
+                    )
+
+                    completion(headers)
+                }
+            }
+
+            task.resume()
+            self.log("Network request started")
+        }
+
+        if #available(iOS 14, *) {
+            self.log("Requesting tracking authorization for iOS 14+")
+            ATTrackingManager.requestTrackingAuthorization { status in
+                switch status {
+                case .authorized:
+                    advertisingId = ASIdentifierManager.shared().advertisingIdentifier.uuidString
+                    self.log("Tracking authorized. Advertising ID: \(advertisingId)")
+                case .denied, .restricted, .notDetermined:
+                    advertisingId = ""
+                    self.log("Tracking not authorized or restricted")
+                @unknown default:
+                    self.log("Unknown tracking status")
+                }
+                finalizeLogin()
+            }
+        } else {
+            advertisingId = ASIdentifierManager.shared().advertisingIdentifier.uuidString
+            self.log("iOS version < 14. Advertising ID: \(advertisingId)")
+            finalizeLogin()
+        }
+    }
+
+
+
+
+     public func showOffers(_ launchMode: Int = 3, route: String? = nil, campaignID: Int? = nil) {
+        self.initializationWait.wait()
+        var campaignIDString: String = "0"
+        if let campaignIDValue = campaignID {
+            campaignIDString = String(campaignIDValue)
+        }
+       let urlString =
+       "https://websdk.tyrads.com/?apiKey=\(Tyrads.instance.apiKey)&apiSecret=\(Tyrads.instance.apiSecret)&userID=\(Tyrads.instance.publisherUserID)&newUser=\(Tyrads.instance.newUser)&platform=\(AcmoConfig.SDK_PLATFORM)&hc=\(Tyrads.instance.loginData?.data.publisherApp.headerColor ?? "")&mc=\(Tyrads.instance.loginData?.data.publisherApp.mainColor ?? "")&launchMode=\(launchMode)&route=\(route ?? "")&campaignID=\(campaignIDString)&lang=\(Tyrads.instance.currentLanguage)&av=\(AcmoConfig.ACMO_VERSION)"
+
+        do {
+            guard let url = URL(string: urlString) else {
+                throw NSError(domain: "TyradsSdk", code: 1, userInfo: [NSLocalizedDescriptionKey: "Invalid URL"])
+            }
+
+            switch launchMode {
+            case 1, 2:
+                DispatchQueue.main.async {
+                    let webView = WKWebView(frame: UIScreen.main.bounds)
+                    webView.load(URLRequest(url: url))
+
+                    let viewController = UIViewController()
+                    viewController.view = webView
+                    viewController.modalPresentationStyle = .fullScreen // Add this line to set the presentation style
+
+                    if let rootViewController = UIApplication.shared.windows.first?.rootViewController {
+                        rootViewController.present(viewController, animated: true, completion: nil)
+                    }
+                }
+            case 3:
+                DispatchQueue.main.async {
+                    UIApplication.shared.open(url, options: [:], completionHandler: nil)
+                }
+            default:
+                DispatchQueue.main.async {
+                    UIApplication.shared.open(url, options: [:], completionHandler: nil)
+                }
+            }
+        } catch {
+            print("An error occurred: \(error)")
+        }
+    }
+}

package/ios/TyradsSdk-Bridging-Header.h

@@ -1,2 +1,2 @@
-#import <React/RCTBridgeModule.h>
-#import <React/RCTViewManager.h>
+#import <React/RCTBridgeModule.h>
+#import <React/RCTViewManager.h>

package/ios/TyradsSdk.mm

@@ -1,11 +1,14 @@
-#import <React/RCTBridgeModule.h>
-
-@interface RCT_EXTERN_MODULE(TyradsSdk, NSObject)
-
-RCT_EXTERN_METHOD(init:(NSString *)apiKey secretKey:(NSString *)secretKey)
-RCT_EXTERN_METHOD(loginUser:(NSString *)userId)
-RCT_EXTERN_METHOD(showOffers:(NSInteger)launchMode
-                  route:(NSString)route
-                  campaignID:(NSInteger)campaignID)
-
-@end
+#import <React/RCTBridgeModule.h>
+
+@interface RCT_EXTERN_MODULE(TyradsSdk, NSObject)
+
+RCT_EXTERN_METHOD(init:(NSString *)apiKey secretKey:(NSString *)secretKey)
+// RCT_EXTERN_METHOD(loginUser:(NSString *)userId)
+RCT_EXTERN_METHOD(loginUser:(NSString *)userId
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(showOffers:(NSInteger)launchMode
+                  route:(NSString)route
+                  campaignID:(NSInteger)campaignID)
+
+@end