jro_apps/redmine Commit - r9620:fe1a152e02b4

Merged r9798 to r9801 from trunk....

Jean-Philippe Lang -

r9620:fe1a152e02b4

parent child

Context file:

r9620:fe1a152e02b4

Collapse all files

app/controllers/application_controller.rb +2 -2

                # Returns the API key present in the request
                def api_key_from_request
                  if params[:key].present?
-                   params[:key]
+                   params[:key].to_s
                  elsif request.headers["X-Redmine-API-Key"].present?
-                   request.headers["X-Redmine-API-Key"]
+                   request.headers["X-Redmine-API-Key"].to_s
                  end
                end

app/models/user.rb +7 -4

                # Returns the user that matches provided login and password, or nil
                def self.try_to_login(login, password)
+                 login = login.to_s
+                 password = password.to_s
                  # Make sure no one can sign in with an empty password
-                 return nil if password.to_s.empty?
+                 return nil if password.empty?
                  user = find_by_login(login)
                  if user
                    # user is already in local database
                # Returns the user who matches the given autologin +key+ or nil
                def self.try_to_autologin(key)
-                 tokens = Token.find_all_by_action_and_value('autologin', key)
+                 tokens = Token.find_all_by_action_and_value('autologin', key.to_s)
                  # Make sure there's only 1 token that matches the key
                  if tokens.size == 1
                    token = tokens.first
                end
                def self.find_by_rss_key(key)
-                 token = Token.find_by_value(key)
+                 token = Token.find_by_action_and_value('feeds', key.to_s)
                  token && token.user.active? ? token.user : nil
                end
                def self.find_by_api_key(key)
-                 token = Token.find_by_action_and_value('api', key)
+                 token = Token.find_by_action_and_value('api', key.to_s)
                  token && token.user.active? ? token.user : nil
                end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages