From 58e7c560221893f23b9ce66cbc2549952a14cb96 Mon Sep 17 00:00:00 2001
From: Francine Navarro <francine.navarro@shopify.com>
Date: Thu, 23 Aug 2018 13:16:34 -0400
Subject: [PATCH] Resolve Policial errors

---
 lib/shopify_app/controller_concerns/login_protection.rb | 6 +++++-
 lib/shopify_app/engine.rb                               | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/shopify_app/controller_concerns/login_protection.rb b/lib/shopify_app/controller_concerns/login_protection.rb
index c5a812ef6..e06b42d50 100644
--- a/lib/shopify_app/controller_concerns/login_protection.rb
+++ b/lib/shopify_app/controller_concerns/login_protection.rb
@@ -62,7 +62,11 @@ def login_url(top_level: false)
 
       query_params = {}
       query_params[:shop] = sanitized_params[:shop] if params[:shop].present?
-      query_params[:shop] ||= referer_sanitized_shop_name if referer_sanitized_shop_name.present?
+
+      if referer_sanitized_shop_name.present?
+        query_params[:shop] ||= referer_sanitized_shop_name
+      end
+        
       query_params[:top_level] = true if top_level
 
       url = "#{url}?#{query_params.to_query}" if query_params.present?
diff --git a/lib/shopify_app/engine.rb b/lib/shopify_app/engine.rb
index a08506271..1b9cc612a 100644
--- a/lib/shopify_app/engine.rb
+++ b/lib/shopify_app/engine.rb
@@ -4,7 +4,8 @@ class Engine < Rails::Engine
     isolate_namespace ShopifyApp
 
     initializer "shopify_app.assets.precompile" do |app|
-      app.config.assets.precompile += %w( shopify_app/redirect.js shopify_app/itp_polyfill.js )
+      app.config.assets.precompile += %w[ shopify_app/redirect.js 
+      shopify_app/itp_polyfill.js ]
     end
   end
 end