Fix infinite loop when third-party cookies are disabled (Shopify#684)

* Fix infinite loop when third-party cookies are disabled * Resolve sqlite3 dependency
wangjohnnywang · Feb 6, 2019 · 012b32b · 012b32b
1 parent f084904
commit 012b32b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/app/assets/javascripts/shopify_app/storage_access.js b/app/assets/javascripts/shopify_app/storage_access.js
@@ -33,9 +33,14 @@
  }
 
  StorageAccessHelper.prototype.grantedStorageAccess = function() {
- sessionStorage.setItem('shopify.granted_storage_access', true);
- document.cookie = 'shopify.granted_storage_access=true';
- this.redirectToAppHome();
+ try {
+ sessionStorage.setItem('shopify.granted_storage_access', true);
+ document.cookie = 'shopify.granted_storage_access=true';
+ this.redirectToAppHome();
+ } catch (error) {
+ console.warn('Third party cookies may be blocked.', error);
+ this.redirectToAppTLD(ACCESS_DENIED_STATUS);
+ }
  }
 
  StorageAccessHelper.prototype.handleRequestStorageAccess = function() {

diff --git a/shopify_app.gemspec b/shopify_app.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
 
  s.add_development_dependency('rake')
  s.add_development_dependency('byebug')
- s.add_development_dependency('sqlite3')
+ s.add_development_dependency('sqlite3', '~> 1.3.6')
  s.add_development_dependency('minitest')
  s.add_development_dependency('mocha')