discourse_subscription_client 0.1.0.pre13 → 0.1.0.pre15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0eb5ae72b353d0c2247634efd915ba4702c6ce9e7edc79a6cd1bfec8ed008d12
-  data.tar.gz: 7ad730452ccc89cf452571029f3d1f4a4c6844d6bd642d32a63d92ddf3b0250d
+  metadata.gz: f15b1e42f02b3159c039b28fdf1985170db6defce594f2e42c1a52f4504db3ee
+  data.tar.gz: 201f6f0740e215e96a288a48ac2438c501ecb451afd968873981879afb433927
 SHA512:
-  metadata.gz: 60f355d11aa8199f740908df977e4e7a6e6c54dc2a52f5ed3d0e656672580230bfc30019f5dd6e68b801843a9bb1192e6d9f8938d8753924f474caf02534717c
-  data.tar.gz: 3de6d7e1ec21a234e8fe1c1a45c53f9db5135327cf4ceda307c262b413a903dcade95796d0268445c34abc2eb03a854da59d0b878e109cada669c63b59db90fc
+  metadata.gz: a90ed84465ac74a22c7640e620376378a0e0323511eb6461dc6646c824f430f679d79c56ee89937c073fb601d41cb2335cfa5370543da641bce0c91fdcc33463
+  data.tar.gz: 2400cd36dbb04f1b0c915e3f6f6011115be55bdbc55b3035874ef6584514463b9694de7f73c26fe688417cc6fb39aaae64f9df4d5457e32f87b586f0802ecda7

data/app/controllers/discourse_subscription_client/suppliers_controller.rb

@@ -11,6 +11,8 @@ module DiscourseSubscriptionClient
     end
 
     def authorize
+      session[:final_landing_path] = params[:final_landing_path]
+
       request_id = DiscourseSubscriptionClient::Authorization.request_id(@supplier.id)
       cookies[:user_api_request_id] = request_id
       redirect_to DiscourseSubscriptionClient::Authorization.url(current_user, @supplier, request_id).to_s,
@@ -36,7 +38,11 @@ module DiscourseSubscriptionClient
 
       DiscourseSubscriptionClient::Subscriptions.update
 
-      redirect_to "/admin/plugins/subscription-client/subscriptions"
+      if !session[:final_landing_path].blank?
+        redirect_to session[:final_landing_path]
+      else
+        redirect_to "/admin/plugins"
+      end
     end
 
     def destroy

data/lib/discourse_subscription_client/resources.rb

@@ -35,7 +35,14 @@ module DiscourseSubscriptionClient
     end
 
     def find_resources
-      find_plugins
+      resources = find_plugins
+
+      resources.each do |r|
+        @resources << {
+          name: r[:name],
+          supplier_url: r[:supplier_url]
+        }
+      end
     end
 
     def find_suppliers
@@ -73,17 +80,19 @@ module DiscourseSubscriptionClient
     end
 
     def find_plugins
+      plugins = []
       Dir["#{DiscourseSubscriptionClient.root}/plugins/*/plugin.rb"].sort.each do |path|
         source = File.read(path)
         metadata = Plugin::Metadata.parse(source)
 
         next unless metadata.subscription_url.present?
 
-        @resources << {
+        plugins << {
           name: metadata.name,
           supplier_url: ENV["TEST_SUBSCRIPTION_URL"] || metadata.subscription_url
         }
       end
+      plugins
     end
 
     def valid_supplier_data?(data)
@@ -93,12 +102,11 @@ module DiscourseSubscriptionClient
       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
+        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
   end

data/lib/discourse_subscription_client/subscriptions.rb

@@ -13,6 +13,8 @@ module DiscourseSubscriptionClient
     def update
       return unless SiteSetting.subscription_client_enabled
 
+      DiscourseSubscriptionClient::Resources.find_all
+
       @result = DiscourseSubscriptionClient::Subscriptions::UpdateResult.new
 
       if @suppliers.blank?

data/lib/discourse_subscription_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discourse_subscription_client
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre13
+  version: 0.1.0.pre15
 platform: ruby
 authors:
 - Angus McLeod
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-31 00:00:00.000000000 Z
+date: 2023-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -278,7 +278,7 @@ metadata:
   homepage_uri: https://github.com/paviliondev/discourse_subscription_client
   source_code_uri: https://github.com/paviliondev/discourse_subscription_client
   changelog_uri: https://github.com/paviliondev/discourse_subscription_client
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -294,7 +294,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubygems_version: 3.4.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Discourse plugin subscription client.
 test_files: []