shopify_app 6.1.2 → 6.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edd2018df13585de884dcef3250e27251cba681c
-  data.tar.gz: 0297fb447782e9268f3af28fdede9d30b777f0a5
+  metadata.gz: ad89b235fe52fa742244b8b41e4cd54c892c7756
+  data.tar.gz: 1444bd3ab1ce8fa75307adf0f079b12f2e9cad39
 SHA512:
-  metadata.gz: b52906367f75755913a17b5659d6cb782850386f7e4b23c601a24afb50bddab5e0132f5af93ba8c2a79d052d65cf403fcf228f84873b8ca7b7d475d0aae1328b
-  data.tar.gz: 5be95c420bb9a8585e764ced63d38048401a922b2cd1c436d5b0f272318a3ab90a2f1c8caca5e3b70167b1146cc1290fdbb35216d88c9c66c3122ed6b9557e0a
+  metadata.gz: 802e2f111acf873666e658054dba37263b5f604aadc218d3f56708459c87435a02ea62445a2a1525179706d10c3811577febafd4c83d6613a80d15f9513f409b
+  data.tar.gz: 0934008dbe28d8bd66170a7ee112e0b60d8bc9e4dd8e9d7ef3de74d925bb4eed39bf0807c76eea77644777fda920977b884e8f0a53e6a1cbc8191044bc40de11

data/.gitignore

@@ -8,3 +8,4 @@ doc/
 *.log
 *.sqlite3
 test/tmp/*
+.idea

data/CHANGELOG

@@ -1,3 +1,8 @@
+6.1.3
+-----
+* add redirect_uri which is now required
+* fix login again with different shop
+
 6.0.0
 -----
 * Re-written as a proper rails engine

data/README.md

@@ -57,7 +57,7 @@ $ rails generate shopify_app:install
 
 # or optionally with arguments:
 
-$ rails generate shopify_app:install -api_key=<your_api_key> -secret=<your_app_secret>
+$ rails generate shopify_app:install -api_key=<your_api_key> -secret=<your_app_secret> -redirect_uri=<your_redirect_uri>
 ```
 
 Other options include:
@@ -101,6 +101,7 @@ The `install` generator places your Api credentials directly into the shopify_ap
 ShopifyApp.configure do |config|
   config.api_key = ENV['SHOPIFY_CLIENT_API_KEY']
   config.secret = ENV['SHOPIFY_CLIENT_API_SECRET']
+  config.redirect_uri = "<%= your_redirect_uri %>"
   config.scope = 'read_customers, read_orders, write_products'
   config.embedded_app = true
 end

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

@@ -19,6 +19,7 @@ module ShopifyApp
         {
           api_key: '<api_key>',
           secret: '<secret>',
+          redirect_uri: '<redirect_uri>',
           scope: 'read_orders, read_products',
           embedded: 'true'
         }

data/lib/generators/shopify_app/install/templates/embedded_app.html.erb

@@ -7,7 +7,8 @@
   <script type="text/javascript">
     ShopifyApp.init({
       apiKey: "<%= ShopifyApp.configuration.api_key %>",
-      shopOrigin: '<%= "https://#{ @shop_session.url }" if @shop_session %>'
+      shopOrigin: "<%= "https://#{ @shop_session.url }" if @shop_session %>",
+      debug: <%= Rails.env.development? ? 'true' : 'false' %>
     });
   </script>
 

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

@@ -1,6 +1,7 @@
 ShopifyApp.configure do |config|
   config.api_key = "<%= opts[:api_key] %>"
   config.secret = "<%= opts[:secret] %>"
+  config.redirect_uri = "<%= opts[:redirect_uri] %>"
   config.scope = "<%= opts[:scope] %>"
   config.embedded_app = <%= embedded_app? %>
 end

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

@@ -2,4 +2,6 @@
     ShopifyApp.configuration.api_key,
     ShopifyApp.configuration.secret,
 
+    :redirect_uri => ShopifyApp.configuration.redirect_uri,
+
     :scope => ShopifyApp.configuration.scope

data/lib/shopify_app/configuration.rb

@@ -6,6 +6,7 @@ module ShopifyApp
     # `config/initializers/shopify_app.rb`
     attr_accessor :api_key
     attr_accessor :secret
+    attr_accessor :redirect_uri
     attr_accessor :scope
     attr_accessor :embedded_app
     alias_method  :embedded_app?, :embedded_app

data/lib/shopify_app/login_protection.rb

@@ -26,6 +26,8 @@ module ShopifyApp
 
     def login_again_if_different_shop
       if shop_session && params[:shop] && params[:shop].is_a?(String) && shop_session.url != params[:shop]
+        session[:shopify] = nil
+        session[:shopify_domain] = nil
         redirect_to_login
       end
     end
@@ -39,6 +41,7 @@ module ShopifyApp
 
     def close_session
       session[:shopify] = nil
+      session[:shopify_domain] = nil
       redirect_to login_path
     end
 

data/lib/shopify_app/sessions_controller.rb

@@ -42,7 +42,7 @@ module ShopifyApp
     end
 
     def return_address
-      session[:return_to] || main_app.root_url
+      session.delete(:return_to) || main_app.root_url
     end
 
     def sanitized_shop_name

data/lib/shopify_app/version.rb

@@ -1,3 +1,3 @@
 module ShopifyApp
-  VERSION = "6.1.2"
+  VERSION = "6.1.3"
 end

data/test/generators/install_generator_test.rb

@@ -17,6 +17,7 @@ class InstallGeneratorTest < Rails::Generators::TestCase
     assert_file "config/initializers/shopify_app.rb" do |shopify_app|
       assert_match 'config.api_key = "<api_key>"', shopify_app
       assert_match 'config.secret = "<secret>"', shopify_app
+      assert_match 'config.redirect_uri = "<redirect_uri>"', shopify_app
       assert_match 'config.scope = "read_orders, read_products"', shopify_app
       assert_match "config.embedded_app = true", shopify_app
     end

data/test/shopify_app/login_protection_test.rb

@@ -6,9 +6,15 @@ class LoginProtectionController < ActionController::Base
   include ShopifyApp::LoginProtection
   helper_method :shop_session
 
+  before_action :login_again_if_different_shop, only: [:second_login]
+
   def index
     render nothing: true
   end
+
+  def second_login
+    render nothing: true
+  end
 end
 
 class LoginProtectionTest < ActionController::TestCase
@@ -45,12 +51,26 @@ class LoginProtectionTest < ActionController::TestCase
     end
   end
 
+  test "login_again_if_different_shop removes current session and redirects to login path" do
+    with_application_test_routes do
+      session[:shopify] = "foobar"
+      session[:shopify_domain] = "foobar"
+      sess = stub(url: 'https://foobar.myshopify.com')
+      ShopifyApp::SessionRepository.expects(:retrieve).returns(sess).once
+      get :second_login, shop: 'other_shop'
+      assert_redirected_to @controller.send(:login_path, shop: 'other_shop')
+      assert_nil session[:shopify]
+      assert_nil session[:shopify_domain]
+    end
+  end
+
   private
 
   def with_application_test_routes
     with_routing do |set|
       set.draw do
         get '/' => 'login_protection#index'
+        get '/second_login' => 'login_protection#second_login'
       end
       yield
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify_app
 version: !ruby/object:Gem::Version
-  version: 6.1.2
+  version: 6.1.3
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails