Fix bad merge

4 months ago · e2c21ce358
parent c2bd1be20a
commit e2c21ce358
1 changed files with 2 additions and 4 deletions
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class ApplicationController < ActionController::Base
  BROWSER_LOCALE_REGEXP = /\A\w{2}(?:-\w{2})?/

@ -10,8 +8,8 @@ class ApplicationController < ActionController::Base

  around_action :with_locale
  # before_action :sign_in_for_demo, if: -> { Docuseal.demo? }
-  before_action :maybe_redirect_to_setup, unless: :signed_in?
-  before_action :authenticate_user!, unless: :devise_controller?
+  before_action :maybe_authenticate_via_token
+  before_action :authenticate_via_token!, unless: :devise_controller?

  helper_method :button_title,
                :current_account,