disco_app 0.12.1 → 0.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2401e1d7eeec9114ac838e4088b2e16d6ae65fffaf41c72da24b4b5c3fd83465
-  data.tar.gz: 469f667d5e2d7b90028a849741df422dc967336f4237623853710e1f315cf096
+  metadata.gz: ca27fe14e53f4e34f76940c75b601e8534f3b0fc30a2fc668951793e0ab05846
+  data.tar.gz: def89441dbebd476d9efac4889b6854ff2e5e32d7192154b391b4d8144da26ce
 SHA512:
-  metadata.gz: b355b0add784a4b96df01e6c98353cae3b5014f3ebef5a35515fd77ceb4dafb02e5ce30d35725450e88d1422b7dd91fddb8a9235f1c8f35c66cfcea0f82fea2d
-  data.tar.gz: 8100d4775f5cbbc54847c5fe58de4ec8857ffcb2c0eea89e05534e8065c4d6a48b693aae9e211d03a788e8c85e2e134e01a0d062fc2745f69ee2b7ae9236d752
+  metadata.gz: 8bce10166c303ac988305dee9c40acb2d7ce05eff63c368144f3941784e7ef51e970c42b8350702b0e3075f65e8ed3a56ef99921d8705edea4b00c263e0cac2e
+  data.tar.gz: 73055ae6330d43924b75aaad82044afe09ecffb91964b7a13b2e3b2d9b748619af3a541adf0877d1820d93bed717416b62312d003219f6b2526eb9ef3dabb41d

data/app/assets/components/shopify/buttons/_buttons.scss

@@ -226,6 +226,7 @@
   cursor: default;
   color: transparent;
   text-shadow: none;
+  background: #fff url(data:image/gif;base64,R0lGODlhEAAQAPUAAC8vL3Z2dpSUlKWlpa2trbW1tb29vcbGxs7OztbW1t7e3ufn5%2B%2Fv7%2Ff39%2F%2F%2F%2F%2F%2F%2F%2Fz09PXNzc4uLizk5OX9%2Ffzo6On19fZiYmEFBQW9vbzw8PEBAQGtrazU1NWdnZ4GBgSUlJWRkZJCQkD4%2BPj8%2FPy4uLo2NjQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH%2FC05FVFNDQVBFMi4wAwH%2F%2FwAh%2BQQJBgAPACwAAAAAEAAQAAAEifDJ52QJdeq3QnoC4DSFsnFAAAIPMizaAheAEbrI0yyOEwSGRkCAKAwIO2PjoQikGktK4zAowCauzCTxkRgGYNNmajBQBWixhlEoEAyTBUIrUVwlUwFy8z0wKEYIUwkNDApBCUdLdhwDCUULjg8MCVokBQ4HBA9UfxsLBDCaIwRdGiMSCAYVDVoRACH5BAkGAAAALAAAAAAQABAAAAWRICACjjhE5agCS6QAEeQ0kLECTBTBECBBB9WCATgAYwnIrrFwOCQSRCMyQBgGEMaiMGiwTpKGF9BgcAsLVcKQGiUSI2sBfWscDIY7gUBfmQsENiIMCm0iCmkjDQgDBGMjVwdEDlxSBwllCgYNCY1eiF8JCGgDcAwJbQ1zDgcERQNEKwsEaa0zBHArMyJWJQ1tIQAh%2BQQJBgAAACwAAAAAEAAQAAAFkSAgAo5ICOWoAouwABTlMJSxAvQACNQ%2BHaoFA4CgJHiJSa%2BhcDgKg0RDYFAgCBNGMoszDAqNhsjRoEwmhRQLoRZRBCOEwXAYrlrzg4FAKLxWDAUFBDYiDE0rCn8iDQgDBGIqXnUkUAgNB1KHBg0Jj2KKLFEIflE4CWoNgg4HBAAHA3ZBBC%2BtZAQJN2QiciUNaiEAIfkECQYAAAAsAAAAABAAEAAABZMgIAKOaAzlqAJMsQCD5TQWsgINUcAWXNmjBQOgGCQIF0XlglM4HIWBomE4LBIGC%2BNQqTRYp0IjNbN0DSnAApEWXQYjhKE6XC0slwvBQNC9VkpdFSMMTit7Kg0IAwRfKicHQ1ADCA0HCQ2FBg0JjF8KLwtGCC5GLAlpDQUFDgcEAAcDdSoLBC%2BuMwQJNzMiciVjIyEAIfkECQYAAAAsAAAAABAAEAAABZEgIAKOiBjlqAJMwQAH4TRDsgINYcADUGQK1eKlGCgOg0WmgFM4HAVjw4BgKBASBiKTabAMg0IjNZNgMogUYJFeEZgmg%2BHwWi0kXImB8F7cFBkYZyNWaiIFByoNCAMEXiMOggMvUAMIDQcJDQwJGXeCXgp%2BCzUIBaQ7CQNqDQUFDjE8dUIEfjEzBDYrM3ElYyMhACH5BAkGAAAALAAAAAAQABAAAAWSICACjogY5agCTMEAB%2BE0hbICDWHABIAMC9XipRgoYowBArdwOArGhgHBWCgIjMSF0mAZBoVGakagXBJCRGp0OIxOhsNrxdiaDQRCIbhaUP4UIwwKayIFbiMNPwRdIw4UGhQ2T0oNBwkNCwQaCwMaGl0KQZ0JCBcFGgUACQVrNK0xAJ98QgRBMQ4LqTczJigsayEAIfkECQYAAAAsAAAAABAAEAAABZIgIAKOiBjlqAJMwQAH4TSFsgINYcAEgAwL1eKlGChijAECt3A4CsaGAcFYKAiNBbTBMgwKjdTsMCDYRgtEanRYmgyGw2vFIAy%2BBgKhEKQPJBIDIwwKayJtKg0%2FWCoOEhsSQU9KDWQKCQUcWhwcXApBC2WcBxuCR2s0BQ4cGwCsCTcLBEEbGw4LGzsrMyKcJWEjIQAh%2BQQJBgAAACwAAAAAEAAQAAAFkyAgAo6IGOWoAkzBAAfhNIWyAg1hwASADAvV4qUYKGKMAQK3cDgKxoYBwVgoCI0FtMEyDAqN1OzwDY4WiNQokRidDIfXqnEwwA0EQsGsYuR1IwwJaiZtIw0%2FHlwjDgMfAy9PXwoeQEcfDAcfH1wKQQYdBR8eCB49aGoMHR8OHh0AozYrBx02rg4MHgc3MyKjJWEjIQAh%2BQQJBgAAACwAAAAAEAAQAAAGmUCAEOAQIgzFoRLAKDAAB4KjUVAsAQ2CAUoAIAYL5eKpGCiijAECu3A4CuaGAcFYKAiNBbzBNAwKDUlTB39hQwsISUMJCUNHBgdPSw0HBpAGBAQDjUtNBVqOA4pCCoZCDCEgIHxKfpFEqiILIbILCSIMCQN4AFVQIAQiIQkhB0wJiqghDsIAwaaLIFvCDgwia0tTQgMiRYFDQQAh%2BQQJBgAAACwAAAAAEAAQAAAGmECAEOAQIgzFoRLAKDAAB4KjUVAsAQ2CAUoAIAYL5eKpGCiijAECu3A4CuaGAcFYKAiNBbzBNAwKDUlTB39hQwciSUMJCUMZIyMZa0sNBwYGiBmaB1dNBVqLBYpCCoZCDCKQfEp%2BB08OjyILIgQMDAkGDQkDeFCcCSOfImWNt4oNmg4DIgB%2BT0sLkgDLDgwEjUtTQn5FgUNBACH5BAkGAAAALAAAAAAQABAAAAaVQIAQ4BAiDMWhEsAoMAAHgqNRUCwBDYIBSgAgBgvlwfpVRBkDBHbhcERIA0bkwFgoCI1FYdAALEQkJAx9RA0HAwVhQwciSUMJCUMiEZSRS4YGBgdvgQdXTQVaQwpISwqKQg0DJBGEQwYDdERvcVoMDKQNCQN4XmoKcwaJA5EMCY4NIo0GXYdPS3%2BRzFMElkpTRqUNjkEAIfkECQYAAAAsAAAAABAAEAAABptAgBDgECIMxaESoCghAAeCo1FQLAGMUglKACAGC2XCeigRzozBs7FwODLmRiaTWCgI7MKgAUjAMw18RA0HAwVhQwcmSUMJCUMDJpJWS4QGBopzdFcMBQUEBkMLCIxCCohCDQaSgkMGAwcMRAMZBQwHCQ0MCgYNCQN4Xo8LAwkIh8VYCYxUBQ5RUAOySwsEYVFTBI9LU0ZIAA2MQQA7) 50% 50% no-repeat !important;
 }
 
 .btn:not(.btn-disabled).is-loading::before, .btn:not(.btn-disabled).is-loading:hover::before {

data/app/clients/disco_app/api_client.rb

@@ -0,0 +1,27 @@
+require 'rest-client'
+
+class DiscoApp::ApiClient
+
+  SUBSCRIPTION_ENDPOINT = 'app_subscriptions.json'
+
+  def initialize(shop, url)
+    @shop = shop
+    @url = url
+  end
+
+  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)
+    end
+  end
+
+end

data/app/clients/disco_app/disco_api_error.rb

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

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

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

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

@@ -1,7 +1,9 @@
 module DiscoApp::Concerns::AuthenticatedController
   extend ActiveSupport::Concern
+  include ShopifyApp::LoginProtection
 
   included do
+    before_action :auto_login
     before_action :login_again_if_different_shop
     before_action :shopify_shop
     before_action :check_installed
@@ -13,6 +15,15 @@ module DiscoApp::Concerns::AuthenticatedController
 
   private
 
+    def auto_login
+      if shop_session.nil? and request_hmac_valid?
+        if(shop =  DiscoApp::Shop.find_by_shopify_domain(sanitized_shop_name)).present?
+          session[:shopify] = shop.id
+          session[:shopify_domain] = sanitized_shop_name
+        end
+      end
+    end
+
     def shopify_shop
       if shop_session
         @shop = DiscoApp::Shop.find_by!(shopify_domain: @shop_session.url)
@@ -53,4 +64,8 @@ module DiscoApp::Concerns::AuthenticatedController
       end
     end
 
+    def request_hmac_valid?
+      DiscoApp::RequestValidationService.hmac_valid?(request.query_string, ShopifyApp.configuration.secret)
+    end
+
 end

data/app/controllers/sessions_controller.rb

@@ -1,5 +1,5 @@
 class SessionsController < ApplicationController
-  include ShopifyApp::SessionsController
+  include ShopifyApp::SessionsConcern
 
   def referral
     cookies[DiscoApp::SOURCE_COOKIE_KEY] = params[:source] if params[:source].present?
@@ -7,6 +7,11 @@ class SessionsController < ApplicationController
     redirect_to root_path
   end
 
+  def failure
+    flash[:notice] = 'There was an issue while trying to authenticate, please retry'
+    redirect_to root_path
+  end
+
   protected
 
     # Override the authenticate method to allow skipping OAuth in development

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

@@ -14,6 +14,7 @@ module DiscoApp::Concerns::AppUninstalledJob
   #
   def perform(shop, shop_data)
     DiscoApp::ChargesService.cancel_recurring_charges(@shop)
+    DiscoApp::SendSubscriptionJob.perform_later(@shop)
     @shop.sessions.delete_all
   end
 

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

@@ -2,6 +2,7 @@ module DiscoApp::Concerns::SubscriptionChangedJob
   extend ActiveSupport::Concern
 
   def perform(shop, subscription)
+    DiscoApp::SendSubscriptionJob.perform_later(@shop)
   end
 
 end

data/app/jobs/disco_app/send_subscription_job.rb

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

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

@@ -61,6 +61,11 @@ module DiscoApp::Concerns::Shop
       "https://#{shopify_domain}/admin"
     end
 
+    # Convenience method to get the email of the shop's admin, to display in Rollbar.
+    def email
+      self.data['email']
+    end
+
     def installed_duration
       distance_of_time_in_words_to_now(created_at.time)
     end
@@ -81,6 +86,11 @@ module DiscoApp::Concerns::Shop
       (data['primary_locale'] || 'en').to_sym
     end
 
+    # Return an instance of the Disco API client.
+    def disco_api_client
+      @api_client ||= DiscoApp::ApiClient.new(self, ENV['DISCO_API_URL'])
+    end
+
   end
 
 end

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

@@ -47,6 +47,12 @@ module DiscoApp::Concerns::Subscription
     recurring? ? ShopifyAPI::RecurringApplicationCharge : ShopifyAPI::ApplicationCharge
   end
 
+  def as_json(options = {})
+    super.merge(
+      'active_charge' => active_charge
+    )
+  end
+
   private
 
     # If the amount or trial period for this subscription changes, clear any

data/app/services/disco_app/request_validation_service.rb

@@ -0,0 +1,15 @@
+class DiscoApp::RequestValidationService
+
+  def self.hmac_valid?(query_string, secret)
+    query_hash = Rack::Utils.parse_query(query_string)
+    hmac = query_hash.delete('hmac').to_s
+    ActiveSupport::SecurityUtils.variable_size_secure_compare(self.calculated_hmac(query_hash, secret), hmac)
+  end
+
+  # Return the calculated hmac for the given query hash and secret.
+  def self.calculated_hmac(query_hash, secret)
+    sorted_params = query_hash.collect{ |k, v| "#{k}=#{Array(v).join(',')}" }.sort.join('&')
+    OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), secret, sorted_params)
+  end
+
+end

data/app/views/shopify_app/sessions/new.html.erb

@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Install <%= DiscoApp.configuration.app_name %></title>
+
+  <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
+
+  <%= csrf_meta_tags %>
+
+  <%= yield :extra_head %>
+</head>
+<body>
+  <%= form_tag shopify_app.login_path do %>
+    <div class="ui-empty-state">
+      <section class="ui-empty-state__section">
+        <div class="ui-empty-state__subsection">
+          <h1 class="ui-empty-state__title">Install <%= DiscoApp.configuration.app_name %></h1>
+          <h2 class="ui-empty-state__subtitle">Enter your Shopify store name below to get started.</h2>
+        </div>
+        <div class="ui-empty-state__subsection">
+          <div class="next-grid">
+            <div class="next-grid__cell" style="text-align: right;">
+              <label for="shop" class="next-input__help-text">https://</label>
+            </div>
+            <div class="next-grid__cell">
+              <input type="text" class="form-control" id="shop" name="shop" placeholder="your-store" autocomplete="off" autofocus="on" />
+            </div>
+            <div class="next-grid__cell" style="text-align: left;">
+              <label for="shop" class="next-input__help-text">.myshopify.com</label>
+            </div>
+          </div>
+        </div>
+        <div class="ui-empty-state__subsection">
+          <button type="submit" class="btn btn-large btn-primary">Install</button>
+        </div>
+      </section>
+    </div>
+  <% end %>
+
+  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
+</body>
+</html>

data/config/routes.rb

@@ -3,6 +3,7 @@ require 'sidekiq/web'
 DiscoApp::Engine.routes.draw do
 
   get 'ref', to: '/sessions#referral'
+  get '/auth/failure', to: '/sessions#failure'
 
   controller :webhooks do
     post 'webhooks' => :process_webhook, as: :webhooks

data/lib/disco_app/version.rb

@@ -1,3 +1,3 @@
 module DiscoApp
-  VERSION = '0.12.1'
+  VERSION = '0.12.5'
 end

data/lib/generators/disco_app/templates/initializers/rollbar.rb

@@ -10,6 +10,10 @@ Rollbar.configure do |config|
   # Enable delayed reporting (using Sidekiq)
   config.use_sidekiq
 
+  # Enable "Person" feature of Rollbar in the context of a "Shop"
+  config.person_method = 'current_shop'
+  config.person_username_method = 'shopify_domain'
+
   # Add custom handlers.
   config.before_process << proc do |options|
     if options[:exception].is_a?(ActiveResource::ClientError) and options[:exception].message.include?('Too Many Requests')

data/lib/generators/disco_app/templates/initializers/shopify_app.rb

@@ -1,7 +1,6 @@
 ShopifyApp.configure do |config|
   config.api_key = ENV['SHOPIFY_APP_API_KEY']
   config.secret = ENV['SHOPIFY_APP_SECRET']
-  config.redirect_uri = ENV['SHOPIFY_APP_REDIRECT_URI']
   config.scope = ENV['SHOPIFY_APP_SCOPE']
   config.embedded_app = true
 end

data/lib/tasks/api.rake

@@ -0,0 +1,10 @@
+namespace :api do
+
+  desc 'Send all subscription information to the Disco API'
+  task send_subscriptions: :environment do
+    DiscoApp::Shop.find_each do |shop|
+      DiscoApp::SendSubscriptionJob.perform_later(shop)
+    end
+  end
+
+end

data/test/clients/disco_app/api_client_test.rb

@@ -0,0 +1,22 @@
+require 'test_helper'
+
+class ApiClientTest < ActiveSupport::TestCase
+
+  def setup
+    @shop = disco_app_shops(:widget_store)
+    stub_request(:post, "https://api.discolabs.com/v1/app_subscriptions.json").
+        with(body: api_fixture('subscriptions/valid_request').to_json).
+        to_return(status: 200, body: api_fixture('subscriptions/valid_request').to_json)
+  end
+
+  def teardown
+    @shop = nil
+    WebMock.reset!
+  end
+
+  test 'Successful disco api call render correct JSON' do
+    response = @shop.disco_api_client.create_app_subscription
+    assert_equal api_fixture('subscriptions/valid_request'), JSON.parse(response.body)
+  end
+
+end

data/test/controllers/home_controller_test.rb

@@ -14,7 +14,7 @@ class HomeControllerTest < ActionController::TestCase
     @current_subscription = nil
   end
 
-  test 'non-logged in user is redirected to the login page' do
+  test 'non-logged in user is redirected to the login page if no hmac and shop domain present' do
     log_out
     get(:index)
     assert_redirected_to ShopifyApp::Engine.routes.url_helpers.login_path
@@ -89,4 +89,13 @@ class HomeControllerTest < ActionController::TestCase
     assert_response :success
   end
 
+  test 'non-logged in user is logged in if valid hmac and shop domain is present in url' do
+    log_out
+    Timecop.freeze('2017-03-08 12:44:58 +1100') do
+      hmac = 'eb49ba93a8daf8a11a04c66129faf98de1cd40f082b0ae78e79a2dfbbefb438d'
+      get(:index, { hmac: hmac, shop: 'widgets-dev.myshopify.com', timestamp: Time.now.to_i })
+      assert_response  :success
+    end
+  end
+
 end

data/test/dummy/app/controllers/application_controller.rb

@@ -1,5 +1,5 @@
 class ApplicationController < ActionController::Base
-  include ShopifyApp::Controller
+  include ShopifyApp::LoginProtection
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception

data/test/dummy/config/initializers/omniauth.rb

@@ -3,7 +3,5 @@ Rails.application.config.middleware.use OmniAuth::Builder do
     ShopifyApp.configuration.api_key,
     ShopifyApp.configuration.secret,
 
-    :redirect_uri => ShopifyApp.configuration.redirect_uri,
-
     :scope => ShopifyApp.configuration.scope
 end

data/test/dummy/config/initializers/shopify_app.rb

@@ -1,7 +1,6 @@
 ShopifyApp.configure do |config|
   config.api_key = ENV['SHOPIFY_APP_API_KEY']
   config.secret = ENV['SHOPIFY_APP_SECRET']
-  config.redirect_uri = ENV['SHOPIFY_APP_REDIRECT_URI']
   config.scope = ENV['SHOPIFY_APP_SCOPE']
   config.embedded_app = true
 end

data/test/fixtures/api/subscriptions/valid_request.json

@@ -0,0 +1,40 @@
+{
+  "shop": {
+    "id": 605094243,
+    "shopify_domain": "widgets.myshopify.com",
+    "shopify_token": "0",
+    "created_at": "2017-03-07T06:06:25.000Z",
+    "updated_at": "2017-03-07T06:06:25.000Z",
+    "status": "never_installed",
+    "domain": null,
+    "plan_name": null,
+    "name": null,
+    "data": {"timezone": "(GMT+10:00) Melbourne", "country_name": "Australia"}
+  },
+  "subscription": {
+    "id": 304261385,
+    "shop_id": 605094243,
+    "plan_id": 276395349,
+    "status": "active",
+    "subscription_type": "recurring",
+    "created_at": "2017-03-07T06:06:25.000Z",
+    "updated_at": "2017-03-07T06:06:25.000Z",
+    "trial_start_at": null,
+    "trial_end_at": null,
+    "cancelled_at": null,
+    "amount": 999,
+    "plan_code_id": null,
+    "source": null,
+    "trial_period_days": 14,
+    "active_charge": {
+      "id":332186283,
+      "shop_id":605094243,
+      "subscription_id":304261385,
+      "status":"active",
+      "created_at":"2017-03-07T06:06:25.000Z",
+      "updated_at":"2017-03-07T06:06:25.000Z",
+      "shopify_id":null,
+      "confirmation_url":null
+    }
+  }
+}

data/test/fixtures/disco_app/recurring_application_charges.yml

@@ -2,6 +2,8 @@ current_widget_store_subscription_recurring_charge:
   shop: widget_store
   subscription: current_widget_store_subscription
   status: <%= DiscoApp::RecurringApplicationCharge.statuses[:active] %>
+  created_at: "2017-03-07T06:06:25.000Z"
+  updated_at: "2017-03-07T06:06:25.000Z"
 
 new_widget_store_subscription_recurring_charge:
   shop: widget_store

data/test/fixtures/disco_app/shops.yml

@@ -1,6 +1,8 @@
 widget_store:
   shopify_domain: widgets.myshopify.com
   shopify_token: 00000000000000000000000000000000
+  created_at: "2017-03-07T06:06:25.000Z"
+  updated_at: "2017-03-07T06:06:25.000Z"
   data: '{ "country_name": "Australia", "timezone": "(GMT+10:00) Melbourne" }'
 
 widget_store_dev:

data/test/fixtures/disco_app/subscriptions.yml

@@ -13,6 +13,9 @@ current_widget_store_subscription:
   trial_period_days: 14
   status: <%= DiscoApp::Subscription.statuses[:active] %>
   subscription_type: 0
+  created_at: "2017-03-07T06:06:25.000Z"
+  updated_at: "2017-03-07T06:06:25.000Z"
+
 
 current_widget_store_dev_subscription:
   shop: widget_store_dev

data/test/jobs/disco_app/app_installed_job_test.rb

@@ -11,11 +11,11 @@ class DiscoApp::AppInstalledJobTest < ActionController::TestCase
     stub_request(:get, "#{@shop.admin_url}/shop.json").to_return(status: 200, body: api_fixture('widget_store/shop').to_json)
     stub_request(:get, "#{@shop.admin_url}/carrier_services.json").to_return(status: 200, body: api_fixture('widget_store/carrier_services').to_json)
     stub_request(:post, "#{@shop.admin_url}/carrier_services.json").to_return(status: 200)
+    stub_request(:post, "https://api.discolabs.com/v1/app_subscriptions.json").to_return(status: 200)
   end
 
   def teardown
     @shop = nil
-
     WebMock.reset!
   end
 

data/test/jobs/disco_app/app_uninstalled_job_test.rb

@@ -5,7 +5,7 @@ class DiscoApp::AppUninstalledJobTest < ActionController::TestCase
 
   def setup
     @shop = disco_app_shops(:widget_store)
-
+    stub_request(:post, "https://api.discolabs.com/v1/app_subscriptions.json").to_return(status: 200)
     perform_enqueued_jobs do
       DiscoApp::AppUninstalledJob.perform_later(@shop, {})
     end
@@ -13,18 +13,18 @@ class DiscoApp::AppUninstalledJobTest < ActionController::TestCase
 
   def teardown
     @shop = nil
+    WebMock.reset!
   end
 
   test 'app uninstalled job changes shop status' do
-    assert_performed_jobs 1
+    assert_performed_jobs 2
     @shop.reload
     assert @shop.uninstalled?
   end
 
   test 'app uninstalled job can be extended using concerns' do
-    assert_performed_jobs 1
+    assert_performed_jobs 2
     @shop.reload
     assert_equal 'Nowhere', @shop.data['country_name'] # Assert extended method called.
   end
-
 end

data/test/jobs/disco_app/send_subscription_job_test.rb

@@ -0,0 +1,24 @@
+require 'test_helper'
+
+class DiscoApp::SendSubscriptionJobTest < ActionController::TestCase
+  include ActiveJob::TestHelper
+
+  def setup
+    @shop = disco_app_shops(:widget_store)
+    stub_request(:post, "https://api.discolabs.com/v1/app_subscriptions.json").to_return(status: 200)
+  end
+
+  def teardown
+    @shop = nil
+
+    WebMock.reset!
+  end
+
+  test 'subscription job correctly sends request to API' do
+    perform_enqueued_jobs do
+      DiscoApp::SendSubscriptionJob.perform_later(@shop)
+    end
+    assert_requested(:post, "https://api.discolabs.com/v1/app_subscriptions.json", times: 1)
+  end
+
+end

data/test/test_helper.rb

@@ -10,6 +10,7 @@ ENV['SHOPIFY_APP_SECRET'] = 'b607d1f8b992dccb017f9315f07af9c4'
 ENV['SHOPIFY_APP_REDIRECT_URI'] = 'https://test.example.com/shopify/auth/callback'
 ENV['SHOPIFY_APP_SCOPE'] = 'read_products'
 ENV['SHOPIFY_CHARGES_REAL'] = 'false'
+ENV['DISCO_API_URL'] = 'https://api.discolabs.com/v1/'
 
 require File.expand_path("../../test/dummy/config/environment.rb",  __FILE__)
 ActiveRecord::Migrator.migrations_paths = [File.expand_path("../../test/dummy/db/migrate", __FILE__)]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disco_app
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.5
 platform: ruby
 authors:
 - Gavin Ballard
@@ -100,14 +100,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.4'
+        version: '7.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.4'
+        version: '7.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.2.3
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -526,6 +532,8 @@ files:
 - app/assets/stylesheets/disco_app/ui-kit/_ui-layout.scss
 - app/assets/stylesheets/disco_app/ui-kit/_ui-tabs.scss
 - app/assets/stylesheets/disco_app/ui-kit/_ui-type.scss
+- app/clients/disco_app/api_client.rb
+- app/clients/disco_app/disco_api_error.rb
 - app/controllers/disco_app/admin/app_settings_controller.rb
 - app/controllers/disco_app/admin/application_controller.rb
 - app/controllers/disco_app/admin/concerns/app_settings_controller.rb
@@ -558,6 +566,7 @@ files:
 - app/jobs/disco_app/concerns/synchronise_resources_job.rb
 - app/jobs/disco_app/concerns/synchronise_webhooks_job.rb
 - app/jobs/disco_app/render_asset_group_job.rb
+- app/jobs/disco_app/send_subscription_job.rb
 - app/jobs/disco_app/shop_job.rb
 - app/jobs/disco_app/shop_update_job.rb
 - app/jobs/disco_app/subscription_changed_job.rb
@@ -587,6 +596,7 @@ files:
 - app/services/disco_app/carrier_request_service.rb
 - app/services/disco_app/charges_service.rb
 - app/services/disco_app/proxy_service.rb
+- app/services/disco_app/request_validation_service.rb
 - app/services/disco_app/subscription_service.rb
 - app/services/disco_app/webhook_service.rb
 - app/views/disco_app/admin/app_settings/edit.html.erb
@@ -613,7 +623,7 @@ files:
 - app/views/layouts/application.html.erb
 - app/views/layouts/embedded_app.html.erb
 - app/views/layouts/embedded_app_modal.html.erb
-- app/views/sessions/new.html.erb
+- app/views/shopify_app/sessions/new.html.erb
 - config/routes.rb
 - db/migrate/20150525000000_create_shops_if_not_existent.rb
 - lib/disco_app.rb
@@ -641,12 +651,14 @@ files:
 - lib/generators/disco_app/templates/root/CHECKS
 - lib/generators/disco_app/templates/root/Procfile
 - lib/generators/disco_app/templates/views/home/index.html.erb
+- lib/tasks/api.rake
 - lib/tasks/carrier_service.rake
 - lib/tasks/database.rake
 - lib/tasks/sessions.rake
 - lib/tasks/shops.rake
 - lib/tasks/start.rake
 - lib/tasks/webhooks.rake
+- test/clients/disco_app/api_client_test.rb
 - test/controllers/disco_app/admin/shops_controller_test.rb
 - test/controllers/disco_app/charges_controller_test.rb
 - test/controllers/disco_app/install_controller_test.rb
@@ -718,6 +730,7 @@ files:
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
+- test/fixtures/api/subscriptions/valid_request.json
 - test/fixtures/api/widget_store/assets/create_script_tag_js_request.json
 - test/fixtures/api/widget_store/assets/create_script_tag_js_response.json
 - test/fixtures/api/widget_store/assets/create_script_tag_request.json
@@ -781,6 +794,7 @@ files:
 - test/integration/synchronises_test.rb
 - test/jobs/disco_app/app_installed_job_test.rb
 - test/jobs/disco_app/app_uninstalled_job_test.rb
+- test/jobs/disco_app/send_subscription_job_test.rb
 - test/jobs/disco_app/synchronise_carrier_service_job_test.rb
 - test/jobs/disco_app/synchronise_webhooks_job_test.rb
 - test/models/disco_app/can_be_liquified_test.rb
@@ -884,6 +898,7 @@ test_files:
 - test/dummy/config/database.gitlab-ci.yml
 - test/dummy/config/application.rb
 - test/fixtures/liquid/model.liquid
+- test/fixtures/api/subscriptions/valid_request.json
 - test/fixtures/api/widget_store/carrier_services.json
 - test/fixtures/api/widget_store/assets/create_test_js_response.json
 - test/fixtures/api/widget_store/assets/create_widget_js_response.json
@@ -949,6 +964,7 @@ test_files:
 - test/disco_app_test.rb
 - test/jobs/disco_app/app_uninstalled_job_test.rb
 - test/jobs/disco_app/synchronise_carrier_service_job_test.rb
+- test/jobs/disco_app/send_subscription_job_test.rb
 - test/jobs/disco_app/synchronise_webhooks_job_test.rb
 - test/jobs/disco_app/app_installed_job_test.rb
 - test/controllers/disco_app/install_controller_test.rb
@@ -959,6 +975,7 @@ test_files:
 - test/controllers/proxy_controller_test.rb
 - test/controllers/home_controller_test.rb
 - test/integration/synchronises_test.rb
+- test/clients/disco_app/api_client_test.rb
 - test/models/disco_app/plan_test.rb
 - test/models/disco_app/has_metafields_test.rb
 - test/models/disco_app/shop_test.rb

data/app/views/sessions/new.html.erb

@@ -1,28 +0,0 @@
-<% provide(:title, "Install #{DiscoApp.configuration.app_name}") %>
-
-<%= form_tag shopify_app.login_path do %>
-  <div class="ui-empty-state">
-    <section class="ui-empty-state__section">
-      <div class="ui-empty-state__subsection">
-        <h1 class="ui-empty-state__title">Install <%= DiscoApp.configuration.app_name %></h1>
-        <h2 class="ui-empty-state__subtitle">Enter your Shopify store name below to get started.</h2>
-      </div>
-      <div class="ui-empty-state__subsection">
-        <div class="next-grid">
-          <div class="next-grid__cell" style="text-align: right;">
-            <label for="shop" class="next-input__help-text">https://</label>
-          </div>
-          <div class="next-grid__cell">
-            <input type="text" class="form-control" id="shop" name="shop" placeholder="your-store" autocomplete="off" autofocus="on" />
-          </div>
-          <div class="next-grid__cell" style="text-align: left;">
-            <label for="shop" class="next-input__help-text">.myshopify.com</label>
-          </div>
-        </div>
-      </div>
-      <div class="ui-empty-state__subsection">
-        <button type="submit" class="btn btn-large btn-primary">Install</button>
-      </div>
-    </section>
-  </div>
-<% end %>