omniauth-shopify-oauth2 1.1.2 → 1.1.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f24fe6681c6f7153279737aa891bb2a400e8ae9c
+  data.tar.gz: fb0c659e1ed149565bfde4ec52018b2d65f84f28
+SHA512:
+  metadata.gz: 1a2ac60edb571aabc8551c922298eacf213ff39906172c5bcfbde361896cb78ca757e2bccb1f826d84c143d68103417509dde3533d310e78ea35e1ff7c044921
+  data.tar.gz: 2aec89d6c7778ecc9bdbf71cf9a44afd325b02ef6d65231a4d6a9facb80c5da94e03ddbe615de3a9541f42fc78f6b4ec92abdc5ab2c4df559ee7e01fc08b67dd

data/Gemfile.lock

@@ -1,33 +1,35 @@
 PATH
   remote: .
   specs:
-    omniauth-shopify-oauth2 (1.1.2)
+    omniauth-shopify-oauth2 (1.1.3)
       omniauth-oauth2 (~> 1.1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.1.3)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
     hashie (2.0.5)
-    httpauth (0.2.0)
-    jwt (0.1.8)
+    jwt (0.1.11)
       multi_json (>= 1.5)
-    multi_json (1.8.2)
-    multipart-post (1.2.0)
-    oauth2 (0.8.1)
-      faraday (~> 0.8)
-      httpauth (~> 0.1)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
+    multi_json (1.9.0)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    oauth2 (0.9.3)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 0.1.8)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
       rack (~> 1.2)
-    omniauth (1.1.4)
+    omniauth (1.2.1)
       hashie (>= 1.2, < 3)
-      rack
-    omniauth-oauth2 (1.1.1)
-      oauth2 (~> 0.8.0)
-      omniauth (~> 1.0)
+      rack (~> 1.0)
+    omniauth-oauth2 (1.1.2)
+      faraday (>= 0.8, < 0.10)
+      multi_json (~> 1.3)
+      oauth2 (~> 0.9.3)
+      omniauth (~> 1.2)
     rack (1.5.2)
     rake (0.9.2.2)
     rspec (2.7.0)

data/README.md

@@ -39,7 +39,7 @@ 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] = "http://#{params['shop']}" }
+                                     env['omniauth.strategy'].options[:client_options][:site] = "https://#{params['shop']}" }
 end
 ```
 

data/lib/omniauth/shopify/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Shopify
-    VERSION = "1.1.2"
+    VERSION = "1.1.3"
   end
 end

data/lib/omniauth/strategies/shopify.rb

@@ -19,12 +19,24 @@ module OmniAuth
       uid { URI.parse(options[:client_options][:site]).host }
 
       def valid_site?
-        return /^https\:\/\/[a-zA-Z0-9][a-zA-Z0-9\-]*\.myshopify\.com[\/]?$/ =~ options[:client_options][:site]
+        return /\A(https|http)\:\/\/[a-zA-Z0-9][a-zA-Z0-9\-]*\.myshopify\.com[\/]?\z/ =~ options[:client_options][:site]
+      end
+
+      def fix_https
+        options[:client_options][:site].gsub!(/\Ahttp\:/, 'https:')
       end
 
       def setup_phase
         super
-        raise CallbackError.new(nil, :invalid_site) unless valid_site?
+        fix_https
+      end
+
+      def request_phase
+        if valid_site?
+          super
+        else
+          fail!(:invalid_site)
+        end
       end
 
       def authorize_params

data/spec/omniauth/strategies/shopify_spec.rb

@@ -22,6 +22,20 @@ describe OmniAuth::Strategies::Shopify do
     end
   end
 
+  describe '#fix_https' do
+    it 'replaces http scheme by https' do
+      @options = {:client_options => {:site => 'http://foo.bar/'}}
+      subject.fix_https
+      subject.options[:client_options][:site].should eq('https://foo.bar/')
+    end
+
+    it 'does not replace https scheme' do
+      @options = {:client_options => {:site => 'https://foo.bar/'}}
+      subject.fix_https
+      subject.options[:client_options][:site].should eq('https://foo.bar/')
+    end
+  end
+
   describe '#client' do
     it 'has correct shopify site' do
       subject.client.site.should eq('https://example.myshopify.com')

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-shopify-oauth2
 version: !ruby/object:Gem::Version
-  version: 1.1.2
-  prerelease: 
+  version: 1.1.3
 platform: ruby
 authors:
 - Denis Odorcic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -66,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -85,27 +78,26 @@ files:
 homepage: https://github.com/Shopify/omniauth-shopify-oauth2
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Shopify strategy for OmniAuth
 test_files:
 - spec/omniauth/strategies/shopify_spec.rb