shopify_app 6.0.1 → 6.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29d6e51ca55be46503ae5c1852d423d44f7f5949
-  data.tar.gz: 050e64759df2bb9aca2cb7d40faab876a3cb0b85
+  metadata.gz: 2128cbc693c2918c3f6e8de7f46db48a1eb35970
+  data.tar.gz: 7c604d8f79f315f2195fa80c9de2df2f97e124e5
 SHA512:
-  metadata.gz: cf160257914859df8d18439adcc242b7963cdc862e24145bd24f119cdce1d154555ca9fa3ff65f1a2556b00466be85db79cc5edb3b6d8458fd96956bd904e910
-  data.tar.gz: b28d43f8edb5e377969051cc799635c3db7117a0095c7b593d280f974142ecfbf411b298d4f9f53a097bebcebe57b77e0ac43752943dd2fe637d56b15fd92d45
+  metadata.gz: 67b2bde7fe1c4aba16f6a4d247b91197fc4d60bb67d1ba3cfabfc0230d9c8a6fd5702982d76601c50b0a7e9bd5cbb5a928b946ccb31f293b0101305816cd57b0
+  data.tar.gz: af165ae01b04a02c143c1d73dae6df405d8671ab83ff4635c638763efbe18bcfaa7860f1acec1eab290eec8ef009d193cafe17f8faa4652e64e45d2c5725d7e1

data/lib/shopify_app.rb

@@ -15,6 +15,7 @@ require 'shopify_app/shop'
 require 'shopify_app/controller'
 require 'shopify_app/sessions_controller'
 require 'shopify_app/login_protection'
+require 'shopify_app/utils'
 
 # session repository
 require 'shopify_app/shopify_session_repository'

data/lib/shopify_app/sessions_controller.rb

@@ -49,15 +49,7 @@ module ShopifyApp
 
     def sanitize_shop_param(params)
       return unless params[:shop].present?
-
-      name = params[:shop].to_s.strip
-      name += ".#{ShopifyApp.configuration.myshopify_domain}" if !name.include?("#{ShopifyApp.configuration.myshopify_domain}") && !name.include?(".")
-      name.sub!(%r|https?://|, '')
-
-      u = URI("http://#{name}")
-      u.host && u.host.ends_with?(".#{ShopifyApp.configuration.myshopify_domain}") ? u.host : nil
-    rescue URI::InvalidURIError
-      nil
+      ShopifyApp::Utils.sanitize_shop_domain(params[:shop])
     end
 
   end

data/lib/shopify_app/utils.rb

@@ -0,0 +1,16 @@
+module ShopifyApp
+  module Utils
+
+    def self.sanitize_shop_domain(shop_domain)
+      name = shop_domain.to_s.strip
+      name += ".#{ShopifyApp.configuration.myshopify_domain}" if !name.include?("#{ShopifyApp.configuration.myshopify_domain}") && !name.include?(".")
+      name.sub!(%r|https?://|, '')
+
+      u = URI("http://#{name}")
+      u.host && u.host.ends_with?(".#{ShopifyApp.configuration.myshopify_domain}") ? u.host : nil
+    rescue URI::InvalidURIError
+      nil
+    end
+
+  end
+end

data/lib/shopify_app/version.rb

@@ -1,3 +1,3 @@
 module ShopifyApp
-  VERSION = "6.0.1"
+  VERSION = "6.0.2"
 end

data/test/shopify_app/utils_test.rb

@@ -0,0 +1,30 @@
+require 'test_helper'
+
+class UtilsTest < ActiveSupport::TestCase
+
+  setup do
+    ShopifyApp.configuration = nil
+  end
+
+  ['my-shop', 'my-shop.myshopify.com', 'https://my-shop.myshopify.com', 'http://my-shop.myshopify.com'].each do |good_url|
+    test "sanitize_shop_domain for (#{good_url})" do
+      ShopifyApp.configuration.embedded_app = true
+      assert ShopifyApp::Utils.sanitize_shop_domain(good_url)
+    end
+  end
+
+  ['my-shop', 'my-shop.myshopify.io', 'https://my-shop.myshopify.io', 'http://my-shop.myshopify.io'].each do |good_url|
+    test "sanitize_shop_domain URL (#{good_url}) with custom myshopify_domain" do
+      ShopifyApp.configuration.embedded_app = true
+      ShopifyApp.configuration.myshopify_domain = 'myshopify.io'
+      assert ShopifyApp::Utils.sanitize_shop_domain(good_url)
+    end
+  end
+
+  ['myshop.com', 'myshopify.com', 'shopify.com', 'two words', 'store.myshopify.com.evil.com', '/foo/bar'].each do |bad_url|
+    test "sanitize_shop_domain for a non-myshopify URL (#{bad_url})" do
+      assert_nil ShopifyApp::Utils.sanitize_shop_domain(bad_url)
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopify_app
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.0.2
 platform: ruby
 authors:
 - Shopify
@@ -30,7 +30,7 @@ cert_chain:
   fl3hbtVFTqbOlwL9vy1fudXcolIE/ZTcxQ+er07ZFZdKCXayR9PPs64heamfn0fp
   TConQSX2BnZdhIEYW+cKzEC/bLc=
   -----END CERTIFICATE-----
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -195,6 +195,7 @@ files:
 - lib/shopify_app/sessions_controller.rb
 - lib/shopify_app/shop.rb
 - lib/shopify_app/shopify_session_repository.rb
+- lib/shopify_app/utils.rb
 - lib/shopify_app/version.rb
 - shipit.rubygems.yml
 - shopify_app.gemspec
@@ -223,6 +224,7 @@ files:
 - test/shopify_app/in_memory_session_store_test.rb
 - test/shopify_app/login_protection_test.rb
 - test/shopify_app/shopify_session_repository_test.rb
+- test/shopify_app/utils_test.rb
 - test/support/generator_test_helpers.rb
 - test/test_helper.rb
 homepage: