shopify_app 7.4.0 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b534fe893fb126d699a8e2a0908cc06aab2ea3e9
-  data.tar.gz: 7da8663a89439030d2198be0f4d09e947d68ae63
+  metadata.gz: 3c17b0036bfc249437b86de35f0ad6a42bae8a74
+  data.tar.gz: 4c1840a61918df21033a9492662a5b48810aa4fc
 SHA512:
-  metadata.gz: 189dfc0d53bd7eae968b3270151b00a363a9ecd964b38cbabd378824156fa2eaf5aecb93c9932b1fa3fde2323bd35c9a8fcddec3f8b62b2c02cd6bd2001c8e1f
-  data.tar.gz: 9e11244536e4039e59b1170ab3fcf9717f9f0e53036dbd791cf30e72279d95737cb640cee2a19736e9e74da380c1209a49446aeb32cb2223baf36fe28e8eabcd
+  metadata.gz: e9e9c0e4930528ab48b9ea7dfbb3d4722a650dbd97bc97c4e254115398026c462ca25a660aa91a85654a37bde1ecf1195744cb31c8da7facc748f9985bb46b34
+  data.tar.gz: bb0726fb075b047ceb02b8a7b10cd04e3b2c925ea7e5efcf14df1465d347b6edc164599ceb894af52aae50cf6ff0cb7448fac7e175e1b8332ffcb22706f4e03e

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+8.0.0
+-----
+* Removed the `shopify_session_repository` initializer. The SessionRepository is now configured through the main ShopifyApp configuration object and the generated initializer
+* Moved InMemorySessionStore into the ShopifyApp namespace
+* Remove ShopifySession concern. This module made the code internal to this engine harder to follow and we want do discourage over-writing the auth code now that we have generic hooks for all extra tasks during install.
+* Changed engine controllers to subclass ActionController::Base to avoid any possible conflict with the parent application
+* Removed the `ShopifyApp::Shop` concern and added its methods to `ShopifyApp::SessionStorage`. To update for this change just remove this concern anywhere it is being used in your application.
+* Add `ShopifyApp::EmbeddedApp` controller concern which handles setting the required headers for the ESDK. Previously this was done by injecting configuration into applicaton.rb which affects the entire app.
+* Add webhooks to generated home controller. This should help new users debug issues.
+
 7.4.0
 -----
 * Add an after_authenticate job which will be run once the shop is authenticated. [[#431]](https://github.com/Shopify/shopify_app/pull/432)

data/README.md

@@ -142,7 +142,7 @@ After running the `install` generator, you can start your app with `bundle exec
 $ rails generate shopify_app:shop_model
 ```
 
-The install generator doesn't create any database models for you and if you are starting a new app its quite likely that you will want one (most of our internally developed apps do!). This generator creates a simple shop model and a migration. It also creates a model called `SessionStorage` which interacts with `ShopifyApp::SessionRepository`. Check out the later section to learn more about `ShopifyApp::SessionRepository`
+The install generator doesn't create any database tables or models for you. If you are starting a new app its quite likely that you will want a shops table and model to store the tokens when your app is installed (most of our internally developed apps do!). This generator creates a shop model and a migration. This model includes the `ShopifyApp::Shop` concern which adds two methods to make it compatible as a `SessionRepository`. After running this generator you'll notice the `session_repository` in your `config/initializers/shopify_app.rb` will be set to the `Shop` model. This means that internally ShopifyApp will try and load tokens from this model.
 
 *Note that you will need to run rake db:migrate after this generator*
 
@@ -172,7 +172,7 @@ The last group of generators are for your convenience if you want to start overr
 Mounting the Engine
 -------------------
 
-Mounting the Engine will provide the basic routes to authenticating a shop with your custom application. It will provide:
+Mounting the Engine will provide the basic routes to authenticating a shop with your application. By default it will provide:
 
 | Verb   | Route                         | Action                       |
 |--------|-------------------------------|------------------------------|
@@ -183,28 +183,28 @@ Mounting the Engine will provide the basic routes to authenticating a shop with
 |POST    |'/webhooks/:type'              |Webhook Callback              |
 
 
-The default routes of the Shopify rails engine, which is mounted to the root, can be altered to mount on a different route. The `config/routes.rb` can be modified to put these under a nested route (say `/app-name`) as:
+If required the engine can be mounted at a nested route, eg:
 
 ```ruby
 mount ShopifyApp::Engine, at: '/nested'
 ```
 
-This will create the Shopify engine routes under the specified subpath, as a result it will redirect new consumers to `/nested/login`. If you mount the engine at a subpath you'll also need to update the omniauth initializer to include a custom `callback_path` e.g:
+This will create the Shopify engine routes under the specified subpath. You'll also need to make some updates to your `shopify_app.rb` and `omniauth.rb` initializers. First update the shopify_app initializer to include a custom `root_url` e.g:
 
 ```ruby
-  provider :shopify,
-    ShopifyApp.configuration.api_key,
-    ShopifyApp.configuration.secret,
-    scope: ShopifyApp.configuration.scope,
-    callback_path: '/nested/auth/shopify/callback'
+ShopifyApp.configure do |config|
+  config.root_url = '/nested'
+end
 ```
 
-To use named routes with the engine so that it can route between the application and the engine's routes it should be prefixed with `main_app` or `shopify_app`.
+then update the omniauth initializer to include a custom `callback_path` e.g:
 
 ```ruby
-main_app.login_path # For a named login route on the rails app.
-
-shopify_app.login_path # For the shopify app store login route.
+provider :shopify,
+  ShopifyApp.configuration.api_key,
+  ShopifyApp.configuration.secret,
+  scope: ShopifyApp.configuration.scope,
+  callback_path: '/nested/auth/shopify/callback'
 ```
 
 Managing Api Keys
@@ -327,9 +327,9 @@ bin/rails g shopify_app:add_after_authenticate_job
 ShopifyApp::SessionRepository
 -----------------------------
 
-`ShopifyApp::SessionRepository` allows you as a developer to define how your sessions are retrieved and stored for a shop. The `SessionRepository` is configured using the `config/initializers/shopify_session_repository.rb` file and can be set to any object that implements `self.store(shopify_session)` which stores the session and returns a unique identifier and `self.retrieve(id)` which returns a `ShopifyAPI::Session` for the passed id. See either the `InMemorySessionStore` or the `SessionStorage` module for examples.
+`ShopifyApp::SessionRepository` allows you as a developer to define how your sessions are retrieved and stored for a shop. The `SessionRepository` is configured in the `config/initializers/shopify_app.rb` file and can be set to any object that implements `self.store(shopify_session)` which stores the session and returns a unique identifier and `self.retrieve(id)` which returns a `ShopifyAPI::Session` for the passed id. See either the `ShopifyApp::InMemorySessionStore` class or the `ShopifyApp::Shop` concern for examples.
 
-If you only run the install generator then by default you will have an in memory store but it **won't work** on multi-server environments including Heroku. If you ran all the generators including the shop_model generator then the Shop model itself will be the `SessionRepository`. If you look at the implementation of the generated shop model you'll see that this gem provides an activerecord mixin for the `SessionRepository`. You can use this mixin on any model that responds to `shopify_domain` and `shopify_token`.
+If you only run the install generator then by default you will have an in memory store but it **won't work** on multi-server environments including Heroku. If you ran all the generators including the shop_model generator then the `Shop` model itself will be the `SessionRepository`. If you look at the implementation of the generated shop model you'll see that this gem provides a concern for the `SessionRepository`. You can use this concern on any model that responds to `shopify_domain` and `shopify_token`.
 
 AuthenticatedController
 -----------------------

data/app/controllers/shopify_app/authenticated_controller.rb

@@ -1,12 +1,10 @@
 module ShopifyApp
-  class AuthenticatedController < ApplicationController
+  class AuthenticatedController < ActionController::Base
     include ShopifyApp::Localization
     include ShopifyApp::LoginProtection
+    include ShopifyApp::EmbeddedApp
 
-    before_action :set_locale
     before_action :login_again_if_different_shop
     around_action :shopify_session
-
-    layout ShopifyApp.configuration.embedded_app? ? 'embedded_app' : 'application'
   end
 end

data/app/controllers/shopify_app/sessions_controller.rb

@@ -1,5 +1,99 @@
 module ShopifyApp
-  class SessionsController < ApplicationController
-    include ShopifyApp::SessionsConcern
+  class SessionsController < ActionController::Base
+    include ShopifyApp::LoginProtection
+    layout false, only: :new
+
+    def new
+      authenticate if sanitized_shop_name.present?
+    end
+
+    def create
+      authenticate
+    end
+
+    def callback
+      if auth_hash
+        login_shop
+        install_webhooks
+        install_scripttags
+        perform_after_authenticate_job
+
+        redirect_to return_address
+      else
+        flash[:error] = I18n.t('could_not_log_in')
+        redirect_to login_url
+      end
+    end
+
+    def destroy
+      session[:shopify] = nil
+      session[:shopify_domain] = nil
+      flash[:notice] = I18n.t('.logged_out')
+      redirect_to login_url
+    end
+
+    private
+
+    def authenticate
+      if sanitized_shop_name.present?
+        fullpage_redirect_to "#{main_app.root_path}auth/shopify?shop=#{sanitized_shop_name}"
+      else
+        redirect_to return_address
+      end
+    end
+
+    def login_shop
+      sess = ShopifyAPI::Session.new(shop_name, token)
+      session[:shopify] = ShopifyApp::SessionRepository.store(sess)
+      session[:shopify_domain] = shop_name
+    end
+
+    def auth_hash
+      request.env['omniauth.auth']
+    end
+
+    def shop_name
+      auth_hash.uid
+    end
+
+    def token
+      auth_hash['credentials']['token']
+    end
+
+    def install_webhooks
+      return unless ShopifyApp.configuration.has_webhooks?
+
+      WebhooksManager.queue(
+        shop_name,
+        token,
+        ShopifyApp.configuration.webhooks
+      )
+    end
+
+    def install_scripttags
+      return unless ShopifyApp.configuration.has_scripttags?
+
+      ScripttagsManager.queue(
+        shop_name,
+        token,
+        ShopifyApp.configuration.scripttags
+      )
+    end
+
+    def perform_after_authenticate_job
+      config = ShopifyApp.configuration.after_authenticate_job
+
+      return unless config && config[:job].present?
+
+      if config[:inline] == true
+        config[:job].perform_now(shop_domain: session[:shopify_domain])
+      else
+        config[:job].perform_later(shop_domain: session[:shopify_domain])
+      end
+    end
+
+    def return_address
+      session.delete(:return_to) || ShopifyApp::configuration.root_url
+    end
   end
 end

data/app/controllers/shopify_app/webhooks_controller.rb

@@ -1,5 +1,5 @@
 module ShopifyApp
-  class WebhooksController < ApplicationController
+  class WebhooksController < ActionController::Base
     include ShopifyApp::WebhookVerification
 
     class ShopifyApp::MissingWebhookJobError < StandardError; end

data/lib/generators/shopify_app/home_controller/templates/home_controller.rb

@@ -1,5 +1,6 @@
 class HomeController < ShopifyApp::AuthenticatedController
   def index
     @products = ShopifyAPI::Product.find(:all, params: { limit: 10 })
+    @webhooks = ShopifyAPI::Webhook.find(:all)
   end
 end

data/lib/generators/shopify_app/home_controller/templates/index.html.erb

@@ -5,3 +5,17 @@
     <li><%= link_to product.title, "https://#{@shop_session.url}/admin/products/#{product.id}", target: "_top" %></li>
   <% end %>
 </ul>
+
+<hr>
+
+<h2>Webhooks</h2>
+
+<% if @webhooks.present? %>
+  <ul>
+    <% @webhooks.each do |webhook| %>
+      <li><%= webhook.topic %> : <%= webhook.address %></li>
+    <% end %>
+  </ul>
+<% else %>
+  <p>This app has not created any webhooks for this Shop. Add webhooks to your ShopifyApp initializer if you need webhooks</p>
+<% end %>

data/lib/generators/shopify_app/home_controller/templates/shopify_app_ready_script.html.erb

@@ -1,11 +1,7 @@
 <% content_for :javascript do %>
   <script type="text/javascript">
     ShopifyApp.ready(function(){
-      ShopifyApp.Bar.initialize({
-        title: "Home",
-        icon: "<%= asset_path('favicon.ico') %>"
-      });
+      ShopifyApp.Bar.initialize({ title: "Home" });
     });
   </script>
 <% end %>
-

data/lib/generators/shopify_app/install/install_generator.rb

@@ -34,17 +34,6 @@ module ShopifyApp
         )
       end
 
-      def create_shopify_session_repository_initializer
-        copy_file 'shopify_session_repository.rb', 'config/initializers/shopify_session_repository.rb'
-      end
-
-      def inject_embedded_app_options_to_application
-        if embedded_app?
-          application "config.action_dispatch.default_headers.delete('X-Frame-Options')"
-          application "config.action_dispatch.default_headers['P3P'] = 'CP=\"Not used\"'"
-        end
-      end
-
       def create_embedded_app_layout
         if embedded_app?
           copy_file 'embedded_app.html.erb', 'app/views/layouts/embedded_app.html.erb'

data/lib/generators/shopify_app/install/templates/shopify_app.rb

@@ -5,4 +5,5 @@ ShopifyApp.configure do |config|
   config.scope = "<%= @scope %>"
   config.embedded_app = <%= embedded_app? %>
   config.after_authenticate_job = false
+  config.session_repository = ShopifyApp::InMemorySessionStore
 end

data/lib/generators/shopify_app/install/templates/shopify_provider.rb

@@ -1,4 +1,4 @@
   provider :shopify,
-    ShopifyApp.configuration.api_key,
-    ShopifyApp.configuration.secret,
-    scope: ShopifyApp.configuration.scope
+           ShopifyApp.configuration.api_key,
+           ShopifyApp.configuration.secret,
+           scope: ShopifyApp.configuration.scope

data/lib/generators/shopify_app/shop_model/shop_model_generator.rb

@@ -12,11 +12,11 @@ module ShopifyApp
       end
 
       def create_shop_migration
-        migration_template "db/migrate/create_shops.erb", "db/migrate/create_shops.rb"
+        migration_template 'db/migrate/create_shops.erb', 'db/migrate/create_shops.rb'
       end
 
-      def create_session_storage_initializer
-        copy_file 'shopify_session_repository.rb', 'config/initializers/shopify_session_repository.rb', force: true
+      def update_shopify_app_initializer
+        gsub_file 'config/initializers/shopify_app.rb', 'ShopifyApp::InMemorySessionStore', 'Shop'
       end
 
       def create_shop_fixtures

data/lib/generators/shopify_app/shop_model/templates/shop.rb

@@ -1,4 +1,3 @@
 class Shop < ActiveRecord::Base
-  include ShopifyApp::Shop
   include ShopifyApp::SessionStorage
 end

data/lib/shopify_app.rb

@@ -10,22 +10,25 @@ require 'shopify_app/configuration'
 # engine
 require 'shopify_app/engine'
 
-# jobs
-require 'shopify_app/webhooks_manager_job'
-require 'shopify_app/scripttags_manager_job'
-
-# helpers and concerns
-require 'shopify_app/shop'
-require 'shopify_app/session_storage'
-require 'shopify_app/sessions_concern'
-require 'shopify_app/localization'
-require 'shopify_app/login_protection'
-require 'shopify_app/webhooks_manager'
-require 'shopify_app/scripttags_manager'
-require 'shopify_app/webhook_verification'
-require 'shopify_app/app_proxy_verification'
+# utils
 require 'shopify_app/utils'
 
-# session repository
-require 'shopify_app/shopify_session_repository'
-require 'shopify_app/in_memory_session_store'
+# controller concerns
+require 'shopify_app/controller_concerns/localization'
+require 'shopify_app/controller_concerns/login_protection'
+require 'shopify_app/controller_concerns/embedded_app'
+require 'shopify_app/controller_concerns/webhook_verification'
+require 'shopify_app/controller_concerns/app_proxy_verification'
+
+# jobs
+require 'shopify_app/jobs/webhooks_manager_job'
+require 'shopify_app/jobs/scripttags_manager_job'
+
+# managers
+require 'shopify_app/managers/webhooks_manager'
+require 'shopify_app/managers/scripttags_manager'
+
+# session
+require 'shopify_app/session/session_storage'
+require 'shopify_app/session/session_repository'
+require 'shopify_app/session/in_memory_session_store'

data/lib/shopify_app/configuration.rb

@@ -13,6 +13,10 @@ module ShopifyApp
     attr_accessor :webhooks
     attr_accessor :scripttags
     attr_accessor :after_authenticate_job
+    attr_accessor :session_repository
+
+    # customise urls
+    attr_accessor :root_url
 
     # customise ActiveJob queue names
     attr_accessor :scripttags_manager_queue_name
@@ -22,23 +26,32 @@ module ShopifyApp
     attr_accessor :myshopify_domain
 
     def initialize
+      @root_url = '/'
       @myshopify_domain = 'myshopify.com'
+      @scripttags_manager_queue_name = Rails.application.config.active_job.queue_name
+      @webhooks_manager_queue_name = Rails.application.config.active_job.queue_name
     end
 
-    def has_webhooks?
-      webhooks.present?
+    def login_url
+      File.join(@root_url, 'login')
     end
 
-    def has_scripttags?
-      scripttags.present?
+    def session_repository=(klass)
+      if Rails.configuration.cache_classes
+        ShopifyApp::SessionRepository.storage = klass
+      else
+        ActiveSupport::Reloader.to_prepare do
+          ShopifyApp::SessionRepository.storage = klass
+        end
+      end
     end
 
-    def scripttags_manager_queue_name
-      @scripttags_manager_queue_name ||= Rails.application.config.active_job.queue_name
+    def has_webhooks?
+      webhooks.present?
     end
 
-    def webhooks_manager_queue_name
-      @webhooks_manager_queue_name ||= Rails.application.config.active_job.queue_name
+    def has_scripttags?
+      scripttags.present?
     end
   end
 

data/lib/shopify_app/controller_concerns/embedded_app.rb

@@ -0,0 +1,19 @@
+module ShopifyApp
+  module EmbeddedApp
+    extend ActiveSupport::Concern
+
+    included do
+      if ShopifyApp.configuration.embedded_app?
+        after_action :set_esdk_headers
+        layout 'embedded_app'
+      end
+    end
+
+    private
+
+    def set_esdk_headers
+      response.set_header('P3P', 'CP="Not used"')
+      response.default_headers.delete('X-Frame-Options')
+    end
+  end
+end

data/lib/shopify_app/{localization.rb → controller_concerns/localization.rb}

@@ -2,6 +2,12 @@ module ShopifyApp
   module Localization
     extend ActiveSupport::Concern
 
+    included do
+      before_action :set_locale
+    end
+
+    private
+
     def set_locale
       if params[:locale]
         session[:locale] = params[:locale]

data/lib/shopify_app/{login_protection.rb → controller_concerns/login_protection.rb}

@@ -41,20 +41,25 @@ module ShopifyApp
         head :unauthorized
       else
         session[:return_to] = request.fullpath if request.get?
-        redirect_to main_or_engine_login_url(shop: params[:shop])
+        redirect_to login_url
       end
     end
 
     def close_session
       session[:shopify] = nil
       session[:shopify_domain] = nil
-      redirect_to main_or_engine_login_url(shop: params[:shop])
+      redirect_to login_url
     end
 
-    def main_or_engine_login_url(params = {})
-      main_app.login_url(params)
-    rescue NoMethodError
-      shopify_app.login_url(params)
+    def login_url
+      url = ShopifyApp.configuration.login_url
+
+      if params[:shop].present?
+        query = { shop: params[:shop] }.to_query
+        url = "#{url}?#{query}"
+      end
+
+      url
     end
 
     def fullpage_redirect_to(url)
@@ -114,6 +119,5 @@ module ShopifyApp
       return unless params[:shop].present?
       ShopifyApp::Utils.sanitize_shop_domain(params[:shop])
     end
-
   end
 end

data/lib/shopify_app/session/in_memory_session_store.rb

@@ -0,0 +1,27 @@
+module ShopifyApp
+  class InMemorySessionStore
+    class EnvironmentError < StandardError; end
+
+    def self.retrieve(id)
+      repo[id]
+    end
+
+    def self.store(session)
+      id = SecureRandom.uuid
+      repo[id] = session
+      id
+    end
+
+    def self.clear
+      @@repo = nil
+    end
+
+    def self.repo
+      if Rails.env.production?
+        raise EnvironmentError.new("Cannot use InMemorySessionStore in a Production environment. \
+          Please initialize ShopifyApp with a model that can store and retrieve sessions")
+      end
+      @@repo ||= {}
+    end
+  end
+end

data/lib/shopify_app/{session_storage.rb → session/session_storage.rb}

@@ -2,6 +2,15 @@ module ShopifyApp
   module SessionStorage
     extend ActiveSupport::Concern
 
+    included do
+      validates :shopify_domain, presence: true, uniqueness: true
+      validates :shopify_token, presence: true
+    end
+
+    def with_shopify_session(&block)
+      ShopifyAPI::Session.temp(shopify_domain, shopify_token, &block)
+    end
+
     class_methods do
       def store(session)
         shop = self.find_or_initialize_by(shopify_domain: session.url)

data/lib/shopify_app/version.rb

@@ -1,3 +1,3 @@
 module ShopifyApp
-  VERSION = '7.4.0'
+  VERSION = '8.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify_app
 version: !ruby/object:Gem::Version
-  version: 7.4.0
+  version: 8.0.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-10 00:00:00.000000000 Z
+date: 2017-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -169,34 +169,31 @@ files:
 - lib/generators/shopify_app/install/templates/omniauth.rb
 - lib/generators/shopify_app/install/templates/shopify_app.rb
 - lib/generators/shopify_app/install/templates/shopify_provider.rb
-- lib/generators/shopify_app/install/templates/shopify_session_repository.rb
 - lib/generators/shopify_app/routes/routes_generator.rb
 - lib/generators/shopify_app/routes/templates/routes.rb
 - lib/generators/shopify_app/shop_model/shop_model_generator.rb
 - lib/generators/shopify_app/shop_model/templates/db/migrate/create_shops.erb
 - lib/generators/shopify_app/shop_model/templates/shop.rb
-- lib/generators/shopify_app/shop_model/templates/shopify_session_repository.rb
 - lib/generators/shopify_app/shop_model/templates/shops.yml
 - lib/generators/shopify_app/shopify_app_generator.rb
 - lib/generators/shopify_app/views/views_generator.rb
 - lib/shopify_app.rb
-- lib/shopify_app/app_proxy_verification.rb
 - lib/shopify_app/configuration.rb
+- lib/shopify_app/controller_concerns/app_proxy_verification.rb
+- lib/shopify_app/controller_concerns/embedded_app.rb
+- lib/shopify_app/controller_concerns/localization.rb
+- lib/shopify_app/controller_concerns/login_protection.rb
+- lib/shopify_app/controller_concerns/webhook_verification.rb
 - lib/shopify_app/engine.rb
-- lib/shopify_app/in_memory_session_store.rb
-- lib/shopify_app/localization.rb
-- lib/shopify_app/login_protection.rb
-- lib/shopify_app/scripttags_manager.rb
-- lib/shopify_app/scripttags_manager_job.rb
-- lib/shopify_app/session_storage.rb
-- lib/shopify_app/sessions_concern.rb
-- lib/shopify_app/shop.rb
-- lib/shopify_app/shopify_session_repository.rb
+- lib/shopify_app/jobs/scripttags_manager_job.rb
+- lib/shopify_app/jobs/webhooks_manager_job.rb
+- lib/shopify_app/managers/scripttags_manager.rb
+- lib/shopify_app/managers/webhooks_manager.rb
+- lib/shopify_app/session/in_memory_session_store.rb
+- lib/shopify_app/session/session_repository.rb
+- lib/shopify_app/session/session_storage.rb
 - lib/shopify_app/utils.rb
 - lib/shopify_app/version.rb
-- lib/shopify_app/webhook_verification.rb
-- lib/shopify_app/webhooks_manager.rb
-- lib/shopify_app/webhooks_manager_job.rb
 - shipit.rubygems.yml
 - shopify_app.gemspec
 homepage: 

data/lib/generators/shopify_app/install/templates/shopify_session_repository.rb

@@ -1,23 +0,0 @@
-# You should replace InMemorySessionStore with what you will be using
-# in Production. For example a model called "Shop":
-#
-# ShopifySessionRepository.storage = 'Shop'
-#
-# Interface to implement are self.retrieve(id) and self.store(ShopifyAPI::Session)
-# Here is how you would add these functions to an ActiveRecord:
-#
-# class Shop < ActiveRecord::Base
-#   def self.store(session)
-#     shop = self.new(domain: session.url, token: session.token)
-#     shop.save!
-#     shop.id
-#   end
-#
-#   def self.retrieve(id)
-#     if shop = self.where(id: id).first
-#       ShopifyAPI::Session.new(shop.domain, shop.token)
-#     end
-#   end
-# end
-
-ShopifyApp::SessionRepository.storage = InMemorySessionStore

data/lib/generators/shopify_app/shop_model/templates/shopify_session_repository.rb

@@ -1,9 +0,0 @@
-if Rails.configuration.cache_classes
-  ShopifyApp::SessionRepository.storage = Shop
-else
-  reloader = defined?(ActiveSupport::Reloader) ? ActiveSupport::Reloader : ActionDispatch::Reloader
-
-  reloader.to_prepare do
-    ShopifyApp::SessionRepository.storage = Shop
-  end
-end

data/lib/shopify_app/in_memory_session_store.rb

@@ -1,25 +0,0 @@
-# WARNING - This really only works for development, see README for more details
-class InMemorySessionStore
-  class EnvironmentError < StandardError; end
-
-  def self.retrieve(id)
-    repo[id]
-  end
-
-  def self.store(session)
-    id = SecureRandom.uuid
-    repo[id] = session
-    id
-  end
-
-  def self.clear
-    @@repo = nil
-  end
-
-  def self.repo
-    if Rails.env.production?
-      raise EnvironmentError.new("Cannot use InMemorySessionStore in a Production environment")
-    end
-    @@repo ||= {}
-  end
-end

data/lib/shopify_app/sessions_concern.rb

@@ -1,103 +0,0 @@
-module ShopifyApp
-  module SessionsConcern
-    extend ActiveSupport::Concern
-
-    included do
-      include ShopifyApp::LoginProtection
-      layout false, only: :new
-    end
-
-    def new
-      authenticate if sanitized_shop_name.present?
-    end
-
-    def create
-      authenticate
-    end
-
-    def callback
-      if auth_hash
-        login_shop
-        install_webhooks
-        install_scripttags
-        perform_after_authenticate_job
-
-        redirect_to return_address
-      else
-        flash[:error] = I18n.t('could_not_log_in')
-        redirect_to login_url
-      end
-    end
-
-    def destroy
-      session[:shopify] = nil
-      session[:shopify_domain] = nil
-      flash[:notice] = I18n.t('.logged_out')
-      redirect_to login_url
-    end
-
-    protected
-
-    def authenticate
-      if sanitized_shop_name.present?
-        fullpage_redirect_to "#{main_app.root_path}auth/shopify?shop=#{sanitized_shop_name}"
-      else
-        redirect_to return_address
-      end
-    end
-
-    def login_shop
-      sess = ShopifyAPI::Session.new(shop_name, token)
-      session[:shopify] = ShopifyApp::SessionRepository.store(sess)
-      session[:shopify_domain] = shop_name
-    end
-
-    def auth_hash
-      request.env['omniauth.auth']
-    end
-
-    def shop_name
-      auth_hash.uid
-    end
-
-    def token
-      auth_hash['credentials']['token']
-    end
-
-    def install_webhooks
-      return unless ShopifyApp.configuration.has_webhooks?
-
-      WebhooksManager.queue(
-        shop_name,
-        token,
-        ShopifyApp.configuration.webhooks
-      )
-    end
-
-    def install_scripttags
-      return unless ShopifyApp.configuration.has_scripttags?
-
-      ScripttagsManager.queue(
-        shop_name,
-        token,
-        ShopifyApp.configuration.scripttags
-      )
-    end
-
-    def return_address
-      session.delete(:return_to) || main_app.root_url
-    end
-
-    def perform_after_authenticate_job
-      config = ShopifyApp.configuration.after_authenticate_job
-
-      return unless config && config[:job].present?
-
-      if config[:inline] == true
-        config[:job].perform_now(shop_domain: session[:shopify_domain])
-      else
-        config[:job].perform_later(shop_domain: session[:shopify_domain])
-      end
-    end
-  end
-end

data/lib/shopify_app/shop.rb

@@ -1,15 +0,0 @@
-module ShopifyApp
-  module Shop
-    extend ActiveSupport::Concern
-
-    included do
-      validates :shopify_domain, presence: true, uniqueness: true
-      validates :shopify_token, presence: true
-    end
-
-    def with_shopify_session(&block)
-      ShopifyAPI::Session.temp(shopify_domain, shopify_token, &block)
-    end
-
-  end
-end