disco_app 0.12.7.pre.puma.pre.3 → 0.13.6.pre.puma.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00ea85f26e287b6a9f785c3e9761064244e39bc6
-  data.tar.gz: 5564413348495e202135e4b6209c1204da54148e
+  metadata.gz: bf27c28d441f98e6eefdc7809f69daca79c75604
+  data.tar.gz: 9686a13bb881a26dd0185eb5f7673c211c8eebb5
 SHA512:
-  metadata.gz: 56b1b6b57952ac3df28088a1866e1d79c67932bc77ea0120ba1b094645033ec877068f16b12f21fbaa54d1c335b0fa1b0a20c27c5bd59f96cc77f382be5ae006
-  data.tar.gz: b04189e5088811e22ae96d6d1bacec8c3a6b35f200c9ef3223da11c836520474dc7c548457e0e9fa9dc6fde15a83cb84edfda6db402fab2bfd32bfebaf2cc6e7
+  metadata.gz: f4a2afea46cb6cbbf4e33baf5cbeb2b533ba6f9b9032b40f6a76d984a18977179fedf1fc656c1f750fc383e54906cb824f633447b7481f42267950c7ad921d16
+  data.tar.gz: 8f90a604e1a61b4b9b5f617dbd7d77a0406ccca51d82d6ab46638b2ab1293b3b1483031a2e33051cf0770a46dbf8b44bc33ab7aaf79fd947bf9c034064ca474b

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/controllers/disco_app/admin/application_controller.rb

@@ -5,6 +5,7 @@ class DiscoApp::Admin::ApplicationController < ActionController::Base
 
     helper_method :current_shop
     def current_shop
-      @current_shop ||= @shop
+      @shop
     end
+
 end

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

@@ -0,0 +1,51 @@
+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_attributes(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/sources_controller.rb

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

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

@@ -0,0 +1,17 @@
+module DiscoApp::Concerns::UserAuthenticatedController
+  extend ActiveSupport::Concern
+  include ShopifyApp::LoginProtection
+
+  included do
+    before_action :shopify_user
+  end
+
+  private
+
+    def shopify_user
+      @user = DiscoApp::User.find(session[:shopify_user])
+      rescue ActiveRecord::RecordNotFound
+        redirect_to disco_app.new_user_session_path
+    end
+
+end

data/app/controllers/disco_app/user_sessions_controller.rb

@@ -0,0 +1,57 @@
+class DiscoApp::UserSessionsController < ApplicationController
+  include DiscoApp::Concerns::AuthenticatedController
+
+  def new
+    authenticate if sanitized_shop_name.present?
+  end
+
+  def create
+    authenticate
+  end
+
+  def callback
+    if auth_hash
+      login_user
+      redirect_to return_address
+    else
+      redirect_to root_path
+    end
+  end
+
+  def destroy
+    session[:shopify_user] = nil
+    redirect_to root_path
+  end
+
+  protected
+
+    def auth_hash
+      request.env['omniauth.auth']
+    end
+
+    def associated_user(auth_hash)
+      auth_hash['extra']['associated_user']
+    end
+
+    def authenticate
+      if sanitized_shop_name.present?
+        fullpage_redirect_to "#{main_app.root_path}auth/shopify_user?shop=#{sanitized_shop_name}"
+      else
+        redirect_to return_address
+      end
+    end
+
+    def login_user
+      @user = DiscoApp::User.create_user(associated_user(auth_hash), @shop)
+      session[:shopify_user] = @user.id
+    end
+
+    def return_address
+      session.delete(:return_to) || main_app.root_url
+    end
+
+    def sanitized_shop_name
+      @shop.shopify_domain
+    end
+
+end

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

@@ -14,7 +14,7 @@ module DiscoApp::Concerns::AppInstalledJob
   # - Perform initial update of shop information.
   # - Subscribe to default plan, if any exists.
   #
-  def perform(shop, plan_code = nil, source = nil)
+  def perform(_shop, plan_code = nil, source = nil)
     DiscoApp::SynchroniseWebhooksJob.perform_now(@shop)
     DiscoApp::SynchroniseCarrierServiceJob.perform_now(@shop)
     DiscoApp::ShopUpdateJob.perform_now(@shop)

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

@@ -12,7 +12,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/render_asset_group_job.rb

@@ -1,7 +1,7 @@
 module DiscoApp::Concerns::RenderAssetGroupJob
   extend ActiveSupport::Concern
 
-  def perform(shop, instance, asset_group)
+  def perform(_shop, instance, asset_group)
     instance.render_asset_group(asset_group.to_sym)
   end
 

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

@@ -2,7 +2,7 @@ module DiscoApp::Concerns::ShopUpdateJob
   extend ActiveSupport::Concern
 
   # Perform an update of the current shop's information.
-  def perform(shop, shop_data = nil)
+  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)
 

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

@@ -1,7 +1,7 @@
 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

@@ -2,7 +2,7 @@ module DiscoApp::Concerns::SynchroniseCarrierServiceJob
   extend ActiveSupport::Concern
 
   # Ensure that any carrier service required by our app is registered.
-  def perform(shop)
+  def perform(_shop)
     # Don't proceed unless we have a name and callback url.
     return unless carrier_service_name and callback_url
 

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

@@ -1,7 +1,7 @@
 module DiscoApp::Concerns::SynchroniseResourcesJob
   extend ActiveSupport::Concern
 
-  def perform(shop, class_name, params)
+  def perform(_shop, class_name, params)
     klass = class_name.constantize
 
     klass::SHOPIFY_API_CLASS.find(:all, params: params).map do |shopify_resource|

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

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

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

@@ -3,7 +3,7 @@ module DiscoApp::Concerns::SynchroniseWebhooksJob
 
   # Ensure the webhooks registered with our shop are the same as those listed
   # in our application configuration.
-  def perform(shop)
+  def perform(_shop)
     # Get the full list of expected webhook topics.
     expected_topics = [:'app/uninstalled', :'shop/update'] + (DiscoApp.configuration.webhook_topics || [])
 

data/app/jobs/disco_app/send_subscription_job.rb

@@ -1,6 +1,6 @@
 class DiscoApp::SendSubscriptionJob < DiscoApp::ShopJob
 
-  def perform(shop)
+  def perform(_shop)
     @shop.disco_api_client.create_app_subscription
   end
 

data/app/jobs/disco_app/shop_job.rb

@@ -2,6 +2,9 @@
 # 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 < ActiveJob::Base
 
   queue_as :default
@@ -19,9 +22,13 @@ class DiscoApp::ShopJob < ActiveJob::Base
     end
 
     def shop_context(job, block)
-      @shop.with_api_context {
-        block.call(job.arguments)
-      }
+      Rollbar.scoped(rollbar_scope) do
+        @shop.with_api_context { block.call(job.arguments) }
+      end
+    end
+
+    def rollbar_scope
+      { person: { id: @shop.id, username: @shop.shopify_domain } }
     end
 
 end

data/app/jobs/disco_app/synchronise_users_job.rb

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

data/app/models/disco_app/concerns/shop.rb

@@ -9,6 +9,9 @@ module DiscoApp::Concerns::Shop
     has_many :subscriptions
     has_many :plans, through: :subscriptions
 
+    # Define relationship to users.
+    has_many :users
+
     # Define relationship to sessions.
     has_many :sessions, class_name: 'DiscoApp::Session', dependent: :destroy
 
@@ -19,6 +22,7 @@ module DiscoApp::Concerns::Shop
     scope :status, -> (status) { where status: status }
     scope :installed, -> { where status: statuses[:installed] }
     scope :has_active_shopify_plan, -> { where.not(plan_name: [:cancelled, :frozen, :fraudulent]) }
+    scope :shopify_plus, -> { where(plan_name: :shopify_plus) }
 
     # Alias 'with_shopify_session' as 'with_api_context' for better readability, but also as 'temp' for
     # backward compatibility.
@@ -27,7 +31,7 @@ module DiscoApp::Concerns::Shop
 
     # Return true if the shop is considered as in development mode.
     def development?
-      ['staff', 'custom', 'affiliate'].include?(plan_name)
+      ['staff', 'affiliate'].include?(plan_name)
     end
 
     # Convenience method to check if this shop has a current subscription.
@@ -63,7 +67,7 @@ module DiscoApp::Concerns::Shop
 
     # Convenience method to get the email of the shop's admin, to display in Rollbar.
     def email
-      self.data['email']
+      data[:email]
     end
 
     def installed_duration
@@ -74,7 +78,7 @@ module DiscoApp::Concerns::Shop
     # shop's "data" hash, return the default Rails zone (which should be UTC).
     def time_zone
       @time_zone ||= begin
-        Time.find_zone!(data['timezone'].to_s.gsub(/^\(.+\)\s/, ''))
+        Time.find_zone!(data[:timezone].to_s.gsub(/^\(.+\)\s/, ''))
       rescue ArgumentError
         Time.zone
       end
@@ -83,7 +87,7 @@ module DiscoApp::Concerns::Shop
     # Return the shop's configured locale as a symbol. If none exists for some
     # reason, 'en' is returned.
     def locale
-      (data['primary_locale'] || 'en').to_sym
+      (data[:primary_locale] || 'en').to_sym
     end
 
     # Return an instance of the Disco API client.
@@ -91,6 +95,11 @@ module DiscoApp::Concerns::Shop
       @api_client ||= DiscoApp::ApiClient.new(self, ENV['DISCO_API_URL'])
     end
 
+    # Override the "read" data attribute to allow indifferent access.
+    def data
+      read_attribute(:data).with_indifferent_access
+    end
+
   end
 
 end

data/app/models/disco_app/concerns/source.rb

@@ -0,0 +1,14 @@
+module DiscoApp::Concerns::Source
+  extend ActiveSupport::Concern
+
+  included do
+
+    has_many :subscriptions
+    has_many :shops, through: :subscriptions
+
+    validates_presence_of :source
+    validates_presence_of :name
+
+  end
+
+end

data/app/models/disco_app/concerns/subscription.rb

@@ -6,7 +6,7 @@ module DiscoApp::Concerns::Subscription
     belongs_to :shop
     belongs_to :plan
     belongs_to :plan_code
-
+    belongs_to :source
     has_many :one_time_charges, class_name: 'DiscoApp::ApplicationCharge', dependent: :destroy
     has_many :recurring_charges, class_name: 'DiscoApp::RecurringApplicationCharge', dependent: :destroy
 

data/app/models/disco_app/concerns/synchronises.rb

@@ -58,4 +58,13 @@ module DiscoApp::Concerns::Synchronises
 
   end
 
+  included do
+
+    # Override the "read" data attribute to allow indifferent access.
+    def data
+      read_attribute(:data).with_indifferent_access
+    end
+
+  end
+
 end

data/app/models/disco_app/concerns/taggable.rb

@@ -2,15 +2,19 @@ module DiscoApp::Concerns::Taggable
   extend ActiveSupport::Concern
 
   def tags
-    data['tags'].split(',').map(&:strip)
+    data[:tags].split(',').map(&:strip)
   end
 
   def add_tag(tag)
-    data['tags'] = (tags + [tag]).uniq.join(',')
+    data[:tags] = (tags + [tag]).uniq.join(',')
   end
 
   def remove_tag(tag)
-    data['tags'] = (tags - [tag]).uniq.join(',')
+    data[:tags] = (tags - [tag]).uniq.join(',')
+  end
+
+  def has_tag?(tag_to_check)
+    tags.any? { |tag| tag.casecmp(tag_to_check) }
   end
 
 end

data/app/models/disco_app/concerns/user.rb

@@ -0,0 +1,20 @@
+module DiscoApp::Concerns::User
+  extend ActiveSupport::Concern
+
+  included do
+    belongs_to :shop
+
+    def self.create_user(shopify_user, shop)
+      user = self.find_or_create_by!(id: shopify_user.id, shop: shop)
+      user.update(
+        first_name: shopify_user.first_name || '',
+        last_name: shopify_user.last_name || '',
+        email: shopify_user.email
+      )
+      user
+    rescue ActiveRecord::RecordNotUnique, PG::UniqueViolation
+      retry
+    end
+
+  end
+end

data/app/models/disco_app/source.rb

@@ -0,0 +1,3 @@
+class DiscoApp::Source < ActiveRecord::Base
+  include DiscoApp::Concerns::Source
+end

data/app/models/disco_app/user.rb

@@ -0,0 +1,3 @@
+class DiscoApp::User < ActiveRecord::Base
+  include DiscoApp::Concerns::User
+end

data/app/resources/disco_app/admin/resources/concerns/shop_resource.rb

@@ -46,19 +46,19 @@ module DiscoApp::Admin::Resources::Concerns::ShopResource
     end
 
     def email
-      @model.data['email']
+      @model.data[:email]
     end
 
     def country_name
-      @model.data['country_name']
+      @model.data[:country_name]
     end
 
     def currency
-      @model.data['currency']
+      @model.data[:currency]
     end
 
     def plan_display_name
-      @model.data['plan_display_name']
+      @model.data[:plan_display_name]
     end
 
     def current_subscription_id

data/app/services/disco_app/subscription_service.rb

@@ -2,7 +2,7 @@ class DiscoApp::SubscriptionService
 
   # Subscribe the given shop to the given plan, optionally using the given plan
   # code and optionally tracking the subscription source.
-  def self.subscribe(shop, plan, plan_code = nil, source = nil)
+  def self.subscribe(shop, plan, plan_code = nil, source_name = nil)
 
     # If a plan code was provided, fetch it for the given plan.
     plan_code_instance = nil
@@ -10,6 +10,12 @@ class DiscoApp::SubscriptionService
       plan_code_instance = DiscoApp::PlanCode.available.find_by(plan: plan, code: plan_code)
     end
 
+    # If a source name has been provided, fetch or create it
+    source_instance = nil
+    if source_name.present?
+      source_instance = DiscoApp::Source.find_or_create_by(source: source_name)
+    end
+
     # Cancel any existing current subscriptions.
     shop.subscriptions.current.update_all(
       status: DiscoApp::Subscription.statuses[:cancelled],
@@ -33,7 +39,7 @@ class DiscoApp::SubscriptionService
       trial_period_days: plan.has_trial? ? subscription_trial_period_days : nil,
       trial_start_at: plan.has_trial? ? Time.now : nil,
       trial_end_at: plan.has_trial? ? subscription_trial_period_days.days.from_now : nil,
-      source: source
+      source: source_instance
     )
 
     # Enqueue the subscription changed background job.