disco_app 0.12.7.pre.puma.pre.3 → 0.18.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 00ea85f26e287b6a9f785c3e9761064244e39bc6
-  data.tar.gz: 5564413348495e202135e4b6209c1204da54148e
+SHA256:
+  metadata.gz: a75590acf98965732300783166f37bc5b7424d85e39b602831f6d79ac496cf9b
+  data.tar.gz: 4ef13a5f01e043a3464698539245bd4982a0bb82c4a20a7c4081176f795f30b6
 SHA512:
-  metadata.gz: 56b1b6b57952ac3df28088a1866e1d79c67932bc77ea0120ba1b094645033ec877068f16b12f21fbaa54d1c335b0fa1b0a20c27c5bd59f96cc77f382be5ae006
-  data.tar.gz: b04189e5088811e22ae96d6d1bacec8c3a6b35f200c9ef3223da11c836520474dc7c548457e0e9fa9dc6fde15a83cb84edfda6db402fab2bfd32bfebaf2cc6e7
+  metadata.gz: e1179214f99827a732d322c1361707625578872484baa6430a946f887750d6b5b6d299c7c0558505d743993dc38db713ee1853338cd2ebd8552d391968d761a8
+  data.tar.gz: d835598d84013984dfa24c565e8868e21225b166dab8ca9ea09d05b7907568ec71d8eba4ab846cc6af5f03459df82e31786094a3b5fc7f1d438469e0c2ac7138

data/Rakefile

@@ -14,14 +14,11 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('test/dummy/Rakefile', __dir__)
 load 'rails/tasks/engine.rake'
 
-
 load 'rails/tasks/statistics.rake'
 
-
-
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
@@ -33,5 +30,4 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-
 task default: :test

data/app/assets/components/disco_app/forms/model-form.es6.jsx

@@ -2,7 +2,7 @@ class ModelForm extends BaseForm {
 
   render() {
     const { modelTitle, modelName, modelUrl, modelsUrl, children, authenticityToken } = this.props;
-    const errors = this.renderErrors();
+    const errorsElement = this.getErrorsElement();
 
     return(
       <form action={modelUrl ? modelUrl : modelsUrl} acceptCharset="UTF-8" method="POST" data-shopify-app-submit="ea.save">
@@ -10,12 +10,7 @@ class ModelForm extends BaseForm {
         <input type="hidden" name="_method" value={modelUrl ? 'patch' : 'post'} />
         <input type="hidden" name="authenticity_token" value={authenticityToken}/>
 
-        {(() => {
-          if (!errors) return false;
-          return (
-            {errors}
-          );
-        })()}
+        {errorsElement}
 
         {children}
 

data/app/assets/javascripts/disco_app/components/custom/shop_row.js.jsx

@@ -29,7 +29,8 @@ var ShopRow = (props) => {
     return (
         <tr>
             <td>
-              <a href={editShopUrl}>{domainName}</a><br />
+              {domainName}
+              <br />
               <a href={'mailto:' + shop.attributes.email}>{shop.attributes.email}</a>
             </td>
             <td>{shop.attributes.status}</td>

data/app/assets/javascripts/disco_app/components/ui-kit/forms/base_form.es6.jsx

@@ -5,64 +5,36 @@
 class BaseForm extends React.Component {
 
   /**
-   * check if the field parameter has errors associated.
-   * if no parameters are given, it checks if there's at least an error at all
-   **/
-  hasErrors(field) {
-    if ((arguments.length === 0 && this.errorKeys().length > 0) ||
-        (this.props.errors && this.props.errors.errors.indexOf(field) > -1)) {
-      return true;
-    }
-    return false;
-  }
-
-  /**
-   * returns a list of fields that contain errors
-   **/
-  errorKeys() {
-    return this.props.errors.errors;
-  }
-
-  /**
-   * returns the type of resource associate with this error
-   **/
-  errorType() {
-    return this.props.errors.type;
-  }
-
-  /**
-   * returns the error messages
-   **/
-  errorMessages() {
-    return this.props.errors.messages;
-  }
-
-  /**
-   * renders basic form errors
-   **/
-  renderErrors() {
-    if (!this.hasErrors()) {
+   * Returns the JSX required to render a list of errors.
+   *
+   * @returns {*}
+   */
+  getErrorsElement() {
+    const { errors } = this.props;
+
+    // Don't render anything if no errors present.
+    if(!errors || !errors.errors || (errors.errors.length == 0)) {
       return null;
     }
 
-    var title = "There " + (this.errorMessages().length == 1 ? "is" : "are") + " " + this.errorMessages().length + " error" + (this.errorMessages().length > 1 ? "s" : "") + " for this " + this.errorType() + ":";
-    var errorMessages = this.errorMessages().map(function(message) {
-      return <li>{message}</li>;
-    });
+    const errorCount = errors.errors.length;
+    const singleError = (errorCount == 1);
 
     return (
       <div className="ui-banner ui-banner--status-error ui-banner--default-vertical-spacing ui-banner--default-horizontal-spacing">
         <div className="ui-banner__ribbon">
           <svg className="next-icon next-icon--24" viewBox="0 0 24 24">
-            <path d="M12 0C5.4 0 0 5.4 0 12s5.4 12 12 12 12-5.4 12-12S18.6 0 12 0zm0 4c1.4 0 2.7.4 3.9 1L12 8.8 8.8 12 5 15.9c-.6-1.1-1-2.5-1-3.9 0-4.4 3.6-8 8-8zm0 16c-1.4 0-2.7-.4-3.9-1l3.9-3.9 3.2-3.2L19 8.1c.6 1.1 1 2.5 1 3.9 0 4.4-3.6 8-8 8z"></path>
+            <use xmlns="http://www.w3.org/1999/xlink" xlinkHref="#next-error" />
           </svg>
         </div>
         <div className="ui-banner__content">
           <h2 className="ui-banner__title">
-            {title}
+            There {singleError ? 'is' : 'are'} {errorCount} error{singleError ? '' : 's'} for this {errors.type}:
           </h2>
           <ul>
-            {errorMessages}
+            {errors.messages.map((message, i) => {
+              return <li key={i}>{message}</li>;
+            })}
           </ul>
         </div>
       </div>

data/app/assets/javascripts/disco_app/components/ui-kit/forms/input-checkbox.es6.jsx

@@ -1,6 +1,6 @@
-const InputCheckbox = ({ label, name, value, checked, inline, isLast, onChange, disabled = false }) => {
+const InputCheckbox = ({ label, name, checked, inline, isLast, onChange, disabled = false }) => {
 
-  const id = `${name}[${value}]`;
+  const id = name;
 
   const wrapperClassName = classNames({
     'next-input-wrapper': true,
@@ -16,14 +16,19 @@ const InputCheckbox = ({ label, name, value, checked, inline, isLast, onChange,
   });
 
   const handleChange = (e) => {
-    onChange && onChange(e.target.value);
+    onChange && onChange(e.target.checked);
   };
 
   return(
     <div className={wrapperClassName}>
       <label htmlFor={id} className={labelClassName}>{label}</label>
-      <input id={id} className="next-checkbox" type="checkbox" value={value} name={name} checked={checked} onChange={handleChange} disabled={disabled} />
-      <span className="next-checkbox--styled" />
+      <input type="hidden" value="0" name={name} />
+      <input id={id} className="next-checkbox" type="checkbox" value="1" name={name} checked={checked} onChange={handleChange} disabled={disabled} />
+      <span className="next-checkbox--styled">
+        <svg className="next-icon next-icon--size-10 next-icon--blue checkmark">
+          <use xmlns="http://www.w3.org/1999/xlink" xlinkHref="#next-checkmark" />
+        </svg>
+      </span>
     </div>
   )
 

data/app/clients/disco_app/api_client.rb

@@ -1,27 +1,33 @@
 require 'rest-client'
 
-class DiscoApp::ApiClient
+module DiscoApp
 
-  SUBSCRIPTION_ENDPOINT = 'app_subscriptions.json'
+  class DiscoApiError < StandardError; end
 
-  def initialize(shop, url)
-    @shop = shop
-    @url = url
-  end
+  class ApiClient
+
+    SUBSCRIPTION_ENDPOINT = 'app_subscriptions.json'.freeze
 
-  def create_app_subscription
-    return unless @url.present?
-    url = @url + SUBSCRIPTION_ENDPOINT
-    begin
-      response = RestClient::Request.execute(
-        method: :post,
-        headers: { content_type: :json },
-        url: url,
-        payload: { shop: @shop, subscription: @shop.current_subscription }.to_json
-      )
-    rescue RestClient::BadRequest, RestClient::ResourceNotFound => e
-      raise DiscoApiError.new(e.message)
+    def initialize(shop, url)
+      @shop = shop
+      @url = url
     end
-  end
 
+    def create_app_subscription
+      return if @url.blank?
+
+      url = @url + SUBSCRIPTION_ENDPOINT
+      begin
+        RestClient::Request.execute(
+          method: :post,
+          headers: { content_type: :json },
+          url: url,
+          payload: { shop: @shop, subscription: @shop.current_subscription }.to_json
+        )
+      rescue RestClient::BadRequest, RestClient::ResourceNotFound => e
+        raise DiscoApiError, e.message
+      end
+    end
+
+  end
 end

data/app/clients/disco_app/graphql_client.rb

@@ -0,0 +1,85 @@
+require 'rest-client'
+
+##
+# This file defines a very simple GraphQL API client to support a single type
+# of GraphQL API call for a Shopify store - sending a Shopify Flow trigger.
+#
+# We use this simple approach rather than using an existing GraphQL client
+# library such as https://github.com/github/graphql-client (either standalone
+# or as bundled with the Shopify API gem) for a couple of reasons:
+#
+#   - These libraries tend to presume that a single client instance is
+#     instantiated once and then reused across the application, which isn't the
+#     case when we're making API calls once per trigger for each background
+#     job.
+#   - These libraries make an API call to fetch the Shopify GraphQL schema on
+#     initialisation. The schema is very large, so the API call takes a number
+#     of seconds to complete and when parsed consumes a large amount of memory.
+#   - These libraries do not natively work well with the idea of a dynamic API
+#     endpoint (ie, changing the request URL frequently), which is required
+#     when making many requests to different Shopify stores.
+#
+module DiscoApp
+  class GraphqlClient
+
+    def initialize(shop)
+      @shop = shop
+    end
+
+    ##
+    # Fire a Shopify Flow Trigger.
+    # Returns a tuple {Boolean, Array} representing {success, errors}.
+    def create_flow_trigger(title, resource_name, resource_url, properties)
+      body = {
+        trigger_title: title,
+        resources: [
+          {
+            name: resource_name,
+            url: resource_url
+          }
+        ],
+        properties: properties
+      }
+
+      # The double .to_json.to_json below looks odd but is required to properly escape the JSON hash
+      # when inserting it into the GraphQL mutation call.
+      response = execute(%(
+        mutation {
+          flowTriggerReceive(body: #{body.to_json.to_json}) {
+            userErrors {
+              field,
+              message
+            }
+          }
+        }
+      ))
+
+      errors = response.dig(:data, :flowTriggerReceive, :userErrors)
+      [errors.empty?, errors]
+    end
+
+    private
+
+      def execute(query)
+        response = RestClient::Request.execute(
+          method: :post,
+          headers: headers,
+          url: url,
+          payload: { query: query }.to_json
+        )
+        JSON.parse(response.body).with_indifferent_access
+      end
+
+      def headers
+        {
+          'Content-Type' => 'application/json',
+          'X-Shopify-Access-Token' => @shop.shopify_token
+        }
+      end
+
+      def url
+        "https://#{@shop.shopify_domain}/admin/api/graphql.json"
+      end
+
+  end
+end

data/app/controllers/disco_app/admin/app_settings_controller.rb

@@ -1,3 +1,5 @@
 class DiscoApp::Admin::AppSettingsController < DiscoApp::Admin::ApplicationController
+
   include DiscoApp::Admin::Concerns::AppSettingsController
+
 end

data/app/controllers/disco_app/admin/application_controller.rb

@@ -1,10 +1,12 @@
 class DiscoApp::Admin::ApplicationController < ActionController::Base
+
   include DiscoApp::Admin::Concerns::AuthenticatedController
 
   private
 
     helper_method :current_shop
     def current_shop
-      @current_shop ||= @shop
+      @shop
     end
+
 end

data/app/controllers/disco_app/admin/concerns/app_settings_controller.rb

@@ -1,4 +1,5 @@
 module DiscoApp::Admin::Concerns::AppSettingsController
+
   extend ActiveSupport::Concern
 
   def edit
@@ -7,7 +8,7 @@ module DiscoApp::Admin::Concerns::AppSettingsController
 
   def update
     @app_settings = DiscoApp::AppSettings.instance
-    if @app_settings.update_attributes(app_settings_params)
+    if @app_settings.update(app_settings_params)
       flash[:success] = 'Settings updated.'
       redirect_to edit_admin_app_settings_path
     else

data/app/controllers/disco_app/admin/concerns/authenticated_controller.rb

@@ -1,19 +1,21 @@
 module DiscoApp::Admin::Concerns::AuthenticatedController
+
   extend ActiveSupport::Concern
 
   included do
-
     protect_from_forgery with: :exception
     before_action :authenticate_administrator
     layout 'admin'
-
   end
 
   private
 
     def authenticate_administrator
       authenticate_or_request_with_http_basic do |username, password|
-        (not username.blank?) && (not password.blank?) && username == ENV['ADMIN_APP_USERNAME'] && password == ENV['ADMIN_APP_PASSWORD']
+        username.present? &&
+          password.present? &&
+          username == ENV['ADMIN_APP_USERNAME'] &&
+          password == ENV['ADMIN_APP_PASSWORD']
       end
     end
 

data/app/controllers/disco_app/admin/concerns/plans_controller.rb

@@ -1,4 +1,5 @@
 module DiscoApp::Admin::Concerns::PlansController
+
   extend ActiveSupport::Concern
 
   included do
@@ -26,7 +27,7 @@ module DiscoApp::Admin::Concerns::PlansController
   end
 
   def update
-    if @plan.update_attributes(plan_params)
+    if @plan.update(plan_params)
       redirect_to edit_admin_plan_path(@plan)
     else
       render 'edit'
@@ -47,7 +48,7 @@ module DiscoApp::Admin::Concerns::PlansController
     def plan_params
       params.require(:plan).permit(
         :name, :status, :plan_type, :trial_period_days, :amount,
-        :plan_codes_attributes => [:id, :_destroy, :code, :trial_period_days, :amount]
+        plan_codes_attributes: %i[id _destroy code trial_period_days amount]
       )
     end
 

data/app/controllers/disco_app/admin/concerns/shops_controller.rb

@@ -1,4 +1,5 @@
 module DiscoApp::Admin::Concerns::ShopsController
+
   extend ActiveSupport::Concern
 
   def index

data/app/controllers/disco_app/admin/concerns/sources_controller.rb

@@ -0,0 +1,52 @@
+module DiscoApp::Admin::Concerns::SourcesController
+
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :find_source, only: [:edit, :update, :destroy]
+  end
+
+  def index
+    @sources = DiscoApp::Source.all
+  end
+
+  def new
+    @source = DiscoApp::Source.new
+  end
+
+  def create
+    @source = DiscoApp::Source.new(source_params)
+    if @source.save
+      redirect_to admin_sources_path
+    else
+      render 'new'
+    end
+  end
+
+  def edit
+  end
+
+  def update
+    if @source.update(source_params)
+      redirect_to edit_admin_plan_path(@source)
+    else
+      render 'edit'
+    end
+  end
+
+  def destroy
+    source.destroy
+    redirect_to admin_sources_path
+  end
+
+  private
+
+    def find_source
+      @source = DiscoApp::Source.find(params[:id])
+    end
+
+    def source_params
+      params.require(:source).permit(:source, :name)
+    end
+
+end

data/app/controllers/disco_app/admin/concerns/subscriptions_controller.rb

@@ -1,4 +1,5 @@
 module DiscoApp::Admin::Concerns::SubscriptionsController
+
   extend ActiveSupport::Concern
 
   included do
@@ -9,7 +10,7 @@ module DiscoApp::Admin::Concerns::SubscriptionsController
   end
 
   def update
-    if @subscription.update_attributes(subscription_params)
+    if @subscription.update(subscription_params)
       redirect_to edit_admin_shop_subscription_path(@subscription.shop, @subscription)
     else
       render 'edit'
@@ -19,7 +20,7 @@ module DiscoApp::Admin::Concerns::SubscriptionsController
   private
 
     def find_subscription
-      @subscription = DiscoApp::Subscription.find_by_id(params[:id])
+      @subscription = DiscoApp::Subscription.find_by(id: params[:id])
     end
 
     def subscription_params

data/app/controllers/disco_app/admin/plans_controller.rb

@@ -1,3 +1,5 @@
 class DiscoApp::Admin::PlansController < DiscoApp::Admin::ApplicationController
+
   include DiscoApp::Admin::Concerns::PlansController
+
 end

data/app/controllers/disco_app/admin/resources/shops_controller.rb

@@ -1,3 +1,5 @@
 class DiscoApp::Admin::Resources::ShopsController < JSONAPI::ResourceController
+
   include DiscoApp::Admin::Concerns::AuthenticatedController
+
 end

data/app/controllers/disco_app/admin/shops_controller.rb

@@ -1,3 +1,5 @@
 class DiscoApp::Admin::ShopsController < DiscoApp::Admin::ApplicationController
+
   include DiscoApp::Admin::Concerns::ShopsController
+
 end

data/app/controllers/disco_app/admin/sources_controller.rb

@@ -0,0 +1,5 @@
+class DiscoApp::Admin::SourcesController < DiscoApp::Admin::ApplicationController
+
+  include DiscoApp::Admin::Concerns::SourcesController
+
+end

data/app/controllers/disco_app/admin/subscriptions_controller.rb

@@ -1,3 +1,5 @@
 class DiscoApp::Admin::SubscriptionsController < DiscoApp::Admin::ApplicationController
+
   include DiscoApp::Admin::Concerns::SubscriptionsController
+
 end

data/app/controllers/disco_app/charges_controller.rb

@@ -1,4 +1,5 @@
 class DiscoApp::ChargesController < ApplicationController
+
   include DiscoApp::Concerns::AuthenticatedController
 
   skip_before_action :check_active_charge
@@ -13,20 +14,25 @@ class DiscoApp::ChargesController < ApplicationController
   # subscription. If successful, redirect to the (external) charge confirmation
   # URL. If it fails, redirect back to the new charge page.
   def create
-    if(charge = DiscoApp::ChargesService.create(@shop, @subscription)).nil?
+    if (charge = DiscoApp::ChargesService.create(@shop, @subscription)).nil?
       redirect_to action: :new
     else
       redirect_to charge.confirmation_url
     end
   end
 
-  # Attempt to activate a charge after a user has accepted or declined it.
+  # Attempt to activate a charge (locally) after a user has accepted or declined it.
   # Redirect to the main application's root URL immediately afterwards - if the
   # charge wasn't accepted, the flow will start again.
+  #
+  # Previously, the activation of a charge also required updating Shopify via the
+  # API, but that requirement has been removed.
+  #
+  # See https://shopify.dev/changelog/auto-activation-of-charges-and-subscriptions
   def activate
     # First attempt to find a matching charge.
-    if(charge = @subscription.charges.find_by(id: params[:id], shopify_id: params[:charge_id])).nil?
-      redirect_to action: :new and return
+    if (charge = @subscription.charges.find_by(id: params[:id], shopify_id: params[:charge_id])).nil?
+      redirect_to(action: :new) && return
     end
     if DiscoApp::ChargesService.activate(@shop, charge)
       redirect_to main_app.root_url
@@ -38,10 +44,8 @@ class DiscoApp::ChargesController < ApplicationController
   private
 
     def find_subscription
-      @subscription = @shop.subscriptions.find_by_id!(params[:subscription_id])
-      unless @subscription.requires_active_charge? and not @subscription.active_charge?
-        redirect_to main_app.root_url
-      end
+      @subscription = @shop.subscriptions.find_by!(id: params[:subscription_id])
+      redirect_to main_app.root_url unless @subscription.requires_active_charge? && !@subscription.active_charge?
     end
 
 end

data/app/controllers/disco_app/concerns/app_proxy_controller.rb

@@ -1,4 +1,5 @@
 module DiscoApp::Concerns::AppProxyController
+
   extend ActiveSupport::Concern
 
   included do
@@ -6,7 +7,7 @@ module DiscoApp::Concerns::AppProxyController
     before_action :shopify_shop
     after_action :add_liquid_header
 
-    rescue_from ActiveRecord::RecordNotFound do |exception|
+    rescue_from ActiveRecord::RecordNotFound do |_exception|
       render_error 404
     end
   end
@@ -14,18 +15,17 @@ module DiscoApp::Concerns::AppProxyController
   private
 
     def verify_proxy_signature
-      unless proxy_signature_is_valid?
-        head :unauthorized
-      end
+      head :unauthorized unless proxy_signature_is_valid?
     end
 
     def proxy_signature_is_valid?
-      return true if Rails.env.development? and DiscoApp.configuration.skip_proxy_verification?
+      return true if (Rails.env.development? || Rails.env.test?) && DiscoApp.configuration.skip_proxy_verification?
+
       DiscoApp::ProxyService.proxy_signature_is_valid?(request.query_string, ShopifyApp.configuration.secret)
     end
 
     def shopify_shop
-      @shop = DiscoApp::Shop.find_by_shopify_domain!(params[:shop])
+      @shop = DiscoApp::Shop.find_by!(shopify_domain: params[:shop])
     end
 
     def add_liquid_header