subclass from ActionController::Base not Application controller

Shopify · Jul 14, 2017 · bcd6fbe · bcd6fbe
1 parent 0a69fcf
commit bcd6fbe
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+7.2.12
+------
+* Changed engine controllers to subclass ActionController::Base to avoid any possible conflict with the parent application
+
 7.2.11
 -----
 * Remove 'Logged in' flash message [[#425]](https://github.com/Shopify/shopify_app/pull/425)

diff --git a/app/controllers/shopify_app/authenticated_controller.rb b/app/controllers/shopify_app/authenticated_controller.rb
@@ -1,5 +1,5 @@
 module ShopifyApp
-  class AuthenticatedController < ApplicationController
+  class AuthenticatedController < ActionController::Base
     include ShopifyApp::Localization
     include ShopifyApp::LoginProtection
 

diff --git a/app/controllers/shopify_app/sessions_controller.rb b/app/controllers/shopify_app/sessions_controller.rb
@@ -1,5 +1,5 @@
 module ShopifyApp
-  class SessionsController < ApplicationController
+  class SessionsController < ActionController::Base
     include ShopifyApp::SessionsConcern
   end
 end
diff --git a/app/controllers/shopify_app/webhooks_controller.rb b/app/controllers/shopify_app/webhooks_controller.rb
@@ -1,5 +1,5 @@
 module ShopifyApp
-  class WebhooksController < ApplicationController
+  class WebhooksController < ActionController::Base
     include ShopifyApp::WebhookVerification
 
     class ShopifyApp::MissingWebhookJobError < StandardError; end