disco_app 0.13.6.pre.puma.pre.3 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bf27c28d441f98e6eefdc7809f69daca79c75604
-  data.tar.gz: 9686a13bb881a26dd0185eb5f7673c211c8eebb5
+SHA256:
+  metadata.gz: 970c527220c6ea8c650c51f80c6b1e68eee859d86d5652330eb9577d4a4ce2ad
+  data.tar.gz: ac39e32ed7ec03b2244b8efdcfb9e32f9ee8c0fdcfbeb60d186e80785e390cce
 SHA512:
-  metadata.gz: f4a2afea46cb6cbbf4e33baf5cbeb2b533ba6f9b9032b40f6a76d984a18977179fedf1fc656c1f750fc383e54906cb824f633447b7481f42267950c7ad921d16
-  data.tar.gz: 8f90a604e1a61b4b9b5f617dbd7d77a0406ccca51d82d6ab46638b2ab1293b3b1483031a2e33051cf0770a46dbf8b44bc33ab7aaf79fd947bf9c034064ca474b
+  metadata.gz: 1ca38662339da5af03b15600f934cafd63c9335a07394af5f813fb17cec8005e30f20d2c204754573bdbd44705175e5e04c1164b89fa9b3eacab47d4f567aee2
+  data.tar.gz: 3804a7bd20cbf1eec6012af974b4dc91fac66b1cd219a86cc005b799f3d88b2d611ea208c9c39c118fcf88aab846895aab6fe408bb560668246d2ee5b715776d

data/app/clients/disco_app/rollbar_client.rb

@@ -0,0 +1,53 @@
+require 'rest-client'
+
+class DiscoApp::RollbarClient
+
+  API_URL = 'https://api.rollbar.com/api/1'
+  CREATE_PROJECT_ENDPOINT = '/projects'
+  ACCESS_TOKEN_ENDPOINT = '/project'
+  ACCESS_TOKEN_SCOPE = 'post_server_item'
+
+  def initialize(params)
+    @write_access_token = params[:write_account_access_token]
+    @read_access_token = params[:read_account_access_token]
+  end
+
+  # Create project on Rollbar, returns it new post server side access token
+  def create_project(name)
+    begin
+      response = RestClient::Request.execute(
+        method: :post,
+        headers: { content_type: :json },
+        url: create_api_url,
+        payload: { name: name.parameterize }.to_json
+      )
+      request_access_token(ActiveSupport::JSON.decode(response).dig('result', 'id'))
+    rescue RestClient::BadRequest => e
+      raise RollbarClientError.new(e.message)
+    end
+  end
+
+  private
+
+    def request_access_token(project_id)
+      begin
+        response = RestClient.get(access_tokens_api_url(project_id))
+        # Only return post_server_item server side access token
+        post_server_access_token(ActiveSupport::JSON.decode(response)['result'])
+      rescue RestClient::BadRequest => e
+        raise RollbarClientError.new(e.message)
+      end
+    end
+
+    def create_api_url
+      API_URL + CREATE_PROJECT_ENDPOINT + "?access_token=#{@write_access_token}"
+    end
+
+    def access_tokens_api_url(project_id)
+      API_URL + ACCESS_TOKEN_ENDPOINT + "/#{project_id}/access_tokens?access_token=#{@read_access_token}"
+    end
+
+    def post_server_access_token(results)
+      results.select { |x| x['name'] == ACCESS_TOKEN_SCOPE }.first['access_token']
+    end
+end

data/app/clients/disco_app/rollbar_client_error.rb

@@ -0,0 +1,2 @@
+class RollbarClientError < StandardError
+end

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

@@ -20,7 +20,7 @@ module DiscoApp::Concerns::AppProxyController
     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?) and DiscoApp.configuration.skip_proxy_verification?
       DiscoApp::ProxyService.proxy_signature_is_valid?(request.query_string, ShopifyApp.configuration.secret)
     end
 

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

@@ -4,12 +4,13 @@ module DiscoApp::Concerns::AuthenticatedController
 
   included do
     before_action :auto_login
+    before_action :check_shop_whitelist
     before_action :login_again_if_different_shop
     before_action :shopify_shop
     before_action :check_installed
     before_action :check_current_subscription
     before_action :check_active_charge
-    around_filter :shopify_session
+    around_action :shopify_session
     layout 'embedded_app'
   end
 
@@ -68,4 +69,12 @@ module DiscoApp::Concerns::AuthenticatedController
       DiscoApp::RequestValidationService.hmac_valid?(request.query_string, ShopifyApp.configuration.secret)
     end
 
+    def check_shop_whitelist
+      if shop_session
+        if ENV['WHITELISTED_DOMAINS'].present? && !ENV['WHITELISTED_DOMAINS'].include?(shop_session.url)
+          redirect_to_login
+        end
+      end
+    end
+
 end

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

@@ -10,8 +10,8 @@ module DiscoApp::Concerns::UserAuthenticatedController
 
     def shopify_user
       @user = DiscoApp::User.find(session[:shopify_user])
-      rescue ActiveRecord::RecordNotFound
-        redirect_to disco_app.new_user_session_path
+    rescue ActiveRecord::RecordNotFound
+      redirect_to disco_app.new_user_session_path
     end
 
 end

data/app/controllers/disco_app/user_sessions_controller.rb

@@ -51,7 +51,7 @@ class DiscoApp::UserSessionsController < ApplicationController
     end
 
     def sanitized_shop_name
-      @shop.shopify_domain
+      @shop.present? ? @shop.shopify_domain : super
     end
 
 end

data/app/controllers/disco_app/webhooks_controller.rb

@@ -25,7 +25,7 @@ module DiscoApp
       data = ActiveSupport::JSON::decode(request.body.read).with_indifferent_access
       job_class.perform_later(shopify_domain, data)
 
-      render nothing: true
+      render body: nil
     end
 
     private

data/app/controllers/sessions_controller.rb

@@ -1,4 +1,4 @@
-class SessionsController < ApplicationController
+class SessionsController < ActionController::Base
   include ShopifyApp::SessionsConcern
 
   def referral

data/app/jobs/application_job.rb

@@ -0,0 +1,2 @@
+class ApplicationJob < ActiveJob::Base
+end

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

@@ -1,19 +1,20 @@
 module DiscoApp::Concerns::SynchroniseWebhooksJob
   extend ActiveSupport::Concern
 
+  COMMON_WEBHOOKS = [:'app/uninstalled', :'shop/update']
+
   # Ensure the webhooks registered with our shop are the same as those listed
   # in our application configuration.
   def perform(_shop)
-    # Get the full list of expected webhook topics.
-    expected_topics = [:'app/uninstalled', :'shop/update'] + (DiscoApp.configuration.webhook_topics || [])
-
-    # Registered any webhooks that haven't been registered yet.
+    # Register any webhooks that haven't been registered yet.
     (expected_topics - current_topics).each do |topic|
-      ShopifyAPI::Webhook.create(
-        topic: topic,
-        address: webhooks_url,
-        format: 'json'
-      )
+      with_verbose_output(topic) do
+        ShopifyAPI::Webhook.create(
+          topic: topic,
+          address: webhooks_url,
+          format: 'json',
+        )
+      end
     end
 
     # Remove any extraneous topics.
@@ -34,6 +35,11 @@ module DiscoApp::Concerns::SynchroniseWebhooksJob
 
   private
 
+    # Get the full list of expected webhook topics.
+    def expected_topics
+      COMMON_WEBHOOKS + (DiscoApp.configuration.webhook_topics || [])
+    end
+
     # Return a list of currently registered topics.
     def current_topics
       current_webhooks.map(&:topic).map(&:to_sym)
@@ -49,4 +55,15 @@ module DiscoApp::Concerns::SynchroniseWebhooksJob
       DiscoApp::Engine.routes.url_helpers.webhooks_url
     end
 
+    def with_verbose_output(topic)
+      print "\n#{topic}"
+      shopify_response = yield
+      if shopify_response.errors.blank?
+        print " - registered successfully\n"
+      else
+        print " - not registered\n"
+        puts shopify_response.errors.messages
+      end
+    end
+
 end

data/app/jobs/disco_app/shop_job.rb

@@ -5,7 +5,7 @@
 
 require 'rollbar'
 
-class DiscoApp::ShopJob < ActiveJob::Base
+class DiscoApp::ShopJob < ApplicationJob
 
   queue_as :default
 

data/app/models/application_record.rb

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

data/app/models/disco_app/app_settings.rb

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

data/app/models/disco_app/application_charge.rb

@@ -1,9 +1,15 @@
-class DiscoApp::ApplicationCharge < ActiveRecord::Base
+class DiscoApp::ApplicationCharge < ApplicationRecord
 
   belongs_to :shop
   belongs_to :subscription
 
-  enum status: [:pending, :accepted, :declined, :expired, :active]
+  enum status: {
+    pending: 0,
+    accepted: 1,
+    declined: 2,
+    expired: 3,
+    active: 4,
+  }
 
   scope :active, -> { where status: statuses[:active] }
 

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

@@ -5,14 +5,15 @@ module DiscoApp::Concerns::CanBeLiquified
 
   included do
 
-    # Return this model as an array of Liquid {% assign %} statements.
+    # Return this model as a hash for use with `to_liquid`. Returns `as_json` by default but is provided here as a hook
+    # for potential overrides.
     def as_liquid
-      as_json.map { |k, v| "{% assign #{liquid_model_name}_#{k} = #{as_liquid_value(k, v)} %}" }
+      as_json
     end
 
-    # Render this model as a series of concatenated Liquid {% assign %} statements.
+    # Render this model as a series of concatenated Liquid {%- assign -%} statements.
     def to_liquid
-      as_liquid.join("\n")
+      as_liquid.map { |k, v| "{%- assign #{liquid_model_name}_#{k} = #{as_liquid_value(k, v)} -%}" }.join("\n")
     end
 
     # Method to allow override of the model name in Liquid. Useful for models

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

@@ -9,9 +9,18 @@ module DiscoApp::Concerns::Plan
 
     accepts_nested_attributes_for :plan_codes, allow_destroy: true
 
-    enum status: [:available, :unavailable]
-    enum plan_type: [:recurring, :one_time]
-    enum interval: [:month, :year]
+    enum status: {
+      available: 0,
+      unavailable: 1
+    }
+    enum plan_type: {
+      recurring: 0,
+      one_time: 1
+    }
+    enum interval: {
+      month: 0,
+      year: 1
+    }
 
     scope :available, -> { where status: statuses[:available] }
 

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

@@ -5,7 +5,10 @@ module DiscoApp::Concerns::PlanCode
 
     belongs_to :plan
 
-    enum status: [:available, :unavailable]
+    enum status: {
+      available: 0,
+      unavailable: 1
+    }
 
     validates_presence_of :code
     validates_presence_of :amount

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

@@ -16,7 +16,15 @@ module DiscoApp::Concerns::Shop
     has_many :sessions, class_name: 'DiscoApp::Session', dependent: :destroy
 
     # Define possible installation statuses as an enum.
-    enum status: [:never_installed, :awaiting_install, :installing, :installed, :awaiting_uninstall, :uninstalling, :uninstalled]
+    enum status: {
+      never_installed: 0,
+      awaiting_install: 1,
+      installing: 2,
+      installed: 3,
+      awaiting_uninstall: 4,
+      uninstalling: 5,
+      uninstalled: 6
+    }
 
     # Define some useful scopes.
     scope :status, -> (status) { where status: status }

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

@@ -5,13 +5,20 @@ module DiscoApp::Concerns::Subscription
 
     belongs_to :shop
     belongs_to :plan
-    belongs_to :plan_code
-    belongs_to :source
+    belongs_to :plan_code, optional: true
+    belongs_to :source, optional: true
     has_many :one_time_charges, class_name: 'DiscoApp::ApplicationCharge', dependent: :destroy
     has_many :recurring_charges, class_name: 'DiscoApp::RecurringApplicationCharge', dependent: :destroy
 
-    enum status: [:trial, :active, :cancelled]
-    enum subscription_type: [:recurring, :one_time]
+    enum status: {
+      trial: 0,
+      active: 1,
+      cancelled: 2
+    }
+    enum subscription_type: {
+      recurring: 0,
+      one_time: 1
+    }
 
     scope :current, -> { where status: [statuses[:trial], statuses[:active]] }
 

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

@@ -45,7 +45,7 @@ module DiscoApp::Concerns::Synchronises
 
       return unless should_synchronise_deletion?(shop, data)
 
-      self.destroy_all(shop: shop, id: data[:id])
+      self.where(shop: shop, id: data[:id]).destroy_all
     end
 
     def synchronise_all(shop, params = {})

data/app/models/disco_app/plan.rb

@@ -1,3 +1,3 @@
-class DiscoApp::Plan < ActiveRecord::Base
+class DiscoApp::Plan < ApplicationRecord
   include DiscoApp::Concerns::Plan
 end

data/app/models/disco_app/plan_code.rb

@@ -1,3 +1,3 @@
-class DiscoApp::PlanCode < ActiveRecord::Base
+class DiscoApp::PlanCode < ApplicationRecord
   include DiscoApp::Concerns::PlanCode
 end

data/app/models/disco_app/recurring_application_charge.rb

@@ -1,9 +1,16 @@
-class DiscoApp::RecurringApplicationCharge < ActiveRecord::Base
+class DiscoApp::RecurringApplicationCharge < ApplicationRecord
 
   belongs_to :shop
   belongs_to :subscription
 
-  enum status: [:pending, :accepted, :declined, :active, :cancelled, :expired]
+  enum status: {
+    pending: 0,
+    accepted: 1,
+    declined: 2,
+    active: 3,
+    cancelled: 4,
+    expired: 5
+  }
 
   scope :active, -> { where status: statuses[:active] }
 

data/app/models/disco_app/shop.rb

@@ -1,3 +1,3 @@
-class DiscoApp::Shop < ActiveRecord::Base
+class DiscoApp::Shop < ApplicationRecord
   include DiscoApp::Concerns::Shop
 end

data/app/models/disco_app/source.rb

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

data/app/models/disco_app/subscription.rb

@@ -1,3 +1,3 @@
-class DiscoApp::Subscription < ActiveRecord::Base
+class DiscoApp::Subscription < ApplicationRecord
   include DiscoApp::Concerns::Subscription
 end

data/app/models/disco_app/user.rb

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

data/app/services/disco_app/partner_app_service.rb

@@ -0,0 +1,151 @@
+module DiscoApp
+  class PartnerAppService
+
+    def initialize(params)
+      @email = params[:email]
+      @password = params[:password]
+      @app_name = params[:app_name]
+      @app_url = params[:app_url]
+      @organization = params[:organization]
+
+      @agent = Mechanize.new do |a|
+        a.user_agent_alias = 'Mac Safari'
+        a.follow_meta_refresh = true
+        a.keep_alive = false
+        a.pre_connect_hooks << lambda do |_agent, request|
+          request['Accept'] = 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'
+        end
+      end
+    end
+
+    def generate_partner_app
+      begin
+        # Login to Shopify Partners
+        login
+        # Access Partner dashboard
+        org_link = organizations
+        dashboard = dashboard_page(org_link)
+        # Create App
+        apps_page = refresh_page(dashboard)
+        create_partner_app(apps_page)
+        # Configure newly created app with embedded app use
+        apps_page = refresh_page(dashboard)
+        embedded_admin_app(apps_page)
+        # Add Disco App icon
+        apps_page = refresh_page(dashboard)
+        add_disco_icon(apps_page)
+        # Fetch API credentials
+        apps_page = refresh_page(dashboard)
+        api_key, secret = api_credentials(apps_page)
+      rescue Mechanize::Error => e
+        puts 'Error while trying to create partner app'
+        puts "Error #{e}, message : #{e.message}"
+        return
+      end
+      # Add them to .env.local file
+      append_credentials(api_key, secret)
+      puts '#' * 80
+      puts 'New Partner App successfully created!'
+      puts 'API Credentials have been pasted to your .env.local file'
+      puts '#' * 80
+    end
+
+    private
+
+      def login
+        @agent.get('https://accounts.shopify.com/login') do |page|
+          page.form do |form|
+            form['account[email]'] = @email
+            form['account[password]'] = @password
+          end.submit
+        end
+      end
+
+      def organizations
+        organizations = @agent.get('https://partners.shopify.com/organizations/')
+        organizations.links.select { |link| link.text[/#{@organization}/] }.first.href
+      end
+
+      def dashboard_page(org_link)
+        @agent.get('https://partners.shopify.com' + org_link)
+      end
+
+      def create_partner_app(apps_page)
+        apps_page.form do |form|
+          # App name
+          form['create_form[title]'] = @app_name
+
+          # App URL
+          form['create_form[application_url]'] = @app_url
+
+          # Accept TOS
+          unless form['create_form[accepted]'].blank?
+            form['create_form[accepted]'] = '1'
+            form.hiddens.last.value = 1
+          end
+        end.submit
+      end
+
+      def api_credentials(apps_page)
+        app = apps_page.link_with(text: @app_name).click
+        app_info = app.link_with(text: 'App info').click
+        add_whitelist_url(app_info)
+        api_key = app_info.search('#api_key').first.values[3]
+        secret = app_info.search('#settings_form_secrets').first.values[3]
+        [api_key, secret]
+      end
+
+      def embedded_admin_app(apps_page)
+        app = apps_page.link_with(text: @app_name).click
+        extensions = app.link_with(text: 'Extensions').click
+        extensions.form do |form|
+          form['extensions_form[embedded]'] = '1'
+        end.submit
+      end
+
+      def add_disco_icon(apps_page)
+        app = apps_page.link_with(text: @app_name).click
+        app_info = app.link_with(text: 'App info').click
+        logo = DiscoApp::Engine.root.join('app', 'assets', 'images', 'disco_app', 'logo.png').to_s
+        app_info.form do |form|
+          form.file_uploads.first.file_name = logo
+        end.submit
+      end
+
+      # Write credentials of newly created app to .env.local file
+      def append_credentials(api_key, secret)
+        original_file = '.env.local'
+        new_file = original_file + '.new'
+        File.open(new_file, 'w') do |file|
+          File.foreach(original_file) do |line|
+            if line.include?('SHOPIFY_APP_API_KEY')
+              file.puts "SHOPIFY_APP_API_KEY=#{api_key}"
+            elsif line.include?('SHOPIFY_APP_SECRET')
+              file.puts "SHOPIFY_APP_SECRET=#{secret}"
+            else
+              file.puts line
+            end
+          end
+        end
+        File.delete(original_file)
+        File.rename(new_file, original_file)
+      end
+
+      def add_whitelist_url(app_info)
+        app_info.form do |form|
+          form['info_form[redirect_url_whitelist]'] = callback_url
+        end.submit
+      end
+
+      # Access the "Apps" section of the dashboard, also used to reload the dashboard
+      # When an action has been taken
+      def refresh_page(dashboard)
+        dashboard.link_with(text: '  Apps').click
+      end
+
+      def callback_url
+        [@app_url + '/auth/shopify/callback', @app_url + '/auth/shopify_user/callback'].join("\n")
+      end
+
+  end
+end

data/db/migrate/20150525000000_create_shops_if_not_existent.rb

@@ -1,7 +1,7 @@
 ##
 # While this migration file is called "create shops if not existent", it's actually a reset of all `disco_app`
 # migrations up until 23 January 2017. It's kept its name like this to ensure compatibility across upgraded apps.
-class CreateShopsIfNotExistent < ActiveRecord::Migration
+class CreateShopsIfNotExistent < ActiveRecord::Migration[5.1]
 
   def change
     return if table_exists? :disco_app_shops

data/db/migrate/20170315062548_create_disco_app_sources.rb

@@ -1,4 +1,4 @@
-class CreateDiscoAppSources < ActiveRecord::Migration
+class CreateDiscoAppSources < ActiveRecord::Migration[5.1]
   def change
     create_table :disco_app_sources do |t|
       t.string :source, null: true

data/db/migrate/20170315062629_add_sources_to_shop_subscriptions.rb

@@ -1,4 +1,4 @@
-class AddSourcesToShopSubscriptions < ActiveRecord::Migration
+class AddSourcesToShopSubscriptions < ActiveRecord::Migration[5.1]
   def change
     add_column :disco_app_subscriptions, :source_id, :integer, limit: 8, index: true
     add_foreign_key :disco_app_subscriptions, :disco_app_sources, column: :source_id

data/db/migrate/20170327214540_create_disco_app_users.rb

@@ -1,4 +1,4 @@
-class CreateDiscoAppUsers < ActiveRecord::Migration
+class CreateDiscoAppUsers < ActiveRecord::Migration[5.1]
   def change
     create_table :disco_app_users do |t|
       t.integer :shop_id, limit: 8

data/db/migrate/20170606160751_fix_disco_app_users_index.rb

@@ -1,4 +1,4 @@
-class FixDiscoAppUsersIndex < ActiveRecord::Migration
+class FixDiscoAppUsersIndex < ActiveRecord::Migration[5.1]
   def change
     remove_index :disco_app_users, :shop_id
     add_index :disco_app_users, [:id, :shop_id], unique: true

data/lib/disco_app/version.rb

@@ -1,3 +1,3 @@
 module DiscoApp
-  VERSION = '0.13.6-puma-3'
+  VERSION = '0.14.0'
 end