Exchange focus between home location delete/undelete buttons

[rails.git] / app / controllers / application_controller.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index bd4a629482b6be70a8639c35533aba09368c6508..5dcfee07ca03cc9aaeb84549513305af4c658133 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,70 +1,72 @@
 class ApplicationController < ActionController::Base
 class ApplicationController < ActionController::Base

+  require "timeout"
+

   include SessionPersistence
 
   include SessionPersistence
 

-  protect_from_forgery
+  protect_from_forgery :with => :exception
+
+  add_flash_types :warning, :error
+
+  rescue_from CanCan::AccessDenied, :with => :deny_access
+  check_authorization
+
+  before_action :fetch_body
+  around_action :better_errors_allow_inline, :if => proc { Rails.env.development? }

 
 

-  before_filter :fetch_body
+  attr_accessor :current_user, :oauth_token
+
+  helper_method :current_user
+  helper_method :oauth_token
+
+  private

 
   def authorize_web
     if session[:user]
 
   def authorize_web
     if session[:user]

-      @user = User.where(:id => session[:user]).where("status IN ('active', 'confirmed', 'suspended')").first
+      self.current_user = User.where(:id => session[:user], :status => %w[active confirmed suspended]).first

 
 

-    if @user.status == "suspended"
+      if session[:fingerprint] &&
+         session[:fingerprint] != current_user.fingerprint
+        reset_session
+        self.current_user = nil
+      elsif current_user.status == "suspended"

         session.delete(:user)
         session_expires_automatically
 
         session.delete(:user)
         session_expires_automatically
 

-        redirect_to :controller => "user", :action => "suspended"
+        redirect_to :controller => "users", :action => "suspended"

 
 

-        # don't allow access to any auth-requiring part of the site unless
-        # the new CTs have been seen (and accept/decline chosen).
-      elsif !@user.terms_seen and flash[:skip_terms].nil?
-        flash[:notice] = t 'user.terms.you need to accept or decline'
+      # don't allow access to any auth-requiring part of the site unless
+      # the new CTs have been seen (and accept/decline chosen).
+      elsif !current_user.terms_seen && flash[:skip_terms].nil?
+        flash[:notice] = t "users.terms.you need to accept or decline"

         if params[:referer]
         if params[:referer]

-          redirect_to :controller => "user", :action => "terms", :referer => params[:referer]
+          redirect_to :controller => "users", :action => "terms", :referer => params[:referer]

         else
         else

-          redirect_to :controller => "user", :action => "terms", :referer => request.fullpath
+          redirect_to :controller => "users", :action => "terms", :referer => request.fullpath

         end
       end
     elsif session[:token]
         end
       end
     elsif session[:token]

-      if @user = User.authenticate(:token => session[:token])
-        session[:user] = @user.id
-      end
+      session[:user] = current_user.id if self.current_user = User.authenticate(:token => session[:token])

     end
     end

-  rescue Exception => ex
-    logger.info("Exception authorizing user: #{ex.to_s}")
+
+    session[:fingerprint] = current_user.fingerprint if current_user && session[:fingerprint].nil?
+  rescue StandardError => e
+    logger.info("Exception authorizing user: #{e}")

     reset_session
     reset_session

-    @user = nil
+    self.current_user = nil

   end
 
   def require_user
   end
 
   def require_user

-    unless @user
+    unless current_user

       if request.get?
       if request.get?

-        redirect_to :controller => 'user', :action => 'login', :referer => request.fullpath
+        redirect_to login_path(:referer => request.fullpath)

       else
       else

-        render :text => "", :status => :forbidden
+        head :forbidden

       end
     end
   end
 
   def require_oauth
       end
     end
   end
 
   def require_oauth

-    @oauth = @user.access_token(OAUTH_KEY) if @user and defined? OAUTH_KEY
-  end
-
-  ##
-  # requires the user to be logged in by the token or HTTP methods, or have an 
-  # OAuth token with the right capability. this method is a bit of a pain to call 
-  # directly, since it's cumbersome to call filters with arguments in rails. to
-  # make it easier to read and write the code, there are some utility methods
-  # below.
-  def require_capability(cap)
-    # when the current token is nil, it means the user logged in with a different
-    # method, otherwise an OAuth token was used, which has to be checked.
-    unless current_token.nil?
-      unless current_token.read_attribute(cap)
-        report_error "OAuth token doesn't have that capability.", :forbidden
-        return false
-      end
-    end
+    @oauth_token = current_user.oauth_token(Settings.oauth_application) if current_user && Settings.key?(:oauth_application)

   end
 
   ##
   end
 
   ##


@@ -73,343 +75,161 @@ class ApplicationController < ActionController::Base
     if request.cookies["_osm_session"].to_s == ""
       if params[:cookie_test].nil?
         session[:cookie_test] = true
     if request.cookies["_osm_session"].to_s == ""
       if params[:cookie_test].nil?
         session[:cookie_test] = true

-        redirect_to Hash[params].merge(:cookie_test => "true")
-        return false
+        redirect_to params.to_unsafe_h.merge(:only_path => true, :cookie_test => "true")
+        false

       else
       else

-        flash.now[:warning] = t 'application.require_cookies.cookies_needed'
+        flash.now[:warning] = t "application.require_cookies.cookies_needed"

       end
     else
       session.delete(:cookie_test)
     end
   end
 
       end
     else
       session.delete(:cookie_test)
     end
   end
 

-  # Utility methods to make the controller filter methods easier to read and write.
-  def require_allow_read_prefs
-    require_capability(:allow_read_prefs)
-  end
-  def require_allow_write_prefs
-    require_capability(:allow_write_prefs)
-  end
-  def require_allow_write_diary
-    require_capability(:allow_write_diary)
-  end
-  def require_allow_write_api
-    require_capability(:allow_write_api)
-
-    if REQUIRE_TERMS_AGREED and @user.terms_agreed.nil?
-      report_error "You must accept the contributor terms before you can edit.", :forbidden
-      return false
-    end
-  end
-  def require_allow_read_gpx
-    require_capability(:allow_read_gpx)
-  end
-  def require_allow_write_gpx
-    require_capability(:allow_write_gpx)
-  end
-  def require_allow_write_notes
-    require_capability(:allow_write_notes)
-  end
-
-  ##
-  # require that the user is a moderator, or fill out a helpful error message
-  # and return them to the index for the controller this is wrapped from.
-  def require_moderator
-    unless @user.moderator?
-      if request.get?
-        flash[:error] = t('application.require_moderator.not_a_moderator')
-        redirect_to :action => 'index'
-      else
-        render :text => "", :status => :forbidden
-      end
-    end
-  end
-
-  ##
-  # sets up the @user object for use by other methods. this is mostly called
-  # from the authorize method, but can be called elsewhere if authorisation
-  # is optional.
-  def setup_user_auth
-    # try and setup using OAuth
-    if not Authenticator.new(self, [:token]).allow?
-      username, passwd = get_auth_data # parse from headers
-      # authenticate per-scheme
-      if username.nil?
-        @user = nil # no authentication provided - perhaps first connect (client should retry after 401)
-      elsif username == 'token'
-        @user = User.authenticate(:token => passwd) # preferred - random token for user from db, passed in basic auth
-      else
-        @user = User.authenticate(:username => username, :password => passwd) # basic auth
-      end
-    end
-
-    # have we identified the user?
-    if @user
-      # check if the user has been banned
-      if @user.blocks.active.exists?
-        # NOTE: need slightly more helpful message than this.
-        report_error t('application.setup_user_auth.blocked'), :forbidden
-      end
-
-      # if the user hasn't seen the contributor terms then don't
-      # allow editing - they have to go to the web site and see
-      # (but can decline) the CTs to continue.
-      if REQUIRE_TERMS_SEEN and not @user.terms_seen and flash[:skip_terms].nil?
-        set_locale
-        report_error t('application.setup_user_auth.need_to_see_terms'), :forbidden
-      end
-    end
-  end
-
-  def authorize(realm='Web Password', errormessage="Couldn't authenticate you") 
-    # make the @user object from any auth sources we have
-    setup_user_auth
-
-    # handle authenticate pass/fail
-    unless @user
-      # no auth, the user does not exist or the password was wrong
-      response.headers["WWW-Authenticate"] = "Basic realm=\"#{realm}\"" 
-      render :text => errormessage, :status => :unauthorized
-      return false
-    end 
-  end 
-
-  ##
-  # to be used as a before_filter *after* authorize. this checks that
-  # the user is a moderator and, if not, returns a forbidden error.
-  #
-  # NOTE: this isn't a very good way of doing it - it duplicates logic
-  # from require_moderator - but what we really need to do is a fairly
-  # drastic refactoring based on :format and respond_to? but not a 
-  # good idea to do that in this branch.
-  def authorize_moderator(errormessage="Access restricted to moderators") 
-    # check user is a moderator
-    unless @user.moderator?
-      render :text => errormessage, :status => :forbidden
-      return false
-    end 
-  end 
-
-  def check_database_readable(need_api = false)
-    if STATUS == :database_offline or (need_api and STATUS == :api_offline)
+  def check_database_readable(need_api: false)
+    if Settings.status == "database_offline" || (need_api && Settings.status == "api_offline")

       if request.xhr?
         report_error "Database offline for maintenance", :service_unavailable
       else
       if request.xhr?
         report_error "Database offline for maintenance", :service_unavailable
       else

-        redirect_to :controller => 'site', :action => 'offline'
+        redirect_to :controller => "site", :action => "offline"

       end
     end
   end
 
       end
     end
   end
 

-  def check_database_writable(need_api = false)
-    if STATUS == :database_offline or STATUS == :database_readonly or
-       (need_api and (STATUS == :api_offline or STATUS == :api_readonly))
+  def check_database_writable(need_api: false)
+    if Settings.status == "database_offline" || Settings.status == "database_readonly" ||
+       (need_api && (Settings.status == "api_offline" || Settings.status == "api_readonly"))

       if request.xhr?
         report_error "Database offline for maintenance", :service_unavailable
       else
       if request.xhr?
         report_error "Database offline for maintenance", :service_unavailable
       else

-        redirect_to :controller => 'site', :action => 'offline'
+        redirect_to :controller => "site", :action => "offline"

       end
     end
   end
 
   def check_api_readable
       end
     end
   end
 
   def check_api_readable

-    if api_status == :offline
+    if api_status == "offline"

       report_error "Database offline for maintenance", :service_unavailable
       report_error "Database offline for maintenance", :service_unavailable

-      return false
+      false

     end
   end
 
   def check_api_writable
     end
   end
 
   def check_api_writable

-    unless api_status == :online
+    unless api_status == "online"

       report_error "Database offline for maintenance", :service_unavailable
       report_error "Database offline for maintenance", :service_unavailable

-      return false
+      false

     end
   end
 
   def database_status
     end
   end
 
   def database_status

-    if STATUS == :database_offline
-      :offline
-    elsif STATUS == :database_readonly
-      :readonly
-    else 
-      :online
+    case Settings.status
+    when "database_offline"
+      "offline"
+    when "database_readonly"
+      "readonly"
+    else
+      "online"

     end
   end
 
   def api_status
     status = database_status
     end
   end
 
   def api_status
     status = database_status

-    if status == :online
-      if STATUS == :api_offline
-        status = :offline
-      elsif STATUS == :api_readonly
-        status = :readonly
+    if status == "online"
+      case Settings.status
+      when "api_offline"
+        status = "offline"
+      when "api_readonly"
+        status = "readonly"

       end
     end
       end
     end

-    return status
-  end
-
-  def gpx_status
-    status = database_status
-    if status == :online
-      status = :offline if STATUS == :gpx_offline
-    end
-    return status
+    status

   end
 
   def require_public_data
   end
 
   def require_public_data

-    unless @user.data_public?
+    unless current_user.data_public?

       report_error "You must make your edits public to upload new data", :forbidden
       report_error "You must make your edits public to upload new data", :forbidden

-      return false
+      false

     end
   end
 
   # Report and error to the user
   # (If anyone ever fixes Rails so it can set a http status "reason phrase",
     end
   end
 
   # Report and error to the user
   # (If anyone ever fixes Rails so it can set a http status "reason phrase",

-  #  rather than only a status code and having the web engine make up a 
+  #  rather than only a status code and having the web engine make up a

   #  phrase from that, we can also put the error message into the status
   #  message. For now, rails won't let us)
   def report_error(message, status = :bad_request)
   #  phrase from that, we can also put the error message into the status
   #  message. For now, rails won't let us)
   def report_error(message, status = :bad_request)

-    # Todo: some sort of escaping of problem characters in the message
-    response.headers['Error'] = message
+    # TODO: some sort of escaping of problem characters in the message
+    response.headers["Error"] = message

 
 

-    if request.headers['X-Error-Format'] and
-       request.headers['X-Error-Format'].downcase == "xml"
-      result = OSM::API.new.get_xml_doc
+    if request.headers["X-Error-Format"]&.casecmp("xml")&.zero?
+      result = OSM::API.new.xml_doc

       result.root.name = "osmError"
       result.root << (XML::Node.new("status") << "#{Rack::Utils.status_code(status)} #{Rack::Utils::HTTP_STATUS_CODES[status]}")
       result.root << (XML::Node.new("message") << message)
 
       result.root.name = "osmError"
       result.root << (XML::Node.new("status") << "#{Rack::Utils.status_code(status)} #{Rack::Utils::HTTP_STATUS_CODES[status]}")
       result.root << (XML::Node.new("message") << message)
 

-      render :text => result.to_s, :content_type => "text/xml"
+      render :xml => result.to_s

     else
     else

-      render :text => message, :status => status, :content_type => "text/plain"
+      render :plain => message, :status => status

     end
   end
     end
   end

-  
-  def set_locale
-    response.header['Vary'] = 'Accept-Language'
-
-    if @user && !@user.languages.empty?
-      http_accept_language.user_preferred_languages = @user.languages
-      response.header['Vary'] = '*'
-    end
-
-    I18n.locale = select_locale

 
 

-    if @user && @user.languages.empty? && !http_accept_language.user_preferred_languages.empty?
-      @user.languages = http_accept_language.user_preferred_languages
-      @user.save
-    end
-
-    response.headers['Content-Language'] = I18n.locale.to_s
+  def preferred_languages
+    @preferred_languages ||= if params[:locale]
+                               Locale.list(params[:locale])
+                             elsif current_user
+                               current_user.preferred_languages
+                             else
+                               Locale.list(http_accept_language.user_preferred_languages)
+                             end

   end
 
   end
 

-  def select_locale(locales = I18n.available_locales)
-    if params[:locale]
-      http_accept_language.user_preferred_languages = [ params[:locale] ]
-    end
-
-    if http_accept_language.compatible_language_from(locales).nil?
-      http_accept_language.user_preferred_languages = http_accept_language.user_preferred_languages.collect do |pl|
-        pls = [ pl ]
+  helper_method :preferred_languages

 
 

-        while pl.match(/^(.*)-[^-]+$/)
-          pls.push($1) if locales.include?($1) or locales.include?($1.to_sym)
-          pl = $1
-        end
-
-        pls
-      end.flatten
+  def set_locale
+    if current_user&.languages&.empty? && !http_accept_language.user_preferred_languages.empty?
+      current_user.languages = http_accept_language.user_preferred_languages
+      current_user.save

     end
 
     end
 

-    http_accept_language.compatible_language_from(locales) || I18n.default_locale
-  end
-
-  helper_method :select_locale
+    I18n.locale = Locale.available.preferred(preferred_languages)

 
 

-  def api_call_handle_error
-    begin
-      yield
-    rescue ActiveRecord::RecordNotFound => ex
-      render :text => "", :status => :not_found
-    rescue LibXML::XML::Error, ArgumentError => ex
-      report_error ex.message, :bad_request
-    rescue ActiveRecord::RecordInvalid => ex
-      message = "#{ex.record.class} #{ex.record.id}: "
-      ex.record.errors.each { |attr,msg| message << "#{attr}: #{msg} (#{ex.record[attr].inspect})" }
-      report_error message, :bad_request
-    rescue OSM::APIError => ex
-      report_error ex.message, ex.status
-    rescue AbstractController::ActionNotFound => ex
-      raise
-    rescue Exception => ex
-      logger.info("API threw unexpected #{ex.class} exception: #{ex.message}")
-      ex.backtrace.each { |l| logger.info(l) }
-      report_error "#{ex.class}: #{ex.message}", :internal_server_error
-    end
-  end
-
-  ##
-  # asserts that the request method is the +method+ given as a parameter
-  # or raises a suitable error. +method+ should be a symbol, e.g: :put or :get.
-  def assert_method(method)
-    ok = request.send((method.to_s.downcase + "?").to_sym)
-    raise OSM::APIBadMethodError.new(method) unless ok
-  end
-
-  ##
-  # wrap an api call in a timeout
-  def api_call_timeout
-    OSM::Timer.timeout(API_TIMEOUT) do
-      yield
-    end
-  rescue Timeout::Error
-    raise OSM::APITimeoutError
+    response.headers["Vary"] = "Accept-Language"
+    response.headers["Content-Language"] = I18n.locale.to_s

   end
 
   ##
   # wrap a web page in a timeout
   end
 
   ##
   # wrap a web page in a timeout

-  def web_timeout
-    OSM::Timer.timeout(WEB_TIMEOUT) do
-      yield
-    end
-  rescue ActionView::Template::Error => ex
-    ex = ex.original_exception
-
-    if ex.is_a?(ActiveRecord::StatementInvalid) and ex.message =~ /execution expired/
-      ex = Timeout::Error.new
-    end
-
-    if ex.is_a?(Timeout::Error)
+  def web_timeout(&block)
+    Timeout.timeout(Settings.web_timeout, Timeout::Error, &block)
+  rescue ActionView::Template::Error => e
+    e = e.cause
+
+    if e.is_a?(Timeout::Error) ||
+       (e.is_a?(ActiveRecord::StatementInvalid) && e.message.include?("execution expired"))
+      ActiveRecord::Base.connection.raw_connection.cancel

       render :action => "timeout"
     else
       raise
     end
   rescue Timeout::Error
       render :action => "timeout"
     else
       raise
     end
   rescue Timeout::Error

+    ActiveRecord::Base.connection.raw_connection.cancel

     render :action => "timeout"
   end
 
   ##
     render :action => "timeout"
   end
 
   ##

-  # is the requestor logged in?
-  def logged_in?
-    !@user.nil?
-  end
-
-  ##
-  # ensure that there is a "this_user" instance variable
-  def lookup_this_user
-    unless @this_user = User.active.find_by_display_name(params[:display_name])
-      render_unknown_user params[:display_name]
-    end
+  # ensure that there is a "user" instance variable
+  def lookup_user
+    render_unknown_user params[:display_name] unless @user = User.active.find_by(:display_name => params[:display_name])

   end
 
   ##
   # render a "no such user" page
   def render_unknown_user(name)
   end
 
   ##
   # render a "no such user" page
   def render_unknown_user(name)

-    @title = t "user.no_such_user.title"
+    @title = t "users.no_such_user.title"

     @not_found_user = name
 
     respond_to do |format|
     @not_found_user = name
 
     respond_to do |format|

-      format.html { render :template => "user/no_such_user", :status => :not_found }
-      format.all { render :text => "", :status => :not_found }
+      format.html { render :template => "users/no_such_user", :status => :not_found }
+      format.all { head :not_found }

     end
   end
 
     end
   end
 


@@ -427,57 +247,126 @@ class ApplicationController < ActionController::Base
   end
 
   def map_layout
   end
 
   def map_layout

-    request.xhr? ? 'xhr' : 'map'
+    append_content_security_policy_directives(
+      :child_src => %w[http://127.0.0.1:8111 https://127.0.0.1:8112],
+      :frame_src => %w[http://127.0.0.1:8111 https://127.0.0.1:8112],
+      :connect_src => [Settings.nominatim_url, Settings.overpass_url, Settings.fossgis_osrm_url, Settings.graphhopper_url, Settings.fossgis_valhalla_url],
+      :form_action => %w[render.openstreetmap.org],
+      :style_src => %w['unsafe-inline']
+    )
+
+    case Settings.status
+    when "database_offline", "api_offline"
+      flash.now[:warning] = t("layouts.osm_offline")
+    when "database_readonly", "api_readonly"
+      flash.now[:warning] = t("layouts.osm_read_only")
+    end
+
+    request.xhr? ? "xhr" : "map"
+  end
+
+  def allow_thirdparty_images
+    append_content_security_policy_directives(:img_src => %w[*])

   end
 
   def preferred_editor
   end
 
   def preferred_editor

-    editor = if params[:editor]
+    if params[:editor]

       params[:editor]
       params[:editor]

-    elsif @user and @user.preferred_editor
-      @user.preferred_editor
+    elsif current_user&.preferred_editor
+      current_user.preferred_editor

     else
     else

-      DEFAULT_EDITOR
+      Settings.default_editor

     end
     end

+  end

 
 

-    if request.env['HTTP_USER_AGENT'] =~ /MSIE|Trident/ and editor == 'id'
-      editor = 'potlatch2'
+  helper_method :preferred_editor
+
+  def update_totp
+    if Settings.key?(:totp_key)
+      cookies["_osm_totp_token"] = {
+        :value => ROTP::TOTP.new(Settings.totp_key, :interval => 3600).now,
+        :domain => "openstreetmap.org",
+        :expires => 1.hour.from_now
+      }

     end
     end

+  end
+
+  def better_errors_allow_inline
+    yield
+  rescue StandardError
+    append_content_security_policy_directives(
+      :script_src => %w['unsafe-inline'],
+      :style_src => %w['unsafe-inline']
+    )

 
 

-    editor
+    raise

   end
 
   end
 

-  helper_method :preferred_editor
+  def current_ability
+    Ability.new(current_user)
+  end

 
 

-private 
+  def deny_access(_exception)
+    if doorkeeper_token || current_token
+      set_locale
+      report_error t("oauth.permissions.missing"), :forbidden
+    elsif current_user
+      set_locale
+      respond_to do |format|
+        format.html { redirect_to :controller => "/errors", :action => "forbidden" }
+        format.any { report_error t("application.permission_denied"), :forbidden }
+      end
+    elsif request.get?
+      respond_to do |format|
+        format.html { redirect_to login_path(:referer => request.fullpath) }
+        format.any { head :forbidden }
+      end
+    else
+      head :forbidden
+    end
+  end

 
   # extract authorisation credentials from headers, returns user = nil if none
 
   # extract authorisation credentials from headers, returns user = nil if none

-  def get_auth_data 
-    if request.env.has_key? 'X-HTTP_AUTHORIZATION'          # where mod_rewrite might have put it 
-      authdata = request.env['X-HTTP_AUTHORIZATION'].to_s.split 
-    elsif request.env.has_key? 'REDIRECT_X_HTTP_AUTHORIZATION'          # mod_fcgi 
-      authdata = request.env['REDIRECT_X_HTTP_AUTHORIZATION'].to_s.split 
-    elsif request.env.has_key? 'HTTP_AUTHORIZATION'         # regular location
-      authdata = request.env['HTTP_AUTHORIZATION'].to_s.split
-    end 
+  def auth_data
+    if request.env.key? "X-HTTP_AUTHORIZATION" # where mod_rewrite might have put it
+      authdata = request.env["X-HTTP_AUTHORIZATION"].to_s.split
+    elsif request.env.key? "REDIRECT_X_HTTP_AUTHORIZATION" # mod_fcgi
+      authdata = request.env["REDIRECT_X_HTTP_AUTHORIZATION"].to_s.split
+    elsif request.env.key? "HTTP_AUTHORIZATION" # regular location
+      authdata = request.env["HTTP_AUTHORIZATION"].to_s.split
+    end

     # only basic authentication supported
     # only basic authentication supported

-    if authdata and authdata[0] == 'Basic' 
-      user, pass = Base64.decode64(authdata[1]).split(':',2)
-    end 
-    return [user, pass] 
-  end 
-
-  # used by oauth plugin to get the current user
-  def current_user
-    @user
+    user, pass = Base64.decode64(authdata[1]).split(":", 2) if authdata && authdata[0] == "Basic"
+    [user, pass]

   end
 
   end
 

-  # used by oauth plugin to set the current user
-  def current_user=(user)
-    @user=user
+  # override to stop oauth plugin sending errors
+  def invalid_oauth_response; end
+
+  # clean any referer parameter
+  def safe_referer(referer)
+    begin
+      referer = URI.parse(referer)
+
+      if referer.scheme == "http" || referer.scheme == "https"
+        referer.scheme = nil
+        referer.host = nil
+        referer.port = nil
+      elsif referer.scheme || referer.host || referer.port
+        referer = nil
+      end
+
+      referer = nil if referer&.path&.first != "/"
+    rescue URI::InvalidURIError
+      referer = nil
+    end
+
+    referer&.to_s

   end
 
   end
 

-  # override to stop oauth plugin sending errors
-  def invalid_oauth_response
+  def scope_enabled?(scope)
+    doorkeeper_token&.includes_scope?(scope) || current_token&.includes_scope?(scope)

   end
 
   end
 

+  helper_method :scope_enabled?

 end
 end