react-native-nami-sdk 2.0.4 → 3.0.8

package/android/src/main/java/com/nami/reactlibrary/NamiPurchaseManagerBridge.kt

@@ -1,22 +1,16 @@
 package com.nami.reactlibrary
 
 import android.util.Log
-import com.facebook.react.bridge.Callback
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.ReactContextBaseJavaModule
-import com.facebook.react.bridge.ReactMethod
-import com.facebook.react.bridge.ReadableArray
-import com.facebook.react.bridge.ReadableType
-import com.facebook.react.bridge.WritableArray
-import com.facebook.react.bridge.WritableNativeArray
-import com.facebook.react.bridge.WritableNativeMap
+import com.facebook.react.bridge.*
+import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.namiml.billing.NamiPurchaseManager
+import com.namiml.paywall.NamiPaywallManager
 
 class NamiPurchaseManagerBridgeModule(reactContext: ReactApplicationContext) :
     ReactContextBaseJavaModule(reactContext) {
 
     override fun getName(): String {
-        return "NamiPurchaseManagerBridge"
+        return "RNNamiPurchaseManager"
     }
 
     @ReactMethod
@@ -26,26 +20,6 @@ class NamiPurchaseManagerBridgeModule(reactContext: ReactApplicationContext) :
         }
     }
 
-    @ReactMethod
-    fun buySKU(skuPlatformID: String, developerPaywallID: String, resultsCallback: Callback) {
-        reactApplicationContext.runOnUiQueueThread {
-            currentActivity?.let {
-                NamiPurchaseManager.buySKU(it, skuPlatformID) {
-
-                    val result: Boolean
-                    if (NamiPurchaseManager.isSKUIDPurchased(skuPlatformID)) {
-                        result = true
-                        Log.i(LOG_TAG, "Purchase complete, result is PURCHASED.")
-                    } else {
-                        result = false
-                        Log.i(LOG_TAG, "Purchase complete, product not purchased.")
-                    }
-                    resultsCallback.invoke(result)
-                }
-            }
-        }
-    }
-
     @ReactMethod
     fun purchases(resultsCallback: Callback) {
         reactApplicationContext.runOnUiQueueThread {
@@ -63,22 +37,20 @@ class NamiPurchaseManagerBridgeModule(reactContext: ReactApplicationContext) :
     }
 
     @ReactMethod
-    fun isSKUIDPurchased(skuID: String, resultsCallback: Callback) {
-        reactApplicationContext.runOnUiQueueThread {
-            val isPurchased = NamiPurchaseManager.isSKUIDPurchased(skuID)
-            resultsCallback.invoke(isPurchased)
-        }
+    fun skuPurchased(skuID: String, promise: Promise) {
+        val isPurchased = NamiPurchaseManager.isSKUIDPurchased(skuID)
+        promise.resolve(isPurchased)
     }
 
     @ReactMethod
-    fun consumePurchasedSKU(skuRefId: String) {
+    fun consumePurchasedSku(skuRefId: String) {
         reactApplicationContext.runOnUiQueueThread {
             NamiPurchaseManager.consumePurchasedSKU(skuRefId)
         }
     }
 
     @ReactMethod
-    fun anySKUIDPurchased(skuIDs: ReadableArray, resultsCallback: Callback) {
+    fun anySkuPurchased(skuIDs: ReadableArray, promise: Promise) {
         reactApplicationContext.runOnUiQueueThread {
             val checkArray: MutableList<String> = mutableListOf()
             for (x in 0 until skuIDs.size()) {
@@ -92,7 +64,7 @@ class NamiPurchaseManagerBridgeModule(reactContext: ReactApplicationContext) :
 
             val anyPurchased = NamiPurchaseManager.anySKUIDPurchased(checkArray)
 
-            resultsCallback.invoke(anyPurchased)
+            promise.resolve(anyPurchased)
         }
     }
 
@@ -109,4 +81,30 @@ class NamiPurchaseManagerBridgeModule(reactContext: ReactApplicationContext) :
         }
         resultsCallback.invoke(resultMap)
     }
-}
+
+    @ReactMethod
+    fun registerPurchasesChangedHandler() {
+        NamiPurchaseManager.registerPurchasesChangedHandler{purchases, purchaseState, error ->
+            run {
+                val resultPurchases: WritableArray = WritableNativeArray()
+
+                for (purchase in purchases) {
+                    resultPurchases.pushMap(purchase.toPurchaseDict())
+                }
+
+                val stateString = purchaseState.toString()
+
+                val payload = Arguments.createMap()
+                payload.putArray("purchases", resultPurchases)
+                payload.putString("purchaseState", stateString)
+                payload.putString("error", error)
+
+                reactApplicationContext
+                        .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+                        .emit("PurchasesChanged", payload)
+
+
+            }
+        }
+    }
+}

package/android/src/main/java/com/nami/reactlibrary/NamiUtil.kt

@@ -14,8 +14,6 @@ import com.namiml.paywall.NamiLocaleConfig
 import com.namiml.paywall.NamiPaywall
 import com.namiml.paywall.NamiPurchaseSource
 import com.namiml.paywall.NamiSKU
-import com.namiml.paywall.PaywallDisplayOptions
-import com.namiml.paywall.PaywallStyleData
 import com.namiml.paywall.SubscriptionPeriod
 import com.namiml.util.extensions.getFormattedPrice
 import com.namiml.util.extensions.getSubscriptionPeriodEnum
@@ -25,125 +23,6 @@ import java.util.Date
 import java.util.Locale
 import java.util.TimeZone
 
-fun NamiPaywall.toNamiPaywallDict(): WritableMap {
-
-    val paywallMap: WritableMap = Arguments.createMap()
-
-    val marketingContentMap = Arguments.createMap()
-    marketingContentMap.putString("title", title.orEmpty())
-    marketingContentMap.putString("body", body.orEmpty())
-
-    val extraDataMap = extraData
-    if (extraDataMap != null) {
-        marketingContentMap.putMap("extra_data", extraDataMap.toWritableMap())
-    }
-
-    paywallMap.putMap("marketing_content", marketingContentMap)
-
-    Log.i(LOG_TAG, "extraData items are $extraDataMap")
-    paywallMap.putString("id", id)
-    paywallMap.putMap("backgrounds", Arguments.createMap().apply {
-        putString("phone", backgroundImageUrlPhone.orEmpty())
-        putString("tablet", backgroundImageUrlTablet.orEmpty())
-    })
-    paywallMap.putString("purchase_terms", purchaseTerms.orEmpty())
-    paywallMap.putString("name", name.orEmpty())
-    paywallMap.putString("paywall_type", type)
-    paywallMap.putMap("locale_config", localeConfig.toDict())
-    paywallMap.putMap("legal_citations", legalCitations?.toDict())
-    paywallMap.putMap("display_options", displayOptions.toDict())
-    paywallMap.putString("developer_paywall_id", developerPaywallId.orEmpty())
-    styleData?.let {
-        paywallMap.putMap("styleData", it.toPaywallStylingDict())
-    }
-    return paywallMap
-}
-
-private fun NamiLocaleConfig.toDict(): WritableMap {
-    return Arguments.createMap().apply {
-        putString("close_button_text", closeButtonText)
-        putString("sign_in_button_text", signInButtonText)
-        putString("restore_purchase_button_text", restorePurchaseButtonText)
-        putString("purchase_button_hint_text_to_speech", purchaseButtonHintTextToSpeech)
-        putString("purchase_terms_prefix_hint_text_to_speech", purchaseTermsPrefixHintTextToSpeech)
-    }
-}
-
-private fun PaywallDisplayOptions.toDict(): WritableMap {
-    return Arguments.createMap().apply {
-        putBoolean("allow_closing", allowClosing)
-        putBoolean("restore_control", restoreControl)
-        putBoolean("sign_in_control", signInControl)
-        putString("scrollable_region_size", scrollableRegionSize)
-        putBoolean("show_nami_purchase_success_message", shouldShowNamiPurchaseSuccessMessage)
-        putBoolean("skus_in_scrollable_region", showSkusInScrollableRegion)
-        putBoolean("use_bottom_overlay", useBottomOverlay)
-    }
-}
-
-private fun LegalCitations.toDict(): WritableMap {
-    return Arguments.createMap().apply {
-        putString("id", id)
-        putString("privacy_url", privacyUrl)
-        putString("privacy_text", privacyText)
-        putString("tos_url", tosUrl)
-        putString("tos_text", tosText)
-        putString("clickwrap_text", clickWrapText)
-        putString("language", language)
-    }
-}
-
-fun PaywallStyleData.toPaywallStylingDict(): WritableMap {
-
-    val styleMap: WritableMap = Arguments.createMap()
-    styleMap.putString("backgroundColor", backgroundColor)
-
-    styleMap.putDouble("bodyFontSize", bodyFontSize.toDouble())
-    styleMap.putString("bodyTextColor", bodyTextColor)
-    styleMap.putString("bodyShadowColor", bodyShadowColor)
-    styleMap.putDouble("bodyShadowRadius", bodyShadowRadius.toDouble())
-
-    styleMap.putDouble("titleFontSize", titleFontSize.toDouble())
-    styleMap.putString("titleTextColor", titleTextColor)
-    styleMap.putString("titleShadowColor", titleShadowColor)
-    styleMap.putDouble("titleShadowRadius", titleShadowRadius.toDouble())
-
-    styleMap.putDouble("closeButtonFontSize", closeButtonFontSize.toDouble())
-    styleMap.putString("closeButtonTextColor", closeButtonTextColor)
-    styleMap.putString("closeButtonShadowColor", closeButtonShadowColor)
-    styleMap.putDouble("closeButtonShadowRadius", closeButtonShadowRadius.toDouble())
-
-    styleMap.putString("bottomOverlayColor", bottomOverlayColor)
-    styleMap.putDouble("bottomOverlayCornerRadius", bottomOverlayCornerRadius.toDouble())
-
-    styleMap.putString("skuButtonColor", skuButtonColor)
-    styleMap.putString("skuButtonTextColor", skuButtonTextColor)
-    styleMap.putString("skuSubDisplayTextColor", skuSubDisplayTextColor)
-    styleMap.putString("skuSubDisplayTextShadowColor", skuSubDisplayTextShadowColor)
-    styleMap.putDouble("skuSubDisplayTextShadowRadius", skuSubDisplayTextShadowRadius.toDouble())
-
-    styleMap.putString("featuredSkusButtonColor", featuredSkuButtonColor)
-    styleMap.putString("featuredSkusButtonTextColor", featuredSkuButtonTextColor)
-
-    styleMap.putDouble("signinButtonFontSize", signInButtonFontSize.toDouble())
-    styleMap.putString("signinButtonTextColor", signInButtonTextColor)
-    styleMap.putString("signinButtonShadowColor", signInButtonShadowColor)
-    styleMap.putDouble("signinButtonShadowRadius", signInButtonShadowRadius.toDouble())
-
-    styleMap.putDouble("restoreButtonFontSize", restoreButtonFontSize.toDouble())
-    styleMap.putString("restoreButtonTextColor", restoreButtonTextColor)
-    styleMap.putString("restoreButtonShadowColor", restoreButtonShadowColor)
-    styleMap.putDouble("restoreButtonShadowRadius", restoreButtonShadowRadius.toDouble())
-
-    styleMap.putDouble("purchaseTermsFontSize", purchaseTermsFontSize.toDouble())
-    styleMap.putString("purchaseTermsTextColor", purchaseTermsTextColor)
-    styleMap.putString("purchaseTermsShadowColor", purchaseTermsShadowColor)
-    styleMap.putDouble("purchaseTermsShadowRadius", purchaseTermsShadowRadius.toDouble())
-
-    styleMap.putString("termsLinkColor", termsLinkColor)
-
-    return styleMap
-}
 
 fun List<*>.toWritableArray(): WritableArray {
     val convertedArray = Arguments.createArray()
@@ -206,44 +85,44 @@ fun NamiSKU.toSkuDict(): WritableMap {
     val productDict = Arguments.createMap()
 
     productDict.putString("skuIdentifier", skuId)
-    productDict.putString("localizedTitle", skuDetails.title)
-    productDict.putString("localizedDescription", skuDetails.description)
-    productDict.putString("localizedPrice", skuDetails.price)
-    productDict.putString("localizedMultipliedPrice", skuDetails.price)
+//    productDict.putString("localizedTitle", skuDetails.title)
+//    productDict.putString("localizedDescription", skuDetails.description)
+//    productDict.putString("localizedPrice", skuDetails.price)
+//    productDict.putString("localizedMultipliedPrice", skuDetails.price)
     productDict.putBoolean("featured", featured)
-    productDict.putString("displayText", displayText)
-    productDict.putString("displaySubText", displaySubText)
-    productDict.putString("price", skuDetails.getFormattedPrice().toString())
+//    productDict.putString("displayText", displayText)
+//    productDict.putString("displaySubText", displaySubText)
+//    productDict.putString("price", skuDetails.getFormattedPrice().toString())
     productDict.putString("priceLanguage", Locale.getDefault().language)
     productDict.putString("priceCountry", Locale.getDefault().country)
-    productDict.putString("priceCurrency", skuDetails.priceCurrencyCode)
+//    productDict.putString("priceCurrency", skuDetails.priceCurrencyCode)
     productDict.putString("numberOfUnits", "1")
-    val subscriptionPeriod = when (skuDetails.getSubscriptionPeriodEnum()) {
-        SubscriptionPeriod.MONTHLY -> {
-            "month"
-        }
-        SubscriptionPeriod.HALF_YEAR -> {
-            "half_year"
-        }
-        SubscriptionPeriod.WEEKLY -> {
-            "week"
-        }
-        SubscriptionPeriod.QUARTERLY -> {
-            "quarter"
-        }
-        SubscriptionPeriod.ANNUAL -> {
-            "year"
-        }
-        SubscriptionPeriod.FOUR_WEEKS -> {
-            "four_weeks"
-        }
-        else -> {
-            null
-        }
-    }
-    if (subscriptionPeriod != null) {
-        productDict.putString("periodUnit", subscriptionPeriod)
-    }
+//    val subscriptionPeriod = when (skuDetails.getSubscriptionPeriodEnum()) {
+//        SubscriptionPeriod.MONTHLY -> {
+//            "month"
+//        }
+//        SubscriptionPeriod.HALF_YEAR -> {
+//            "half_year"
+//        }
+//        SubscriptionPeriod.WEEKLY -> {
+//            "week"
+//        }
+//        SubscriptionPeriod.QUARTERLY -> {
+//            "quarter"
+//        }
+//        SubscriptionPeriod.ANNUAL -> {
+//            "year"
+//        }
+//        SubscriptionPeriod.FOUR_WEEKS -> {
+//            "four_weeks"
+//        }
+//        else -> {
+//            null
+//        }
+//    }
+//    if (subscriptionPeriod != null) {
+//        productDict.putString("periodUnit", subscriptionPeriod)
+//    }
 
     return productDict
 }
@@ -252,32 +131,23 @@ fun NamiSKU.toSkuDict(): WritableMap {
 fun NamiPurchase.toPurchaseDict(): WritableMap {
     val purchaseMap = WritableNativeMap()
 
-    val purchaseSource = when (purchaseSource) {
-        NamiPurchaseSource.NAMI_PAYWALL -> {
-            "nami_rules"
-        }
-        NamiPurchaseSource.APPLICATION -> {
-            "user"
-        }
-        else -> {
-            "unknown"
-        }
-    }
+    val purchaseSource = purchaseSource.toString()
     purchaseMap.putString("purchaseSource", purchaseSource)
 
+    val skuDict = namiSku?.toSkuDict()
+    purchaseMap.putMap("sku", skuDict)
+
     purchaseMap.putString("transactionIdentifier", transactionIdentifier.orEmpty())
-    purchaseMap.putString("skuIdentifier", skuId)
+    purchaseMap.putString("skuId", skuId)
 
     expires?.let {
-        purchaseMap.putString("subscriptionExpirationDate", it.toJavascriptDate())
+        purchaseMap.putString("expires", it.toJavascriptDate())
+    }
+    val initiatedTimestamp = purchaseInitiatedTimestamp
+    val purchaseInitiatedDate = Date(initiatedTimestamp)
+    purchaseInitiatedDate.let {
+        purchaseMap.putString("purchaseInitiatedTimestamp", it.toJavascriptDate())
     }
-
-    // Removed, not sure why, should add back in when possible
-    //    val initiatedTimestamp = purchase.purchaseInitiatedTimestamp
-    //    val dt = Instant.ofEpochSecond(initiatedTimestamp)
-    //            .atZone(ZoneId.systemDefault())
-    //            .toLocalDateTime()
-    //    purchaseMap.putString("purchaseInitiatedTimestamp", purchase.purchaseInitiatedTimestamp ?: "")
 
     // TODO: map kotlin dictionary into arbitrary map?
     purchaseMap.putMap("platformMetadata", WritableNativeMap())
@@ -307,7 +177,7 @@ fun CustomerJourneyState?.toDict(): WritableMap {
 
 fun NamiEntitlement.toEntitlementDict(): WritableMap? {
     val resultMap: WritableMap = WritableNativeMap()
-    resultMap.putString("referenceID", referenceId)
+    resultMap.putString("referenceId", referenceId)
 
     Log.i(LOG_TAG, "Processing entitlement into Javascript Map with referenceID $referenceId")
 
@@ -316,7 +186,7 @@ fun NamiEntitlement.toEntitlementDict(): WritableMap? {
         return null
     }
 
-    resultMap.putString("namiID", namiId.orEmpty())
+    resultMap.putString("namiId", namiId.orEmpty())
     resultMap.putString("desc", desc.orEmpty())
     resultMap.putString("name", name.orEmpty())
 
@@ -330,13 +200,13 @@ fun NamiEntitlement.toEntitlementDict(): WritableMap? {
     for (sku in purchasedSKUs) {
         purchasedSKUsArray.pushMap(sku.toSkuDict())
     }
-    resultMap.putArray("purchasedSKUs", purchasedSKUsArray)
+    resultMap.putArray("purchasedSkus", purchasedSKUsArray)
 
     val relatedSKUsArray: WritableArray = WritableNativeArray()
     for (sku in relatedSKUs) {
         relatedSKUsArray.pushMap(sku.toSkuDict())
     }
-    resultMap.putArray("relatedSKUs", relatedSKUsArray)
+    resultMap.putArray("relatedSkus", relatedSKUsArray)
 
     // For react, provide the most recent active purchase and sku from the arrays
 
@@ -354,7 +224,7 @@ fun NamiEntitlement.toEntitlementDict(): WritableMap? {
 
 // Convert Java Date to ISO860 UTC date to pass to Javascript
 fun Date.toJavascriptDate(): String {
-    val df: DateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm'Z'", Locale.getDefault()).apply {
+    val df: DateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.getDefault()).apply {
         timeZone = TimeZone.getTimeZone("UTC")
     }
     return df.format(this)

package/build-utils/get_version_code.py

@@ -0,0 +1,140 @@
+#!/usr/bin/python3
+
+import sys
+import getopt
+import json
+
+from google.auth.exceptions import DefaultCredentialsError
+from google.oauth2 import service_account
+from googleapiclient import discovery, errors
+
+from pyasn1.error import SubstrateUnderrunError
+
+def printv(text):
+    if show_output:
+        print(text)
+
+def create_edit(service, package_name):
+    printv(f"Create an edit for the package {package_name}")
+    try:
+        edit_request = service.edits().insert(body={}, packageName=package_name)
+        edit_response = edit_request.execute()
+        printv(f"Created edit {edit_response} for package {package_name}")
+    except (errors.Error, errors.HttpError) as e:
+        raise(f"Error creating edit {e}")
+    else:
+        if "id" in edit_response:
+            return edit_response["id"]
+
+def delete_edit(service, package_name, edit_id):
+    printv(f"Delete an edit for the package {package_name}")
+    try:
+        delete_request = service.edits().delete(packageName=package_name, editId=edit_id)
+        delete_response = delete_request.execute()
+        printv(f"Deleted edit {delete_response} for package {package_name}")
+    except (errors.Error, errors.HttpError) as e:
+        raise(f"Error deleting edit {e}")
+
+def get_credentials_response(service_credentials_path):
+    try:
+        credentials_response = service_account.Credentials.from_service_account_file(
+    service_credentials_path)
+    except ValueError as error:
+        printv(f"401: {error}")
+        return None
+    except DefaultCredentialsError as error:
+        printv(f"401: {error}")
+        return None
+    except SubstrateUnderrunError as error:
+        printv(f"401: The service credentials are malformed")
+        return  None
+
+    if type(credentials_response) is service_account.Credentials:
+        return credentials_response
+    else:
+        printv(f"401: Unknown error with service account credentials.")
+        return None
+
+def get_track(service, package_name, edit_id, track_name):
+    request = (
+        service.edits().tracks()
+        .get(packageName=package_name, editId=edit_id, track=track_name)
+    )
+    try:
+        response = request.execute()
+    except errors.HttpError as error:
+        error_content = json.loads(error.content)
+        if "error" in error_content:
+            error = error_content["error"]
+
+            if "code" in error:
+                status_code = error["code"]
+            else:
+                status_code = 000
+
+            if "message" in error:
+                message = error["message"]
+            else:
+                message = "Unknown error"
+
+            printv(f"{status_code}: {message}")
+    else:
+        printv(f"200: API request was successful")
+        printv(response)
+        version_codes = []
+        if "releases" in response:
+            releases = response["releases"]
+            for release in releases:
+                if "versionCodes" in release:
+                    all_codes = release["versionCodes"]
+                    for code in all_codes:
+                        printv(code)
+                        if code in version_codes:
+                            pass
+                        else:
+                            version_codes.append(int(code))
+
+        printv(f"observed codes: {version_codes}")
+        new_version = max(version_codes)+1
+        print(f"{new_version}")
+        with open(".new_version_code", "w") as f:
+            f.write(
+                f"{new_version}"
+            )
+
+def get_version_code(service_credentials_path, package_name, track_name):
+    credentials = get_credentials_response(service_credentials_path)
+
+    service = discovery.build(
+        "androidpublisher", "v3", credentials=credentials, cache_discovery=False
+    )
+
+    edit_id = create_edit(service, package_name)
+    get_track(service, package_name, edit_id, track_name)
+    delete_edit(service, package_name, edit_id)
+
+if __name__ == "__main__":
+    help_message = "get_version_code.py /path/to/service_credentials.json [package_name] [track_name] <OPTIONAL: --quiet>"
+
+    if len(sys.argv) < 4:
+        print(help_message)
+        sys.exit(2)
+
+    service_credentials = sys.argv[1]
+
+    package_name = sys.argv[2]
+    track_name = sys.argv[3]
+
+    show_output = True
+
+    try:
+        opts, args = getopt.getopt(sys.argv[4:], "", ["quiet"])
+    except getopt.GetoptError:
+        print(help_message)
+        sys.exit(2)
+
+    for opt, arg in opts:
+        if opt in ("--quiet"):
+            show_output = False
+
+    get_version_code(service_credentials, package_name, track_name)

package/index.d.ts

@@ -0,0 +1,20 @@
+export { Nami, NamiConfiguration, NamiLanguageCodes } from "./src/Nami";
+export { NamiMLManager } from "./src/NamiMLManager";
+export {
+  NamiCampaignManager,
+  NamiCampaign,
+  NamiCampaignRuleType,
+  LaunchCampaignError,
+} from "./src/NamiCampaignManager";
+export {
+  NamiCustomerManager,
+  CustomerJourneyState,
+  AccountStateAction,
+} from "./src/NamiCustomerManager";
+export {
+  NamiEntitlementManager,
+  NamiEntitlement,
+} from "./src/NamiEntitlementManager";
+export { NamiPurchaseManager, NamiPurchase } from "./src/NamiPurchaseManager";
+export { NamiPaywallManager } from "./src/NamiPaywallManager";
+export { NamiSKU } from "./src/types";

package/index.js

@@ -1,6 +1,7 @@
-
-import { NativeModules } from 'react-native';
-
-const { RNNami } = NativeModules;
-
-export default RNNami;
+export { Nami } from "./src/Nami";
+export { NamiMLManager } from "./src/NamiMLManager";
+export { NamiCampaignManager } from "./src/NamiCampaignManager";
+export { NamiCustomerManager } from "./src/NamiCustomerManager";
+export { NamiEntitlementManager } from "./src/NamiEntitlementManager";
+export { NamiPurchaseManager } from "./src/NamiPurchaseManager";
+export { NamiPaywallManager } from "./src/NamiPaywallManager";