shopify_app 9.0.3 → 9.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df66bdb58e5fd652cbd0465fd8b556e1c758b69f161ae2b2d9085d86f9ec0ffc
-  data.tar.gz: 260638d5df7371f25c953684bc326dd999270473211d361ec95d721aecabef90
+  metadata.gz: 9b0c4f236ab9c71186ed3095ed7da95a10dbaa0fd89cb7e0e848bf04257c21ac
+  data.tar.gz: 6874836046e839e20e7e7d40f091cab488c4ac61c2fb492ab3044d05cb4c8d9d
 SHA512:
-  metadata.gz: 74de73555bac65d91d3a1d6333bec5284738752de73151cb075e58c4f6669cad703d126d7a9937a4e1e040753983b50f9981f782c622b2ff080fa91dc98e9c6c
-  data.tar.gz: 68b83622ed0253ba4e607dbe3257de879d3f11d9f610224ffe700935bffc3e8c3c6bff33501201e37bee777ac0adb574bef72c9168e73631d3570474ecd3ba3a
+  metadata.gz: 256797e0845484538af23db0bf1bb90fae3398a5536e99d095d235bd9d812c3e5d00030b8f3c4cd36ef27a16a282317d341413da3d9fb5854309a06cf3af77ec
+  data.tar.gz: 4369be48e85023c76ea2a7ec05a189a17e8f7416e74e80186e4fb3b133687dd125ad7c40b0bfb808f39ac73a1cfaf5eca69d597d571b96882b0439f376d6c4ab

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+9.0.4
+-----
+
+* Fix returning to a deep link after authentication [#746](https://github.com/Shopify/shopify_app/pull/746)
+
 9.0.3
 -----
 

data/README.md

@@ -347,10 +347,12 @@ If your app needs to perform specific actions after the user is authenticated su
 
 ```ruby
 ShopifyApp.configure do |config|
-  config.after_authenticate_job = { job: Shopify::AfterAuthenticateJob }
+  config.after_authenticate_job = { job: "Shopify::AfterAuthenticateJob" }
 end
 ```
 
+The job can be configured as either a class or a class name string.
+
 If you need the job to run synchronously add the `inline` flag:
 
 ```ruby

data/app/controllers/shopify_app/callback_controller.rb

@@ -86,10 +86,13 @@ module ShopifyApp
 
       return unless config && config[:job].present?
 
+      job = config[:job]
+      job = job.constantize if job.is_a?(String)
+
       if config[:inline] == true
-        config[:job].perform_now(shop_domain: session[:shopify_domain])
+        job.perform_now(shop_domain: session[:shopify_domain])
       else
-        config[:job].perform_later(shop_domain: session[:shopify_domain])
+        job.perform_later(shop_domain: session[:shopify_domain])
       end
     end
   end

data/app/controllers/shopify_app/sessions_controller.rb

@@ -39,7 +39,7 @@ module ShopifyApp
       session['shopify.granted_storage_access'] = true
 
       params = { shop: @shop }
-      redirect_to "#{ShopifyApp.configuration.root_url}?#{params.to_query}"
+      redirect_to("#{return_address}?#{params.to_query}")
     end
 
     def destroy

data/lib/generators/shopify_app/add_after_authenticate_job/add_after_authenticate_job_generator.rb

@@ -14,7 +14,7 @@ module ShopifyApp
 
         after_authenticate_job_config =
           "  config.after_authenticate_job = "\
-          "{ job: Shopify::AfterAuthenticateJob, inline: false }\n"
+          "{ job: \"Shopify::AfterAuthenticateJob\", inline: false }\n"
 
         inject_into_file(
           'config/initializers/shopify_app.rb',

data/lib/generators/shopify_app/install/templates/flash_messages.js

@@ -2,14 +2,14 @@ var eventName = typeof(Turbolinks) !== 'undefined' ? 'turbolinks:load' : 'DOMCon
 
 if (!document.documentElement.hasAttribute("data-turbolinks-preview")) {
   document.addEventListener(eventName, function flash() {
-    var flash = JSON.parse(document.getElementById('shopify-app-flash').dataset.flash);
+    var flashData = JSON.parse(document.getElementById('shopify-app-flash').dataset.flash);
 
-    if (flash.notice) {
-      ShopifyApp.flashNotice(flash.notice);
+    if (flashData.notice) {
+      ShopifyApp.flashNotice(flashData.notice);
     }
 
-    if (flash.error) {
-      ShopifyApp.flashError(flash.error);
+    if (flashData.error) {
+      ShopifyApp.flashError(flashData.error);
     }
 
     document.removeEventListener(eventName, flash)

data/lib/shopify_app/version.rb

@@ -1,3 +1,3 @@
 module ShopifyApp
-  VERSION = '9.0.3'.freeze
+  VERSION = '9.0.4'.freeze
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shopify_app",
-  "version": "9.0.3",
+  "version": "9.0.4",
   "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: 9.0.3
+  version: 9.0.4
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-06 00:00:00.000000000 Z
+date: 2019-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: browser_sniffer