shopify_app 2.1.2 → 3.0.0

data/lib/generators/shopify_app/shopify_app_generator.rb

@@ -13,6 +13,7 @@ class ShopifyAppGenerator < Rails::Generators::Base
   def copy_files
     directory 'app'
     directory 'public'
+    directory 'config'
   end
   
   def remove_static_index
@@ -45,6 +46,7 @@ class ShopifyAppGenerator < Rails::Generators::Base
       route "match 'login'              => 'login#index',        :as => :login"
       route "match 'design'             => 'home#design'"
       route "match 'welcome'            => 'home#welcome'"
+      route "match 'auth/shopify/callback' => 'login#finalize'"
     end
   end
   

data/lib/generators/shopify_app/templates/app/controllers/login_controller.rb

@@ -10,23 +10,17 @@ class LoginController < ApplicationController
 
   def authenticate
     if params[:shop].present?
-      redirect_to ShopifyAPI::Session.new(params[:shop].to_s.strip).create_permission_url
+      redirect_to "/auth/shopify?shop=#{params[:shop].to_s.strip}"
     else
       redirect_to return_address
     end
   end
   
-  # Shopify redirects the logged-in user back to this action along with
-  # the authorization token t.
-  # 
-  # This token is later combined with the developer's shared secret to form
-  # the password used to call API methods.
   def finalize
-    shopify_session = ShopifyAPI::Session.new(params[:shop], params[:t], params)
-    if shopify_session.valid?
-      session[:shopify] = shopify_session
-      flash[:notice] = "Logged in to shopify store."
-      
+    if response = request.env['omniauth.auth']
+      sess = ShopifyAPI::Session.new(params['shop'], response['credentials']['token'])
+      session[:shopify] = sess        
+      flash[:notice] = "Logged in"
       redirect_to return_address
       session[:return_to] = nil
     else

data/lib/generators/shopify_app/templates/config/initializers/omniauth.rb

@@ -0,0 +1,12 @@
+Rails.application.config.middleware.use OmniAuth::Builder do
+  provider :shopify, 
+           ShopifyApp.configuration.api_key, 
+           ShopifyApp.configuration.secret,
+           :scope => 'write_script_tags,write_shipping,write_orders,read_orders,read_products,read_customers,read_content',
+           :setup => lambda {|env| 
+                       params = Rack::Utils.parse_query(env['QUERY_STRING'])
+                       site_url = "https://#{params['shop']}"
+                       Rails.logger.info(env['omniauth.strategy'])
+                       env['omniauth.strategy'].options[:client_options][:site] = site_url
+                     }
+end

data/lib/shopify_app.rb

@@ -1,4 +1,5 @@
 require 'shopify_api'
+require 'omniauth-shopify-oauth2'
 
 module ShopifyApp
 

data/lib/shopify_app/login_protection.rb

@@ -4,9 +4,11 @@ module ShopifyApp::LoginProtection
       begin
         # session[:shopify] set in LoginController#finalize
         ShopifyAPI::Base.site = session[:shopify].site
+        ShopifyAPI::Base.activate_session(session[:shopify])
         yield
       ensure 
         ShopifyAPI::Base.site = nil
+        ShopifyAPI::Base.clear_session
       end
     else
       session[:return_to] = request.fullpath

data/lib/shopify_app/version.rb

@@ -1,3 +1,3 @@
 module ShopifyApp
-  VERSION = "2.1.2"
+  VERSION = "3.0.0"
 end

data/shopify_app.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = ShopifyApp::VERSION
   s.platform    = Gem::Platform::RUBY
   s.author      = "Shopify"
-  s.email       = ["edward@shopify.com", "willem@shopify.com"]
+  s.email       = ["edward@shopify.com", "willem@shopify.com", "david.underwood@shopify.com"]
   s.homepage    = "http://www.shopify.com/developers"
   s.summary     = %q{This gem is used to get quickly started with the Shopify API}
   s.description = %q{Creates a basic login controller for authenticating with your Shop and also a product controller which lets your edit your products easily.}
@@ -15,7 +15,8 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "shopify-api"
 
   s.add_runtime_dependency('rails', '~> 3.1')
-  s.add_runtime_dependency('shopify_api', '2.3.0')
+  s.add_runtime_dependency('shopify_api', '3.0.0')
+  s.add_runtime_dependency('omniauth-shopify-oauth2', '1.0.0')
   
   s.add_development_dependency('rake')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopify_app
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 3.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-05 00:00:00.000000000 Z
+date: 2012-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70317972340440 !ruby/object:Gem::Requirement
+  requirement: &70366611983880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,32 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70317972340440
+  version_requirements: *70366611983880
 - !ruby/object:Gem::Dependency
   name: shopify_api
-  requirement: &70317972339520 !ruby/object:Gem::Requirement
+  requirement: &70366611983380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70317972339520
+  version_requirements: *70366611983380
+- !ruby/object:Gem::Dependency
+  name: omniauth-shopify-oauth2
+  requirement: &70366611982920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70366611982920
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70317972338580 !ruby/object:Gem::Requirement
+  requirement: &70366611982540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,12 +54,13 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70317972338580
+  version_requirements: *70366611982540
 description: Creates a basic login controller for authenticating with your Shop and
   also a product controller which lets your edit your products easily.
 email:
 - edward@shopify.com
 - willem@shopify.com
+- david.underwood@shopify.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -83,6 +95,7 @@ files:
 - lib/generators/shopify_app/templates/app/views/home/welcome.html.erb
 - lib/generators/shopify_app/templates/app/views/layouts/application.html.erb
 - lib/generators/shopify_app/templates/app/views/login/index.html.erb
+- lib/generators/shopify_app/templates/config/initializers/omniauth.rb
 - lib/generators/shopify_app/templates/public/404.html
 - lib/generators/shopify_app/templates/public/422.html
 - lib/generators/shopify_app/templates/public/500.html