disco_app 0.15.2 → 0.18.1

data/app/controllers/disco_app/flow/concerns/trigger_usage_controller.rb

@@ -0,0 +1,29 @@
+module DiscoApp
+  module Flow
+    module Concerns
+      module TriggerUsageController
+
+        extend ActiveSupport::Concern
+        include DiscoApp::Flow::Concerns::VerifiesFlowPayload
+
+        def update_trigger_usage
+          DiscoApp::Flow::UpdateTriggerUsage.call(
+            shop: @shop,
+            flow_trigger_definition_id: params[:flow_trigger_definition_id],
+            has_enabled_flow: params[:has_enabled_flow],
+            timestamp: parsed_timestamp
+          )
+
+          head :ok
+        end
+
+        private
+
+          def parsed_timestamp
+            Time.parse(params[:timestamp])
+          end
+
+      end
+    end
+  end
+end

data/app/controllers/disco_app/flow/concerns/verifies_flow_payload.rb

@@ -0,0 +1,39 @@
+module DiscoApp
+  module Flow
+    module Concerns
+      module VerifiesFlowPayload
+
+        extend ActiveSupport::Concern
+
+        included do
+          before_action :verify_flow_payload
+          before_action :find_shop
+          protect_from_forgery with: :null_session
+        end
+
+        private
+
+          def verify_flow_payload
+            return head :unauthorized unless flow_payload_is_valid?
+
+            request.body.rewind
+          end
+
+          # Shopify Flow action and trigger usage update endpoints use the same
+          # verification as webhooks, which is why we reuse this service method here.
+          def flow_payload_is_valid?
+            DiscoApp::WebhookService.valid_hmac?(
+              request.body.read.to_s,
+              ShopifyApp.configuration.secret,
+              request.headers['HTTP_X_SHOPIFY_HMAC_SHA256']
+            )
+          end
+
+          def find_shop
+            @shop = DiscoApp::Shop.find_by!(shopify_domain: params[:shopify_domain])
+          end
+
+      end
+    end
+  end
+end

data/app/controllers/disco_app/flow/trigger_usage_controller.rb

@@ -0,0 +1,9 @@
+module DiscoApp
+  module Flow
+    class TriggerUsageController < ActionController::Base
+
+      include DiscoApp::Flow::Concerns::TriggerUsageController
+
+    end
+  end
+end

data/app/controllers/disco_app/frame_controller.rb

@@ -3,7 +3,6 @@ class DiscoApp::FrameController < ActionController::Base
   layout nil
 
   def frame
-
   end
 
 end

data/app/controllers/disco_app/install_controller.rb

@@ -1,4 +1,5 @@
 class DiscoApp::InstallController < ApplicationController
+
   include DiscoApp::Concerns::AuthenticatedController
 
   skip_before_action :check_current_subscription
@@ -12,16 +13,12 @@ class DiscoApp::InstallController < ApplicationController
 
   # Display an "installing" page.
   def installing
-    if @shop.installed?
-      redirect_to main_app.root_path
-    end
+    redirect_to main_app.root_path if @shop.installed?
   end
 
   # Display an "uninstalling" page. Should be almost never used.
   def uninstalling
-    if @shop.uninstalled?
-      redirect_to main_app.root_path
-    end
+    redirect_to main_app.root_path if @shop.uninstalled?
   end
 
 end

data/app/controllers/disco_app/subscriptions_controller.rb

@@ -1,4 +1,5 @@
 class DiscoApp::SubscriptionsController < ApplicationController
+
   include DiscoApp::Concerns::AuthenticatedController
 
   skip_before_action :check_current_subscription
@@ -10,13 +11,20 @@ class DiscoApp::SubscriptionsController < ApplicationController
   def create
     # Get the selected plan. If it's not available or couldn't be found,
     # redirect back to the plan selection page.
-    if(plan = DiscoApp::Plan.available.find_by_id(subscription_params[:plan])).nil?
-      redirect_to action: :new and return
-    end
+    plan = DiscoApp::Plan.available.find_by(id: subscription_params[:plan])
+
+    redirect_to(action: :new) && return unless plan
 
     # Subscribe the current shop to the selected plan. Pass along any cookied
     # plan code and source code.
-    if(subscription = DiscoApp::SubscriptionService.subscribe(@shop, plan, cookies[DiscoApp::CODE_COOKIE_KEY], cookies[DiscoApp::SOURCE_COOKIE_KEY])).nil?
+    subscription = DiscoApp::SubscriptionService.subscribe(
+      @shop,
+      plan,
+      cookies[DiscoApp::CODE_COOKIE_KEY],
+      cookies[DiscoApp::SOURCE_COOKIE_KEY]
+    )
+
+    if subscription.nil?
       redirect_to action: :new
     else
       redirect_to main_app.root_path

data/app/controllers/disco_app/user_sessions_controller.rb

@@ -1,4 +1,5 @@
 class DiscoApp::UserSessionsController < ApplicationController
+
   include DiscoApp::Concerns::AuthenticatedController
 
   def new

data/app/controllers/disco_app/webhooks_controller.rb

@@ -1,3 +1,5 @@
 class DiscoApp::WebhooksController < ActionController::Base
+
   include DiscoApp::Concerns::WebhooksController
+
 end

data/app/controllers/sessions_controller.rb

@@ -1,5 +1,4 @@
-class SessionsController < ActionController::Base
-  include ShopifyApp::SessionsConcern
+class SessionsController < ShopifyApp::SessionsController
 
   def referral
     cookies[DiscoApp::SOURCE_COOKIE_KEY] = params[:source] if params[:source].present?
@@ -18,14 +17,14 @@ class SessionsController < ActionController::Base
     # mode. Skipping OAuth still requires a shop with Shopify domain specified
     # by the `shop` parameter to be present in the local database.
     def authenticate
-      if Rails.env.development? and DiscoApp.configuration.skip_oauth?
-        shop = DiscoApp::Shop.find_by_shopify_domain!(sanitized_shop_name)
+      if Rails.env.development? && DiscoApp.configuration.skip_oauth?
+        shop = DiscoApp::Shop.find_by!(shopify_domain: sanitized_shop_name)
 
-        sess = ShopifyAPI::Session.new(shop.shopify_domain, shop.shopify_token)
+        sess = ShopifyAPI::Session.new(domain: shop.shopify_domain, token: shop.shopify_token, api_version: shop.api_version)
         session[:shopify] = ShopifyApp::SessionRepository.store(sess)
         session[:shopify_domain] = sanitized_shop_name
 
-        redirect_to disco_app.frame_path and return
+        redirect_to(disco_app.frame_path) && return
       end
       super
     end

data/app/helpers/disco_app/application_helper.rb

@@ -18,7 +18,7 @@ module DiscoApp::ApplicationHelper
       title: options.delete(:modal_title),
       width: options.delete(:modal_width),
       height: options.delete(:modal_height),
-      buttons: options.delete(:modal_buttons),
+      buttons: options.delete(:modal_buttons)
     }
     options[:onclick] = "ShopifyApp.Modal.open(#{modal_options.to_json}); return false;"
     options[:onclick].gsub!(/"function(.*?)"/, 'function\1')
@@ -32,14 +32,14 @@ module DiscoApp::ApplicationHelper
     react_component(name, args, options)
   end
 
-  # Provide link to dynamically add a new nested fields association 
-  def link_to_add_fields(name, f, association)
-    new_object = f.object.send(association).klass.new
+  # Provide link to dynamically add a new nested fields association
+  def link_to_add_fields(name, form, association)
+    new_object = form.object.send(association).klass.new
     id = new_object.object_id
-    fields = f.fields_for(association, new_object, child_index: id) do |builder|
-      render(association.to_s.singularize + "_fields", f: builder)
+    fields = form.fields_for(association, new_object, child_index: id) do |builder|
+      render(association.to_s.singularize + '_fields', f: builder)
     end
-    link_to(name, '#', class: "add_fields", data: {id: id, fields: fields.gsub("\n", "")})
+    link_to(name, '#', class: 'add_fields', data: { id: id, fields: fields.delete("\n") })
   end
 
   # Return the props required to instantiate a React ModelForm component for the

data/app/jobs/disco_app/app_installed_job.rb

@@ -1,3 +1,5 @@
 class DiscoApp::AppInstalledJob < DiscoApp::ShopJob
+
   include DiscoApp::Concerns::AppInstalledJob
+
 end

data/app/jobs/disco_app/app_uninstalled_job.rb

@@ -1,3 +1,5 @@
 class DiscoApp::AppUninstalledJob < DiscoApp::ShopJob
+
   include DiscoApp::Concerns::AppUninstalledJob
+
 end

data/app/jobs/disco_app/concerns/app_installed_job.rb

@@ -1,4 +1,5 @@
 module DiscoApp::Concerns::AppInstalledJob
+
   extend ActiveSupport::Concern
 
   included do
@@ -21,9 +22,7 @@ module DiscoApp::Concerns::AppInstalledJob
 
     @shop.reload
 
-    if default_plan.present?
-      DiscoApp::SubscriptionService.subscribe(@shop, default_plan, plan_code, source)
-    end
+    DiscoApp::SubscriptionService.subscribe(@shop, default_plan, plan_code, source) if default_plan.present?
   end
 
   # Provide an overridable hook for applications to examine the @shop object

data/app/jobs/disco_app/concerns/app_uninstalled_job.rb

@@ -1,4 +1,5 @@
 module DiscoApp::Concerns::AppUninstalledJob
+
   extend ActiveSupport::Concern
 
   included do
@@ -12,7 +13,7 @@ module DiscoApp::Concerns::AppUninstalledJob
   # - Mark any recurring application charges as cancelled.
   # - Remove any stored sessions for the shop.
   #
-  def perform(_shop, shop_data)
+  def perform(_shop, _shop_data)
     DiscoApp::ChargesService.cancel_recurring_charges(@shop)
     DiscoApp::SendSubscriptionJob.perform_later(@shop)
     @shop.sessions.delete_all

data/app/jobs/disco_app/concerns/customers_data_request_job.rb

@@ -0,0 +1,13 @@
+module DiscoApp
+  module  Concerns
+    module  CustomersDataRequestJob
+
+      extend ActiveSupport::Concern
+
+      def perform(_shop, data_request_data)
+        # See https://shopify.dev/tutorials/add-gdpr-webhooks-to-your-app#customers-data_request
+      end
+
+    end
+  end
+end

data/app/jobs/disco_app/concerns/customers_redact_job.rb

@@ -0,0 +1,13 @@
+module DiscoApp
+  module  Concerns
+    module  CustomersRedactJob
+
+      extend ActiveSupport::Concern
+
+      def perform(_shop, redaction_request)
+        # See https://shopify.dev/tutorials/add-gdpr-webhooks-to-your-app#customers-redact
+      end
+
+    end
+  end
+end

data/app/jobs/disco_app/concerns/render_asset_group_job.rb

@@ -1,4 +1,5 @@
 module DiscoApp::Concerns::RenderAssetGroupJob
+
   extend ActiveSupport::Concern
 
   def perform(_shop, instance, asset_group)

data/app/jobs/disco_app/concerns/shop_redact_job.rb

@@ -0,0 +1,13 @@
+module DiscoApp
+  module  Concerns
+    module  ShopRedactJob
+
+      extend ActiveSupport::Concern
+
+      def perform(_shop, redaction_request)
+        # See https://shopify.dev/tutorials/add-gdpr-webhooks-to-your-app#shop-redact
+      end
+
+    end
+  end
+end

data/app/jobs/disco_app/concerns/shop_update_job.rb

@@ -1,13 +1,20 @@
 module DiscoApp::Concerns::ShopUpdateJob
+
   extend ActiveSupport::Concern
 
   # Perform an update of the current shop's information.
   def perform(_shop, shop_data = nil)
     # If we weren't provided with shop data (eg from a webhook), fetch it.
-    shop_data ||= ActiveSupport::JSON::decode(ShopifyAPI::Shop.current.to_json)
+    shop_data ||= JSON.parse(ShopifyAPI::Shop.current.to_json)
 
     # Update attributes stored directly on the Shop model, along with the data hash itself.
-    @shop.update(shop_data.with_indifferent_access.slice(*DiscoApp::Shop.column_names).except(:id, :created_at).merge(data: shop_data))
+    @shop.update(
+      shop_data
+        .with_indifferent_access
+        .slice(*DiscoApp::Shop.column_names)
+        .except(:id, :created_at)
+        .merge(data: shop_data)
+    )
   end
 
 end

data/app/jobs/disco_app/concerns/subscription_changed_job.rb

@@ -1,7 +1,8 @@
 module DiscoApp::Concerns::SubscriptionChangedJob
+
   extend ActiveSupport::Concern
 
-  def perform(_shop, subscription)
+  def perform(_shop, _subscription)
     DiscoApp::SendSubscriptionJob.perform_later(@shop)
   end
 

data/app/jobs/disco_app/concerns/synchronise_carrier_service_job.rb

@@ -1,10 +1,11 @@
 module DiscoApp::Concerns::SynchroniseCarrierServiceJob
+
   extend ActiveSupport::Concern
 
   # Ensure that any carrier service required by our app is registered.
   def perform(_shop)
     # Don't proceed unless we have a name and callback url.
-    return unless carrier_service_name and callback_url
+    return unless carrier_service_name && callback_url
 
     # Registered the carrier service if it hasn't been registered yet.
     unless current_carrier_service_names.include?(carrier_service_name)
@@ -19,11 +20,11 @@ module DiscoApp::Concerns::SynchroniseCarrierServiceJob
     # Ensure any existing carrier services (with the correct name) are active
     # and have a current callback URL.
     current_carrier_services.each do |carrier_service|
-      if carrier_service.name == carrier_service_name
-        carrier_service.callback_url = callback_url
-        carrier_service.active = true
-        carrier_service.save
-      end
+      next unless carrier_service.name == carrier_service_name
+
+      carrier_service.callback_url = callback_url
+      carrier_service.active = true
+      carrier_service.save
     end
   end
 
@@ -49,7 +50,7 @@ module DiscoApp::Concerns::SynchroniseCarrierServiceJob
 
     # Return a list of currently registered carrier services.
     def current_carrier_services
-      @current_carrier_service ||= ShopifyAPI::CarrierService.find(:all)
+      @current_carrier_services ||= ShopifyAPI::CarrierService.find(:all)
     end
 
 end

data/app/jobs/disco_app/concerns/synchronise_resources_job.rb

@@ -1,4 +1,5 @@
 module DiscoApp::Concerns::SynchroniseResourcesJob
+
   extend ActiveSupport::Concern
 
   def perform(_shop, class_name, params)

data/app/jobs/disco_app/concerns/synchronise_users_job.rb

@@ -1,14 +1,17 @@
 module DiscoApp::Concerns::SynchroniseUsersJob
+
   extend ActiveSupport::Concern
 
   def perform(_shop)
     begin
-      users = @shop.with_api_context {
+      users = @shop.with_api_context do
         ShopifyAPI::User.all
-      }
+      end
     rescue ActiveResource::UnauthorizedAccess => e
-      Rollbar.error(e) and return
+      Appsignal.set_error(e)
+      return
     end
+
     users.each { |user| DiscoApp::User.create_user(user, @shop) }
   end
 

data/app/jobs/disco_app/concerns/synchronise_webhooks_job.rb

@@ -1,7 +1,8 @@
 module DiscoApp::Concerns::SynchroniseWebhooksJob
+
   extend ActiveSupport::Concern
 
-  COMMON_WEBHOOKS = [:'app/uninstalled', :'shop/update']
+  COMMON_WEBHOOKS = %i[app/uninstalled shop/update]
 
   # Ensure the webhooks registered with our shop are the same as those listed
   # in our application configuration.
@@ -11,25 +12,27 @@ module DiscoApp::Concerns::SynchroniseWebhooksJob
       with_verbose_output(topic) do
         ShopifyAPI::Webhook.create(
           topic: topic,
+          fields: topic_fields(topic),
           address: webhooks_url,
-          format: 'json',
+          format: 'json'
         )
       end
     end
 
     # Remove any extraneous topics.
     current_webhooks.each do |webhook|
-      unless expected_topics.include?(webhook.topic.to_sym)
-        ShopifyAPI::Webhook.delete(webhook.id)
-      end
+      ShopifyAPI::Webhook.delete(webhook.id) unless expected_topics.include?(webhook.topic.to_sym)
     end
 
     # Ensure webhook addresses are current.
     current_webhooks.each do |webhook|
-      unless webhook.address == webhooks_url
-        webhook.address = webhooks_url
-        webhook.save
-      end
+      expected_fields = topic_fields(webhook.topic.to_sym).map(&:to_s)
+
+      next if webhook.address == webhooks_url && webhook.fields == expected_fields
+
+      webhook.address = webhooks_url
+      webhook.fields = expected_fields
+      webhook.save
     end
   end
 
@@ -37,12 +40,12 @@ module DiscoApp::Concerns::SynchroniseWebhooksJob
 
     # Get the full list of expected webhook topics.
     def expected_topics
-      COMMON_WEBHOOKS + (DiscoApp.configuration.webhook_topics || [])
+      @expected_topics ||= (COMMON_WEBHOOKS + (DiscoApp.configuration.webhook_topics || [])).map(&:to_sym)
     end
 
     # Return a list of currently registered topics.
     def current_topics
-      current_webhooks.map(&:topic).map(&:to_sym)
+      @current_topics ||= current_webhooks.map(&:topic).map(&:to_sym)
     end
 
     # Return a list of current registered webhooks.
@@ -50,6 +53,16 @@ module DiscoApp::Concerns::SynchroniseWebhooksJob
       @current_webhooks ||= ShopifyAPI::Webhook.find(:all)
     end
 
+    # Return a list of requested fields for the given topic.
+    def topic_fields(topic)
+      webhook_fields[topic] || []
+    end
+
+    # Return a list of topic-to-field mappings.
+    def webhook_fields
+      @webhook_fields ||= (DiscoApp.configuration.webhook_fields || {}).symbolize_keys
+    end
+
     # Return the absolute URL to the webhooks endpoint.
     def webhooks_url
       DiscoApp::Engine.routes.url_helpers.webhooks_url

data/app/jobs/disco_app/customers_data_request_job.rb

@@ -0,0 +1,5 @@
+class DiscoApp::CustomersDataRequestJob < DiscoApp::ShopJob
+
+  include DiscoApp::Concerns::CustomersDataRequestJob
+
+end

data/app/jobs/disco_app/customers_redact_job.rb

@@ -0,0 +1,5 @@
+class DiscoApp::CustomersRedactJob < DiscoApp::ShopJob
+
+  include DiscoApp::Concerns::CustomersRedactJob
+
+end

data/app/jobs/disco_app/flow/process_action_job.rb

@@ -0,0 +1,11 @@
+module DiscoApp
+  module Flow
+    class ProcessActionJob < DiscoApp::ShopJob
+
+      def perform(_shop, action)
+        ProcessAction.call(action: action)
+      end
+
+    end
+  end
+end

data/app/jobs/disco_app/flow/process_trigger_job.rb

@@ -0,0 +1,11 @@
+module DiscoApp
+  module Flow
+    class ProcessTriggerJob < DiscoApp::ShopJob
+
+      def perform(_shop, trigger)
+        ProcessTrigger.call(trigger: trigger)
+      end
+
+    end
+  end
+end

data/app/jobs/disco_app/render_asset_group_job.rb

@@ -1,3 +1,5 @@
 class DiscoApp::RenderAssetGroupJob < DiscoApp::ShopJob
+
   include DiscoApp::Concerns::RenderAssetGroupJob
+
 end

data/app/jobs/disco_app/shop_job.rb

@@ -1,10 +1,10 @@
+require 'appsignal'
+
 # The base class for all jobs that should be performed in the context of a
 # particular Shop's API session. The first argument to any job inheriting from
 # this class must be the domain of the relevant store, so that the appropriate
 # Shop model can be fetched and the temporary API session created.
 
-require 'rollbar'
-
 class DiscoApp::ShopJob < ApplicationJob
 
   queue_as :default
@@ -18,17 +18,17 @@ class DiscoApp::ShopJob < ApplicationJob
   private
 
     def find_shop(job)
-      @shop ||= job.arguments.first.is_a?(DiscoApp::Shop) ? job.arguments.first : DiscoApp::Shop.find_by!(shopify_domain: job.arguments.first)
-    end
+      return @shop if @shop
 
-    def shop_context(job, block)
-      Rollbar.scoped(rollbar_scope) do
-        @shop.with_api_context { block.call(job.arguments) }
-      end
+      @shop = job.arguments.first.is_a?(DiscoApp::Shop) ? job.arguments.first : DiscoApp::Shop.find_by!(shopify_domain: job.arguments.first)
     end
 
-    def rollbar_scope
-      { person: { id: @shop.id, username: @shop.shopify_domain } }
+    def shop_context(job, block)
+      Appsignal.tag_request(
+        shop_id: @shop.id,
+        shopify_domain: @shop.shopify_domain
+      )
+      @shop.with_api_context { block.call(job.arguments) }
     end
 
 end

data/app/jobs/disco_app/shop_redact_job.rb

@@ -0,0 +1,5 @@
+class DiscoApp::ShopRedactJob < DiscoApp::ShopJob
+
+  include DiscoApp::Concerns::ShopRedactJob
+
+end

data/app/jobs/disco_app/shop_update_job.rb

@@ -1,3 +1,5 @@
 class DiscoApp::ShopUpdateJob < DiscoApp::ShopJob
+
   include DiscoApp::Concerns::ShopUpdateJob
+
 end

data/app/jobs/disco_app/subscription_changed_job.rb

@@ -1,3 +1,5 @@
 class DiscoApp::SubscriptionChangedJob < DiscoApp::ShopJob
+
   include DiscoApp::Concerns::SubscriptionChangedJob
+
 end

data/app/jobs/disco_app/synchronise_carrier_service_job.rb

@@ -1,3 +1,5 @@
 class DiscoApp::SynchroniseCarrierServiceJob < DiscoApp::ShopJob
+
   include DiscoApp::Concerns::SynchroniseCarrierServiceJob
+
 end

data/app/jobs/disco_app/synchronise_resources_job.rb

@@ -1,3 +1,5 @@
 class DiscoApp::SynchroniseResourcesJob < DiscoApp::ShopJob
+
   include DiscoApp::Concerns::SynchroniseResourcesJob
+
 end

data/app/jobs/disco_app/synchronise_users_job.rb

@@ -1,3 +1,5 @@
 class DiscoApp::SynchroniseUsersJob < DiscoApp::ShopJob
+
   include DiscoApp::Concerns::SynchroniseUsersJob
+
 end

data/app/jobs/disco_app/synchronise_webhooks_job.rb

@@ -1,3 +1,5 @@
 class DiscoApp::SynchroniseWebhooksJob < DiscoApp::ShopJob
+
   include DiscoApp::Concerns::SynchroniseWebhooksJob
+
 end

data/app/models/application_record.rb

@@ -1,3 +1,5 @@
 class ApplicationRecord < ActiveRecord::Base
+
   self.abstract_class = true
+
 end

data/app/models/disco_app/app_settings.rb

@@ -1,3 +1,5 @@
 class DiscoApp::AppSettings < ApplicationRecord
+
   include DiscoApp::Concerns::AppSettings
+
 end

data/app/models/disco_app/application_charge.rb

@@ -8,7 +8,7 @@ class DiscoApp::ApplicationCharge < ApplicationRecord
     accepted: 1,
     declined: 2,
     expired: 3,
-    active: 4,
+    active: 4
   }
 
   scope :active, -> { where status: statuses[:active] }