Add a default value for the setup option.

Author: dylanahsmith

README.md

@@ -32,16 +32,11 @@ You can configure the scope, which you pass in to the `provider` method via a `H
 
 * `scope`: A comma-separated list of permissions you want to request from the user. See [the Shopify API docs](http://docs.shopify.com/api/tutorials/oauth) for a full list of available permissions.
 
-* `setup`: A lambda which dynamically sets the `site`. You must initiate the OmniAuth process by passing in a `shop` query parameter of the shop you're requesting permissions for. Ex. http://myapp.com/auth/shopify?shop=example.myshopify.com
-
 For example, to request `read_products`, `read_orders` and `write_content` permissions and display the authentication page:
 
 ```ruby
 Rails.application.config.middleware.use OmniAuth::Builder do
-  provider :shopify, ENV['SHOPIFY_API_KEY'], ENV['SHOPIFY_SHARED_SECRET'],
-            :scope => 'read_products,read_orders,write_content',
-            :setup => lambda { |env| params = Rack::Utils.parse_query(env['QUERY_STRING'])
-                                     env['omniauth.strategy'].options[:client_options][:site] = "https://#{params['shop']}" }
+  provider :shopify, ENV['SHOPIFY_API_KEY'], ENV['SHOPIFY_SHARED_SECRET'], :scope => 'read_products,read_orders,write_content'
 end
 ```
 

example/config.ru

@@ -38,10 +38,7 @@ end
 use Rack::Session::Cookie, secret: SecureRandom.hex(64)
 
 use OmniAuth::Builder do
-  provider :shopify, ENV['SHOPIFY_API_KEY'], ENV['SHOPIFY_SHARED_SECRET'],
-           :scope => SCOPE,
-           :setup => lambda { |env| params = Rack::Utils.parse_query(env['QUERY_STRING'])
-                                    env['omniauth.strategy'].options[:client_options][:site] = "https://#{params['shop']}" }
+  provider :shopify, ENV['SHOPIFY_API_KEY'], ENV['SHOPIFY_SHARED_SECRET'], :scope => SCOPE
 end
 
 run App.new

lib/omniauth/strategies/shopify.rb

@@ -13,10 +13,15 @@ class Shopify < OmniAuth::Strategies::OAuth2
       }
 
       option :callback_url
-      
+
       option :provider_ignores_state, true
       option :myshopify_domain, 'myshopify.com'
 
+      option :setup, proc { |env|
+        request = Rack::Request.new(env)
+        env['omniauth.strategy'].options[:client_options][:site] = "https://#{request.GET['shop']}"
+      }
+
       uid { URI.parse(options[:client_options][:site]).host }
 
       def valid_site?

test/integration_test.rb

@@ -74,8 +74,16 @@ def test_callback
   end
 
   def test_provider_options
-    build_app scope: 'read_products,read_orders,write_content', callback_path: '/admin/auth/legacy/callback', myshopify_domain: 'myshopify.dev:3000'
-    response = authorize('snowdevil.myshopify.dev:3000')
+    build_app scope: 'read_products,read_orders,write_content',
+              callback_path: '/admin/auth/legacy/callback',
+              myshopify_domain: 'myshopify.dev:3000',
+              setup: lambda { |env|
+                shop = Rack::Request.new(env).GET['shop']
+                shop += ".myshopify.dev:3000" unless shop.include?(".")
+                env['omniauth.strategy'].options[:client_options][:site] = "https://#{shop}"
+              }
+
+    response = authorize('snowdevil')
     assert_equal 302, response.status
     assert_match /\A#{Regexp.quote("https://snowdevil.myshopify.dev:3000/admin/oauth/authorize?")}/, response.location
     redirect_params = Rack::Utils.parse_query(URI(response.location).query)
@@ -92,11 +100,6 @@ def build_app(options={})
     }
 
     app = OmniAuth::Builder.new(app) do
-      options[:setup] ||= lambda { |env|
-        params = Rack::Utils.parse_query(env['QUERY_STRING'])
-        env['omniauth.strategy'].options[:client_options][:site] = "https://#{params['shop']}"
-      }
-
       provider :shopify, '123', '53cr3tz', options
     end
     @app = Rack::Session::Cookie.new(app, secret: SecureRandom.hex(64))