purchasekit 0.4.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1a96aa9528fbd3b75db3c4b8846925eec2ad386d3880e8eee945419394e9f33
-  data.tar.gz: 63d645c076363e6a8f8798925d5e9e988e0870938302a5c171534a3f9d4b6935
+  metadata.gz: '06259cd19ab57561d46b97026a0330fbd7d47792d84971319e2893b3adc5b8a6'
+  data.tar.gz: be841b7642f9663472c5ec047bf144b065485e91c637864afc3430016340990e
 SHA512:
-  metadata.gz: 87b85b9254ee1c59e2d65eb9f57e8f9aa851b7eea87f9576252e4679f85667036b979de0bc8ddefabe415de27125f846e71e64156ea7dc5b3a6404b006936862
-  data.tar.gz: 2a55629192a0b7aa000d3c43f6dec35c34ef0854338c3b7f6814877cbbd93dd291c504fde26caab396245bc6142c51259ec8832b03c1f735e2ff30fe78e3058a
+  metadata.gz: 317a861f889c92f94479fc1d540aa671466105b0a494566d36f8b9ec9a59df9f2b95d735eba02d456115cc7157b7a7180f420ab09df8da179a6bdd5747304931
+  data.tar.gz: d8f8de0e095619fe87839deb6cedd9b51cf9eabbd3707fcd74cb2de2df41ceea42d09c9997535a827cd66062e597b5a54f2bb670b5810ef6b5231e49e47f9b47

data/README.md

@@ -140,12 +140,23 @@ Build a paywall using the included helper. Subscribe to the Turbo Stream for rea
   <% end %>
 
   <%= paywall.submit "Subscribe" %>
+  <%= paywall.restore url: restore_purchases_path, class: "btn btn-link" %>
 <% end %>
+```
+
+### Restore purchases
+
+Apple requires apps with in-app purchases to include a "Restore purchases" button. This handles users who switch devices or reinstall the app.
 
-<%= button_to "Restore purchases", restore_purchases_path %>
+The `paywall.restore` helper renders a button that reads active subscriptions directly from StoreKit (iOS) or Play Billing (Android) via the native bridge. Pass a `url:` to automatically POST the subscription IDs to your server:
+
+```erb
+<%= paywall.restore url: restore_purchases_path, class: "btn btn-link" %>
 ```
 
-The restore link checks your server for an active subscription. Implement the endpoint in your app:
+When the user taps restore, the JS controller sends a bridge message to the native app, receives the active subscription IDs, and POSTs them as JSON to your URL. If the server responds with a redirect, the page navigates automatically.
+
+On the server, match the IDs against your stored subscriptions. The `subscription_ids` match the `subscription_id` field in PurchaseKit webhook payloads (Apple's `originalTransactionId`, Google's order ID):
 
 ```ruby
 # routes.rb
@@ -153,7 +164,9 @@ post "restore_purchases", to: "subscriptions#restore"
 
 # subscriptions_controller.rb
 def restore
-  if current_user.subscribed?
+  ids = params[:subscription_ids] || []
+
+  if ids.any? && current_user.subscriptions.where(processor_id: ids).active.any?
     redirect_to dashboard_path, notice: "Your subscription is active."
   else
     redirect_to paywall_path, alert: "No active subscription found."
@@ -161,6 +174,15 @@ def restore
 end
 ```
 
+If you need custom behavior, omit the `url:` and listen for the DOM event instead:
+
+```javascript
+document.addEventListener("purchasekit--paywall:restore", (event) => {
+  const { subscriptionIds, error } = event.detail
+  // Handle as needed
+})
+```
+
 Products are fetched from the PurchaseKit API:
 
 ```ruby

data/app/helpers/purchase_kit/paywall_helper.rb

@@ -52,7 +52,8 @@ module PurchaseKit
         data: {
           purchasekit__paywall_target: "planRadio",
           apple_store_product_id: product.apple_product_id,
-          google_store_product_id: product.google_product_id
+          google_store_product_id: product.google_product_id,
+          google_store_base_plan_id: product.google_base_plan_id
         }
       )
 
@@ -69,7 +70,8 @@ module PurchaseKit
       data = (options.delete(:data) || {}).merge(
         purchasekit__paywall_target: "price",
         apple_store_product_id: @current_product.apple_product_id,
-        google_store_product_id: @current_product.google_product_id
+        google_store_product_id: @current_product.google_product_id,
+        google_store_base_plan_id: @current_product.google_base_plan_id
       )
 
       loading_content = block ? @template.capture(&block) : "Loading..."
@@ -85,5 +87,15 @@ module PurchaseKit
       @template.submit_tag(text, disabled: true, data: data, **options)
     end
 
+    def restore(text = "Restore purchases", url: nil, **options)
+      data = (options.delete(:data) || {}).merge(
+        purchasekit__paywall_target: "restoreButton",
+        action: "purchasekit--paywall#restore"
+      )
+      data[:restore_url] = url if url
+
+      @template.content_tag(:button, text, type: "button", data: data, **options)
+    end
+
   end
 end

data/app/javascript/controllers/purchasekit/paywall_controller.js

@@ -2,7 +2,7 @@ import { BridgeComponent } from "@hotwired/hotwire-native-bridge"
 
 export default class extends BridgeComponent {
   static component = "paywall"
-  static targets = ["planRadio", "price", "submitButton", "response", "environment"]
+  static targets = ["planRadio", "price", "submitButton", "response", "environment", "restoreButton"]
 
   connect() {
     super.connect()
@@ -15,6 +15,26 @@ export default class extends BridgeComponent {
     }
   }
 
+  restore() {
+    if (this.hasRestoreButtonTarget) {
+      this.restoreButtonTarget.disabled = true
+    }
+
+    this.send("restore", {}, message => {
+      if (this.hasRestoreButtonTarget) {
+        this.restoreButtonTarget.disabled = false
+      }
+
+      const { subscriptionIds, error } = message.data
+      this.dispatch("restore", { detail: { subscriptionIds, error } })
+
+      const restoreUrl = this.hasRestoreButtonTarget && this.restoreButtonTarget.dataset.restoreUrl
+      if (!error && restoreUrl) {
+        this.#submitRestore(restoreUrl, subscriptionIds || [])
+      }
+    })
+  }
+
   responseTargetConnected(element) {
     const error = element.dataset.error
 
@@ -62,6 +82,26 @@ export default class extends BridgeComponent {
     })
   }
 
+  #submitRestore(url, subscriptionIds) {
+    const csrfToken = document.querySelector("meta[name=csrf-token]")?.content
+
+    fetch(url, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        ...(csrfToken && { "X-CSRF-Token": csrfToken })
+      },
+      body: JSON.stringify({ subscription_ids: subscriptionIds })
+    }).then(response => {
+      if (response.redirected) {
+        window.Turbo.visit(response.url)
+      }
+    }).catch(error => {
+      console.error("Restore request failed:", error)
+      alert("Something went wrong restoring purchases. Please try again.")
+    })
+  }
+
   #fallbackTimeoutId = null
 
   #fetchPrices() {
@@ -91,8 +131,8 @@ export default class extends BridgeComponent {
 
   #setPrices(prices) {
     this.priceTargets.forEach(el => {
-      const { appleStoreProductId, googleStoreProductId } = this.#productIds(el)
-      const price = prices[appleStoreProductId] || prices[googleStoreProductId]
+      const { appleStoreProductId, googleStoreProductId, googleStoreBasePlanId } = this.#productIds(el)
+      const price = prices[appleStoreProductId] || prices[googleStoreBasePlanId] || prices[googleStoreProductId]
 
       if (price) {
         el.textContent = price
@@ -105,7 +145,8 @@ export default class extends BridgeComponent {
   #productIds(element) {
     return {
       appleStoreProductId: element.dataset.appleStoreProductId,
-      googleStoreProductId: element.dataset.googleStoreProductId
+      googleStoreProductId: element.dataset.googleStoreProductId,
+      googleStoreBasePlanId: element.dataset.googleStoreBasePlanId
     }
   }
 

data/app/views/purchase_kit/purchases/_intent.html.erb

@@ -2,6 +2,7 @@
      data-correlation-id="<%= intent.uuid %>"
      data-apple-store-product-id="<%= intent.product.apple_product_id %>"
      data-google-store-product-id="<%= intent.product.google_product_id %>"
+     data-google-store-base-plan-id="<%= intent.product.google_base_plan_id %>"
      data-xcode-completion-url="<%= intent.xcode_completion_url %>"
      data-success-path="<%= intent.success_path %>">
 </div>

data/lib/purchasekit/product/demo.rb

@@ -14,7 +14,8 @@ module PurchaseKit
           Product.new(
             id: id,
             apple_product_id: product_data[:apple_product_id],
-            google_product_id: product_data[:google_product_id]
+            google_product_id: product_data[:google_product_id],
+            google_base_plan_id: product_data[:google_base_plan_id]
           )
         end
       end

data/lib/purchasekit/product/remote.rb

@@ -12,7 +12,8 @@ module PurchaseKit
             Product.new(
               id: response["id"],
               apple_product_id: response["apple_product_id"],
-              google_product_id: response["google_product_id"]
+              google_product_id: response["google_product_id"],
+              google_base_plan_id: response["google_base_plan_id"]
             )
           when 404
             raise PurchaseKit::NotFoundError, "Product not found: #{id}"

data/lib/purchasekit/product.rb

@@ -11,12 +11,13 @@ module PurchaseKit
   #   product.google_product_id # => "pro_annual"
   #
   class Product
-    attr_reader :id, :apple_product_id, :google_product_id
+    attr_reader :id, :apple_product_id, :google_product_id, :google_base_plan_id
 
-    def initialize(id:, apple_product_id: nil, google_product_id: nil)
+    def initialize(id:, apple_product_id: nil, google_product_id: nil, google_base_plan_id: nil)
       @id = id
       @apple_product_id = apple_product_id
       @google_product_id = google_product_id
+      @google_base_plan_id = google_base_plan_id
     end
 
     # Get the store-specific product ID for a platform.

data/lib/purchasekit/purchase/intent/remote.rb

@@ -19,7 +19,8 @@ module PurchaseKit
               product = Product.new(
                 id: product_data["id"],
                 apple_product_id: product_data["apple_product_id"],
-                google_product_id: product_data["google_product_id"]
+                google_product_id: product_data["google_product_id"],
+                google_base_plan_id: product_data["google_base_plan_id"]
               )
               new(id: response["id"], uuid: response["uuid"], product: product, success_path: success_path)
             when 402

data/lib/purchasekit/version.rb

@@ -1,3 +1,3 @@
 module PurchaseKit
-  VERSION = "0.4.5"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: purchasekit
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.6.0
 platform: ruby
 authors:
 - Joe Masilotti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-02-11 00:00:00.000000000 Z
+date: 2026-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails