disco_app 0.6.9 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9001ca6c8a25c9ea7df2b970754c13dd131efd3d267082486203c4f5fa38fcdc
-  data.tar.gz: 87bff693bed4d65f2636971fbd01d0ac378c763feed04b9576a5a014d10ae465
+  metadata.gz: 68caa1ce47b61667169703ebd83a0cd91959e663bcfabc1993ec060892139e81
+  data.tar.gz: 1f4b759c70b234668f9691a628acd56e0dbee57dfc7fe9542ebbc15d25d6862d
 SHA512:
-  metadata.gz: f71bb8a81019f810d0f36cf08eff95d1703a5d15275332b2892284cf0cc383625e3c17278b535c18a2a88e2be4b5fb4e3b7fb802f00ea30324fd3078b14d5e75
-  data.tar.gz: 1b6f4733ee9eb8272426e0375a3c0ad30df950113c33ec521b2b879c1f1c000ffaf9b80304bc93612baf5d998c82badeff876d94a05aaac3d85e6454148524db
+  metadata.gz: f3c6c70e1e0c8c7e7eea4d729afe768830b6caeecac921a1b2ac0b6b9d224ff686a6a5b7f8312ff8fa66b7a47f8a79261fe645a552e0786afcba2bd7355287c9
+  data.tar.gz: c957d6a3eafb4214f7fd548dc145b9f301b1d4ac70ec7f36a328c96f7c5c20aeab24ef97fde384c8973acdcf6e7cda948f4dd5781237d72a3693338b80f7bc7f

data/app/assets/javascripts/disco_app/components/shopify_admin_link.js.jsx

@@ -18,7 +18,7 @@ var ShopifyAdminLink = React.createClass({
     },
 
     render: function() {
-        var href = '/admin' + this.props.href;
+        var href = ShopifyApp.shopOrigin + '/admin' + this.props.href;
         return (
             <a className={this.props.className} href={href} onClick={this.handleClick}>
                 {this.props.label}

data/app/controllers/disco_app/app_proxy_controller.rb

@@ -24,7 +24,7 @@ module DiscoApp
         query_hash = Rack::Utils.parse_query(request.query_string)
         signature = query_hash.delete("signature")
         sorted_params = query_hash.collect{ |k, v| "#{k}=#{Array(v).join(',')}" }.sort.join
-        calculated_signature = OpenSSL::HMAC.hexdigest(OpenSSL::Digest::Digest.new('sha256'), ShopifyApp.configuration.secret, sorted_params)
+        calculated_signature = OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), ShopifyApp.configuration.secret, sorted_params)
         signature == calculated_signature
       end
 

data/app/controllers/disco_app/carrier_request_controller.rb

@@ -18,7 +18,7 @@ module DiscoApp
         return true unless Rails.env.production?
         data = request.body.read.to_s
         hmac_header = request.headers['HTTP_X_SHOPIFY_HMAC_SHA256']
-        digest  = OpenSSL::Digest::Digest.new('sha256')
+        digest  = OpenSSL::Digest.new('sha256')
         calculated_hmac = Base64.encode64(OpenSSL::HMAC.digest(digest, ShopifyApp.configuration.secret, data)).strip
         request.body.rewind
         calculated_hmac == hmac_header

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

@@ -10,11 +10,14 @@ module DiscoApp::Concerns::AppUninstalledJob
   # Perform application uninstallation.
   #
   # - Mark charge status as "cancelled" unless charges have been waived.
+  # - Remove any stored sessions for the shop.
   #
   def perform(domain, shop_data)
     unless @shop.charge_waived?
       @shop.charge_cancelled!
     end
+
+    @shop.sessions.delete_all
   end
 
 end

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

@@ -8,6 +8,9 @@ module DiscoApp::Concerns::Shop
     has_many :subscriptions
     has_many :plans, through: :subscriptions
 
+    # Define relationship to sessions.
+    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]
 

data/db/migrate/20160112233706_create_disco_app_sessions.rb

@@ -0,0 +1,12 @@
+class CreateDiscoAppSessions < ActiveRecord::Migration
+  def change
+    create_table :disco_app_sessions do |t|
+      t.string :session_id, :null => false
+      t.text :data
+      t.timestamps
+    end
+
+    add_index :disco_app_sessions, :session_id, :unique => true
+    add_index :disco_app_sessions, :updated_at
+  end
+end

data/db/migrate/20160113194418_add_shop_id_to_disco_app_sessions.rb

@@ -0,0 +1,6 @@
+class AddShopIdToDiscoAppSessions < ActiveRecord::Migration
+  def change
+    add_column :disco_app_sessions, :shop_id, :integer, null: true
+    add_foreign_key :disco_app_sessions, :disco_app_shops, column: :shop_id, on_delete: :cascade
+  end
+end

data/lib/disco_app/engine.rb

@@ -2,6 +2,8 @@ require 'shopify_app'
 require 'bootstrap-sass'
 require 'jquery-rails'
 require 'turbolinks'
+require 'activerecord/session_store'
+require 'disco_app/session'
 
 module DiscoApp
   class Engine < ::Rails::Engine
@@ -16,7 +18,7 @@ module DiscoApp
 
     # Ensure our frame assets are included for precompilation.
     initializer 'disco_app.assets.precompile' do |app|
-      app.config.assets.precompile += %w(disco_app/frame.css disco_app/frame.js)
+      app.config.assets.precompile += %w(disco_app/icon.svg disco_app/frame.css disco_app/frame.js)
     end
 
   end

data/lib/disco_app/session.rb

@@ -0,0 +1,12 @@
+class DiscoApp::Session < ActiveRecord::SessionStore::Session
+
+  before_save :set_shop_id!
+
+  private
+
+    def set_shop_id!
+      return false unless loaded?
+      write_attribute(:shop_id, data[:shopify] || data['shopify'])
+    end
+
+end

data/lib/disco_app/version.rb

@@ -1,3 +1,3 @@
 module DiscoApp
-  VERSION = "0.6.9"
+  VERSION = '0.7.0'
 end

data/lib/generators/disco_app/disco_app_generator.rb

@@ -27,10 +27,11 @@ class DiscoAppGenerator < Rails::Generators::Base
     gsub_file 'Gemfile', /^# Use sqlite3 as the database for Active Record\ngem 'sqlite3'/m, ''
 
     # Add gems common to all environments.
-    gem 'shopify_app', '~> 6.2.0'
+    gem 'shopify_app', '~> 6.4.1'
     gem 'sidekiq', '~> 3.5.1'
     gem 'puma', '~> 2.14.0'
     gem 'bootstrap-sass', '~> 3.3.5.1'
+    gem 'activerecord-session_store', '~> 0.1.2'
 
     # Add gems for development and testing only.
     gem_group :development, :test do
@@ -68,6 +69,11 @@ class DiscoAppGenerator < Rails::Generators::Base
     application "config.x.shopify_charges_real = ENV['SHOPIFY_CHARGES_REAL'] == 'true'\n", env: :production
     application "# Allow real charges in production with an ENV variable", env: :production
 
+    # Configure session storage.
+    application "ActiveRecord::SessionStore::Session.table_name = 'disco_app_sessions'"
+    application "ActionDispatch::Session::ActiveRecordStore.session_class = DiscoApp::Session"
+    application "# Configure custom session storage"
+
     # Set Sidekiq as the queue adapter in production.
     application "config.active_job.queue_adapter = :sidekiq\n", env: :production
     application "# Use Sidekiq as the active job backend", env: :production
@@ -108,6 +114,7 @@ class DiscoAppGenerator < Rails::Generators::Base
     copy_file 'initializers/shopify_app.rb', 'config/initializers/shopify_app.rb'
     copy_file 'initializers/disco_app.rb', 'config/initializers/disco_app.rb'
     copy_file 'initializers/shopify_session_repository.rb', 'config/initializers/shopify_session_repository.rb'
+    copy_file 'initializers/session_store.rb', 'config/initializers/session_store.rb'
 
     # Copy default home controller and view
     copy_file 'controllers/home_controller.rb', 'app/controllers/home_controller.rb'

data/lib/generators/disco_app/rollbarify/rollbarify_generator.rb

@@ -7,8 +7,8 @@ module DiscoApp
       # Install the Rollbar and OJ gems.
       def install_gems
         # Add gem to Gemfile
-        gem 'rollbar', '~> 2.4.0'
-        gem 'oj', '~> 2.12.14'
+        gem 'rollbar', '~> 2.7.1'
+        gem 'oj', '~> 2.14.3'
 
         # Install gem.
         Bundler.with_clean_env do

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

@@ -0,0 +1,2 @@
+# Use an ActiveRecord-based session store.
+Rails.application.config.session_store :active_record_store, :key => '_disco_app_session'

data/lib/tasks/sessions.rake

@@ -0,0 +1,9 @@
+namespace :sessions do
+
+  desc 'Clean out any stale sessions.'
+  task clean: [:environment, 'db:load_config'] do
+    threshold = (ENV['SESSIONS_CLEAN_THRESHOLD_DAYS'] || 30).to_i.days.ago
+    ActiveRecord::Base.connection.execute("DELETE FROM #{ActiveRecord::SessionStore::Session.table_name} WHERE updated_at < '#{threshold}'")
+  end
+
+end

data/test/dummy/config/application.rb

@@ -27,6 +27,10 @@ module Dummy
     # Set the default host for absolute URL routing purposes
     routes.default_url_options[:host] = ENV['DEFAULT_HOST']
 
+    # Configure custom session storage
+    ActionDispatch::Session::ActiveRecordStore.session_class = DiscoApp::Session
+    ActiveRecord::SessionStore::Session.table_name = 'disco_app_sessions'
+
     # Explicitly prevent real charges being created by default
     config.x.shopify_charges_real = false
 

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

@@ -1,3 +1,2 @@
-# Be sure to restart your server when you modify this file.
-
-Rails.application.config.session_store :cookie_store, key: '_dummy_session'
+# Use an ActiveRecord-based session store.
+Rails.application.config.session_store :active_record_store, :key => '_disco_app_session'

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20151017234409) do
+ActiveRecord::Schema.define(version: 20160113194418) do
 
   create_table "disco_app_plans", force: :cascade do |t|
     t.integer  "status"
@@ -23,6 +23,17 @@ ActiveRecord::Schema.define(version: 20151017234409) do
     t.datetime "updated_at",         null: false
   end
 
+  create_table "disco_app_sessions", force: :cascade do |t|
+    t.string   "session_id", null: false
+    t.text     "data"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "shop_id"
+  end
+
+  add_index "disco_app_sessions", ["session_id"], name: "index_disco_app_sessions_on_session_id", unique: true
+  add_index "disco_app_sessions", ["updated_at"], name: "index_disco_app_sessions_on_updated_at"
+
   create_table "disco_app_shops", force: :cascade do |t|
     t.string   "shopify_domain",                         null: false
     t.string   "shopify_token",                          null: false

data/test/models/disco_app/session_test.rb

@@ -0,0 +1,31 @@
+require 'test_helper'
+
+class DiscoApp::SessionTest < ActiveSupport::TestCase
+
+  def setup
+    @shop = disco_app_shops(:widget_store)
+    @session = DiscoApp::Session.create(
+      session_id: 'a91bfc51fa79c9d09d43e2615d9345d4',
+      data: {
+        :shopify => @shop.id,
+        :shopify_domain => @shop.shopify_domain
+      }
+    )
+  end
+
+  test 'logged in sessions are linked to their shop' do
+    assert_equal @shop.id, @session.shop_id
+  end
+
+  test 'can fetch sessions for a particular shop through association' do
+    assert_equal 1, @shop.sessions.size
+  end
+
+  test 'sessions can be deleted by shop' do
+    DiscoApp::Session.create(session_id: 'a91bfc51fa79c9d09d43e2615d9345d5', data: {})
+    assert_equal 2, DiscoApp::Session.count
+    @shop.sessions.delete_all
+    assert_equal 1, DiscoApp::Session.count
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disco_app
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.7.0
 platform: ruby
 authors:
 - Gavin Ballard
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.2.0
+        version: 6.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.2.0
+        version: 6.4.1
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: activerecord-session_store
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -316,8 +330,11 @@ files:
 - db/migrate/20151017231302_create_disco_app_plans.rb
 - db/migrate/20151017232027_create_disco_app_subscriptions.rb
 - db/migrate/20151017234409_move_shop_to_disco_app_engine.rb
+- db/migrate/20160112233706_create_disco_app_sessions.rb
+- db/migrate/20160113194418_add_shop_id_to_disco_app_sessions.rb
 - lib/disco_app.rb
 - lib/disco_app/engine.rb
+- lib/disco_app/session.rb
 - lib/disco_app/support/file_fixtures.rb
 - lib/disco_app/test_help.rb
 - lib/disco_app/version.rb
@@ -332,11 +349,13 @@ files:
 - lib/generators/disco_app/templates/config/puma.rb
 - lib/generators/disco_app/templates/controllers/home_controller.rb
 - lib/generators/disco_app/templates/initializers/disco_app.rb
+- lib/generators/disco_app/templates/initializers/session_store.rb
 - lib/generators/disco_app/templates/initializers/shopify_app.rb
 - lib/generators/disco_app/templates/initializers/shopify_session_repository.rb
 - lib/generators/disco_app/templates/root/Procfile
 - lib/generators/disco_app/templates/views/home/index.html.erb
 - lib/tasks/carrier_service.rake
+- lib/tasks/sessions.rake
 - lib/tasks/start.rake
 - lib/tasks/webhooks.rake
 - test/controllers/disco_app/install_controller_test.rb
@@ -394,6 +413,7 @@ files:
 - test/jobs/disco_app/app_installed_job_test.rb
 - test/jobs/disco_app/app_uninstalled_job_test.rb
 - test/models/disco_app/plan_test.rb
+- test/models/disco_app/session_test.rb
 - test/models/disco_app/shop_test.rb
 - test/models/disco_app/subscription_test.rb
 - test/services/disco_app/subscription_service_test.rb
@@ -482,5 +502,6 @@ test_files:
 - test/integration/navigation_test.rb
 - test/models/disco_app/plan_test.rb
 - test/models/disco_app/shop_test.rb
+- test/models/disco_app/session_test.rb
 - test/models/disco_app/subscription_test.rb
 - test/services/disco_app/subscription_service_test.rb