shopify_app 10.0.0 → 11.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e0d05767b5c3ee4f64bcf9e9198943956769b371d47fe4f1e4d986e8c87b776
-  data.tar.gz: d19668b932f7e091c012f82096e12648fe61a6d2358b8c8a62c1dc18dc267eae
+  metadata.gz: 99e91b542c6d5f2fb530c9d259e6d32d463bb6e8d0720dd11faa009e845d2ced
+  data.tar.gz: '0214085b33d8ccbb7dfe929430f81b75296ac5cf201c6b9969ba0b5d78ea7351'
 SHA512:
-  metadata.gz: 33d7d6e5c3b054a30f8d18b296ac335310561c9f383e24b8dd0a0cf0cb52f324421efa14e2ca721a1b4c48e0b63894b72d9443d37e59df155a1477eb25d6372d
-  data.tar.gz: dec296c178ac77f2d315e7f4534dcd50c3e042ff1875299748668b10f32278ed54d6b76dec45c7a9600a97a023f6f0718ba6a022ba4fe056f8e982ab514b1305
+  metadata.gz: f8fb32cc915ecfeba1ee7db40f1cd3ec4e0c9b8c8bae697370248a8f6225f70504da6a3a160cdfb960426899c2d0abcbbe8f623a0771cef81c7ddb1e58ac779d
+  data.tar.gz: 73c4b7f0f49130ea808fd7b4c24cef408025a5fcaf89a8b29ee2c0baa0e00d0837b11ec6ecd7f35d4c57269a39e357a9d3cb7d5b55b66a76ff25b0444f503405

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+11.0.0
+-----
+
+* Rename `login_url` method to `login_url_with_optional_shop` to avoid ambiguity with Rails' route helper method of the
+  same name (see [#585](https://github.com/Shopify/shopify_app/pull/585)).
+
 10.0.0
 -----
 

data/app/controllers/shopify_app/callback_controller.rb

@@ -15,7 +15,7 @@ module ShopifyApp
         redirect_to return_address
       else
         flash[:error] = I18n.t('could_not_log_in')
-        redirect_to login_url
+        redirect_to(login_url_with_optional_shop)
       end
     end
 

data/app/controllers/shopify_app/sessions_controller.rb

@@ -22,14 +22,14 @@ module ShopifyApp
         does_not_have_storage_access_url: top_level_interaction_path(
           shop: sanitized_shop_name
         ),
-        has_storage_access_url: login_url(top_level: true),
+        has_storage_access_url: login_url_with_optional_shop(top_level: true),
         app_home_url: granted_storage_access_path(shop: sanitized_shop_name),
         current_shopify_domain: current_shopify_domain,
       })
     end
 
     def top_level_interaction
-      @url = login_url(top_level: true)
+      @url = login_url_with_optional_shop(top_level: true)
       validate_shop
     end
 
@@ -45,7 +45,7 @@ module ShopifyApp
     def destroy
       reset_session
       flash[:notice] = I18n.t('.logged_out')
-      redirect_to login_url
+      redirect_to(login_url_with_optional_shop)
     end
 
     private
@@ -110,7 +110,7 @@ module ShopifyApp
     end
 
     def authenticate_at_top_level
-      fullpage_redirect_to login_url(top_level: true)
+      fullpage_redirect_to(login_url_with_optional_shop(top_level: true))
     end
 
     def authenticate_in_context?
@@ -128,14 +128,18 @@ module ShopifyApp
     end
 
     def redirect_to_request_storage_access
-      render :request_storage_access, layout: false, locals: {
-        does_not_have_storage_access_url: top_level_interaction_path(
-          shop: sanitized_shop_name
-        ),
-        has_storage_access_url: login_url(top_level: true),
-        app_home_url: granted_storage_access_path(shop: sanitized_shop_name),
-        current_shopify_domain: current_shopify_domain
-      }
+      render(
+        :request_storage_access,
+        layout: false,
+        locals: {
+          does_not_have_storage_access_url: top_level_interaction_path(
+            shop: sanitized_shop_name
+          ),
+          has_storage_access_url: login_url_with_optional_shop(top_level: true),
+          app_home_url: granted_storage_access_path(shop: sanitized_shop_name),
+          current_shopify_domain: current_shopify_domain,
+        }
+      )
     end
   end
 end

data/config/locales/ms.yml

@@ -4,18 +4,19 @@ ms:
   could_not_log_in: Tidak dapat log masuk ke kedai Shopify
   invalid_shop_url: Domain kedai tidak sah
   enable_cookies_heading: Dayakan kuki dari %{app}
-  enable_cookies_body: Anda mesti mengaktifkan kuki secara manual dalam browser ini
+  enable_cookies_body: Anda mesti mengaktifkan kuki secara manual dalam pelayar ini
     untuk %{app} digunakan dalam Shopify.
-  enable_cookies_footer: Kuki membenarkan app mengesahkan anda dengan menyimpan keutamaan
-    dan maklumat peribadi anda buat sementara waktu. Ia tamat tempoh selepas 30 hari.
+  enable_cookies_footer: Kuki membenarkan aplikasi mengesahkan anda dengan menyimpan
+    keutamaan dan maklumat peribadi anda buat sementara waktu. Ia tamat tempoh selepas
+    30 hari.
   enable_cookies_action: Dayakan kuki
-  top_level_interaction_heading: Browser anda perlu mengesahkan %{app}
-  top_level_interaction_body: Browser anda memerlukan app seperti %{app} untuk meminta
-    anda akses kepada kuki sebelum Shopify boleh membukanya untuk anda.
+  top_level_interaction_heading: Pelayar anda perlu mengesahkan %{app}
+  top_level_interaction_body: Pelayar anda memerlukan aplikasi seperti %{app} untuk
+    meminta anda akses kepada kuki sebelum Shopify boleh membukanya untuk anda.
   top_level_interaction_action: Teruskan
   request_storage_access_heading: "%{app} memerlukan akses kepada kuki"
-  request_storage_access_body: Ini membolehkan app mengesahkan anda dengan menyimpan
+  request_storage_access_body: Ini membolehkan aplikasi mengesahkan anda dengan menyimpan
     maklumat peribadi anda buat sementara waktu. Klik teruskan dan benarkan kuki untuk
-    menggunakan app.
+    menggunakan aplikasi.
   request_storage_access_footer: Kuki akan tamat tempoh selepas 30 hari.
   request_storage_access_action: Teruskan

data/lib/shopify_app/controller_concerns/login_protection.rb

@@ -47,13 +47,13 @@ module ShopifyApp
         if request.get?
           session[:return_to] = "#{request.path}?#{sanitized_params.to_query}"
         end
-        redirect_to login_url
+        redirect_to(login_url_with_optional_shop)
       end
     end
 
     def close_session
       clear_shop_session
-      redirect_to login_url
+      redirect_to(login_url_with_optional_shop)
     end
 
     def clear_shop_session
@@ -62,7 +62,7 @@ module ShopifyApp
       session[:shopify_user] = nil
     end
 
-    def login_url(top_level: false)
+    def login_url_with_optional_shop(top_level: false)
       url = ShopifyApp.configuration.login_url
 
       query_params = login_url_params(top_level: top_level)

data/lib/shopify_app/version.rb

@@ -1,3 +1,3 @@
 module ShopifyApp
-  VERSION = '10.0.0'.freeze
+  VERSION = '11.0.0'.freeze
 end

data/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "shopify_app",
-  "version": "10.0.0",
+  "version": "11.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shopify_app",
-  "version": "10.0.0",
+  "version": "11.0.0",
   "repository": "git@github.com:Shopify/shopify_app.git",
   "author": "Shopify",
   "license": "MIT",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify_app
 version: !ruby/object:Gem::Version
-  version: 10.0.0
+  version: 11.0.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-26 00:00:00.000000000 Z
+date: 2019-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: browser_sniffer