Quellcode durchsuchen

Remove /admin addition to site in session.

This is nolonger needed since we have overridden how default prefix is
set.
Alex Aitken vor 6 Jahren
Ursprung
Commit
46445ed6c5
3 geänderte Dateien mit 14 neuen und 11 gelöschten Zeilen
  1. 2 2
      lib/shopify_api/session.rb
  2. 4 4
      test/base_test.rb
  3. 8 5
      test/session_test.rb

+ 2 - 2
lib/shopify_api/session.rb

@@ -74,7 +74,7 @@ module ShopifyAPI
     def create_permission_url(scope, redirect_uri = nil)
       params = {:client_id => api_key, :scope => scope.join(',')}
       params[:redirect_uri] = redirect_uri if redirect_uri
-      "#{site}/oauth/authorize?#{parameterize(params)}"
+      "https://#{url}/admin/oauth/authorize?#{parameterize(params)}"
     end
 
     def request_token(params)
@@ -103,7 +103,7 @@ module ShopifyAPI
     end
 
     def site
-      "https://#{url}/admin"
+      "https://#{url}"
     end
 
     def valid?

+ 4 - 4
test/base_test.rb

@@ -16,8 +16,8 @@ class BaseTest < Test::Unit::TestCase
     ShopifyAPI::Base.activate_session @session1
 
     assert_nil ActiveResource::Base.site
-    assert_equal 'https://shop1.myshopify.com/admin', ShopifyAPI::Base.site.to_s
-    assert_equal 'https://shop1.myshopify.com/admin', ShopifyAPI::Shop.site.to_s
+    assert_equal 'https://shop1.myshopify.com', ShopifyAPI::Base.site.to_s
+    assert_equal 'https://shop1.myshopify.com', ShopifyAPI::Shop.site.to_s
 
     assert_nil ActiveResource::Base.headers['X-Shopify-Access-Token']
     assert_equal 'token1', ShopifyAPI::Base.headers['X-Shopify-Access-Token']
@@ -56,8 +56,8 @@ class BaseTest < Test::Unit::TestCase
     ShopifyAPI::Base.activate_session @session2
 
     assert_nil ActiveResource::Base.site
-    assert_equal 'https://shop2.myshopify.com/admin', ShopifyAPI::Base.site.to_s
-    assert_equal 'https://shop2.myshopify.com/admin', ShopifyAPI::Shop.site.to_s
+    assert_equal 'https://shop2.myshopify.com', ShopifyAPI::Base.site.to_s
+    assert_equal 'https://shop2.myshopify.com', ShopifyAPI::Shop.site.to_s
 
     assert_nil ActiveResource::Base.headers['X-Shopify-Access-Token']
     assert_equal 'token2', ShopifyAPI::Base.headers['X-Shopify-Access-Token']

+ 8 - 5
test/session_test.rb

@@ -30,11 +30,14 @@ class SessionTest < Test::Unit::TestCase
   end
 
   test "ignore everything but the subdomain in the shop" do
-    assert_equal "https://testshop.myshopify.com/admin", ShopifyAPI::Session.new("http://user:pass@testshop.notshopify.net/path", "any-token").site
+    assert_equal(
+      "https://testshop.myshopify.com",
+      ShopifyAPI::Session.new("http://user:pass@testshop.notshopify.net/path", "any-token").site
+    )
   end
 
   test "append the myshopify domain if not given" do
-    assert_equal "https://testshop.myshopify.com/admin", ShopifyAPI::Session.new("testshop", "any-token").site
+    assert_equal "https://testshop.myshopify.com", ShopifyAPI::Session.new("testshop", "any-token").site
   end
 
   test "not raise error without params" do
@@ -65,8 +68,8 @@ class SessionTest < Test::Unit::TestCase
     ShopifyAPI::Session.temp("testshop.myshopify.com", "any-token") {
       @assigned_site = ShopifyAPI::Base.site
     }
-    assert_equal 'https://testshop.myshopify.com/admin', @assigned_site.to_s
-    assert_equal 'https://fakeshop.myshopify.com/admin', ShopifyAPI::Base.site.to_s
+    assert_equal 'https://testshop.myshopify.com', @assigned_site.to_s
+    assert_equal 'https://fakeshop.myshopify.com', ShopifyAPI::Base.site.to_s
   end
 
   test "create_permission_url returns correct url with single scope no redirect uri" do
@@ -113,7 +116,7 @@ class SessionTest < Test::Unit::TestCase
 
   test "return site for session" do
     session = ShopifyAPI::Session.new("testshop.myshopify.com", "any-token")
-    assert_equal "https://testshop.myshopify.com/admin", session.site
+    assert_equal "https://testshop.myshopify.com", session.site
   end
 
   test "return_token_if_signature_is_valid" do