discourse_subscription_client 0.1.0.pre10 → 0.1.0.pre12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7be1c54ac40f2c0221c35038e20c1daa1fac8f39c0736d11a858f805a6220791
-  data.tar.gz: d8a564f4d2c9bc8ef052a47719c42dcc36df45ba42d8848d32fd6a8d03b0c8cb
+  metadata.gz: d17f2464b6f962f809428eea6207696f20a1d935ed573ec0f3970242712a8da9
+  data.tar.gz: f226a6927bc9e41fcd199572d5417850212de9d335ed58fa325b58b0842776d3
 SHA512:
-  metadata.gz: f401dbabaa835f14619e4aa3263cee2df00048ae43c8fabd9fdae16e5c99806b6caf09896d4470c32923be77fe0a6b73d0efcd97589394d601647e3614e18d6a
-  data.tar.gz: 0f10faf5cd3ed514bee5ef10555846c3c66f278e3adc8360a04d4ce8e5f56a12122aa86ed763b8c1988ca4815b39432d06219a1f981f4b0919244d387c4091e5
+  metadata.gz: cda4eb9051cbeb1a62e317a314d79bd08a2e0eb255775adf6e0c45ff53bb527ab3b14338d0a90d4f09fc28a8da20ebb3f375eeba33bc43770d7eb07734d99fa7
+  data.tar.gz: 72cfb38e708e8a4c8bb56cb8d38a7374300d194e68c461ef32bca490a199e00775463ec3196fca50b0166ee6d49ad0b04e9e25fda689811eab127074ac81e915

data/README.md

@@ -5,7 +5,7 @@ This gem is only for use with Discourse plugins. It provides subscription client
 Add this line to your plugin's `plugin.rb` file
 
 ```ruby
-gem "discourse_subscription_client", "0.1.0.pre5", require_name: "discourse_subscription_client"
+gem "discourse_subscription_client", "0.1.0.pre11", require_name: "discourse_subscription_client"
 ```
 
 ## Usage

data/app/controllers/discourse_subscription_client/no_access_controller.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module DiscourseSubscriptionClient
+  class NoAccessController < ApplicationController
+    def index
+      head :ok
+    end
+  end
+end

data/app/models/subscription_client_supplier.rb

@@ -10,26 +10,20 @@ class SubscriptionClientSupplier < ActiveRecord::Base
   scope :authorized, -> { where("api_key IS NOT NULL") }
 
   def destroy_authorization
-    if DiscourseSubscriptionClient::Authorization.revoke(self)
-      update(api_key: nil, user_id: nil, authorized_at: nil)
-      deactivate_all_subscriptions!
-      true
-    else
-      false
-    end
+    DiscourseSubscriptionClient::Authorization.revoke(self)
+    update(api_key: nil, user_id: nil, authorized_at: nil)
+    deactivate_all_subscriptions!
   end
 
   def authorized?
     api_key.present?
   end
 
-  def product_slugs
-    if products.present?
-      products.each_with_object({}) do |product, result|
-        result[product["product_id"]] = product["product_slug"]
-      end
-    else
-      {}
+  def product_slugs(resource)
+    return {} unless products.present? && products[resource]
+
+    products[resource].each_with_object({}) do |product, result|
+      result[product["product_id"]] = product["product_slug"]
     end
   end
 

data/config/routes.rb

@@ -17,4 +17,6 @@ DiscourseSubscriptionClient::Engine.routes.draw do
   put "notices/:notice_id/dismiss" => "notices#dismiss"
   put "notices/:notice_id/hide" => "notices#hide"
   put "notices/:notice_id/show" => "notices#show"
+
+  get "no-access" => "no_access#index"
 end

data/db/migrate/20230223135957_add_products_to_subscription_client_suppliers.rb

@@ -2,6 +2,6 @@
 
 class AddProductsToSubscriptionClientSuppliers < ActiveRecord::Migration[7.0]
   def change
-    add_column :subscription_client_suppliers, :products, :json
+    add_column :subscription_client_suppliers, :products, :json, if_not_exists: true
   end
 end

data/lib/discourse_subscription_client/engine.rb

@@ -29,6 +29,7 @@ module DiscourseSubscriptionClient
         ../../app/models/subscription_client_resource
         ../../app/models/subscription_client_subscription
         ../../app/models/subscription_client_supplier
+        ../../app/controllers/discourse_subscription_client/no_access_controller
         ../../app/controllers/discourse_subscription_client/admin_controller
         ../../app/controllers/discourse_subscription_client/subscriptions_controller
         ../../app/controllers/discourse_subscription_client/suppliers_controller
@@ -87,7 +88,7 @@ module DiscourseSubscriptionClient
     end
 
     def plugin_status_server_url
-      "https://discourse.pluginmanager.org"
+      "https://coop.pavilion.tech"
     end
 
     def database_exists?
@@ -109,9 +110,15 @@ module DiscourseSubscriptionClient
       result = DiscourseSubscriptionClient::Subscriptions::Result.new
       return result unless subscriptions.exists?
 
-      result.resource = subscriptions.first.resource
-      result.supplier = subscriptions.first.resource.supplier
+      resource = subscriptions.first.resource
+      supplier = resource.supplier
+      products = supplier.product_slugs(resource_name)
+      return result unless products.present?
+
+      result.resource = resource
+      result.supplier = supplier
       result.subscriptions = subscriptions.to_a
+      result.products = products
 
       result
     end

data/lib/discourse_subscription_client/resources.rb

@@ -42,21 +42,13 @@ module DiscourseSubscriptionClient
       supplier_urls = @resources.map { |resource| resource[:supplier_url] }.uniq.compact
 
       supplier_urls.each do |url|
-        supplier = SubscriptionClientSupplier.find_by(url: url)
+        supplier = SubscriptionClientSupplier.find_or_create_by(url: url)
+        request = DiscourseSubscriptionClient::Request.new(:supplier, supplier.id)
+        data = request.perform("#{url}/subscription-server")
 
-        if supplier&.name
+        if valid_supplier_data?(data)
+          supplier.update(name: data[:supplier], products: data[:products])
           @suppliers << supplier
-        else
-          supplier ||= SubscriptionClientSupplier.create!(url: url)
-          request = DiscourseSubscriptionClient::Request.new(:supplier, supplier.id)
-          data = request.perform("#{url}/subscription-server")
-
-          if valid_supplier_data?(data)
-            supplier.update(name: data[:supplier], products: data[:products])
-            @suppliers << supplier
-          else
-            supplier.destroy!
-          end
         end
       end
     end
@@ -98,12 +90,14 @@ module DiscourseSubscriptionClient
       return false unless data.present? && data.is_a?(Hash)
       return false unless %i[supplier products].all? { |key| data.key?(key) }
       return false unless data[:supplier].is_a?(String)
-      return false unless data[:products].is_a?(Array)
-
-      data[:products].all? do |product|
-        product.is_a?(Hash) &&
-          %i[product_id product_slug].all? do |key|
-            product.key?(key) && product[key].is_a?(String)
+      return false unless data[:products].is_a?(Hash)
+
+      data[:products].all? do |_resource, products|
+        products.is_a?(Array) &&
+          products.all? do |product|
+            %i[product_id product_slug].all? do |key|
+              product.key?(key) && product[key].is_a?(String)
+            end
           end
       end
     end

data/lib/discourse_subscription_client/subscriptions/result.rb

@@ -5,10 +5,11 @@ module DiscourseSubscriptionClient
     class Result
       attr_accessor :supplier,
                     :resource,
-                    :subscriptions
+                    :subscriptions,
+                    :products
 
       def any?
-        supplier.present? && resource.present? && subscriptions.present?
+        supplier.present? && resource.present? && subscriptions.present? && products.present?
       end
     end
   end

data/lib/discourse_subscription_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DiscourseSubscriptionClient
-  VERSION = "0.1.0.pre10"
+  VERSION = "0.1.0.pre12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discourse_subscription_client
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre10
+  version: 0.1.0.pre12
 platform: ruby
 authors:
 - Angus McLeod
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-24 00:00:00.000000000 Z
+date: 2023-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -233,6 +233,7 @@ files:
 - app/assets/config/discourse_subscription_client_manifest.js
 - app/assets/stylesheets/discourse_subscription_client/application.css
 - app/controllers/discourse_subscription_client/admin_controller.rb
+- app/controllers/discourse_subscription_client/no_access_controller.rb
 - app/controllers/discourse_subscription_client/notices_controller.rb
 - app/controllers/discourse_subscription_client/subscriptions_controller.rb
 - app/controllers/discourse_subscription_client/suppliers_controller.rb
@@ -292,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Discourse plugin subscription client.