diff options
author | Eric Davis <edavis@littlestreamsoftware.com> | 2009-12-23 06:27:28 +0000 |
---|---|---|
committer | Eric Davis <edavis@littlestreamsoftware.com> | 2009-12-23 06:27:28 +0000 |
commit | aa9951b38b27c7465a313fc72b73b819b292e9b2 (patch) | |
tree | ff112e75cb81a66d7ae0568003f6bb81dc303e35 /app/models/user.rb | |
parent | 9f59cd64ab9fd10668cad6bbeae3c4daadb0325a (diff) | |
download | redmine-aa9951b38b27c7465a313fc72b73b819b292e9b2.tar.gz redmine-aa9951b38b27c7465a313fc72b73b819b292e9b2.zip |
Added an API token for each User to use when making API requests. (#3920)
The API key will be displayed on My Account page with a link to reset or
generate a new one. All existing users will have a token generated by the
migration.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3217 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/user.rb')
-rw-r--r-- | app/models/user.rb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 4cfa2b47b..39fdb165a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -39,6 +39,7 @@ class User < Principal has_many :changesets, :dependent => :nullify has_one :preference, :dependent => :destroy, :class_name => 'UserPreference' has_one :rss_token, :dependent => :destroy, :class_name => 'Token', :conditions => "action='feeds'" + has_one :api_token, :dependent => :destroy, :class_name => 'Token', :conditions => "action='api'" belongs_to :auth_source # Active non-anonymous users scope @@ -192,6 +193,12 @@ class User < Principal token = self.rss_token || Token.create(:user => self, :action => 'feeds') token.value end + + # Return user's API key (a 40 chars long string), used to access the API + def api_key + token = self.api_token || Token.create(:user => self, :action => 'api') + token.value + end # Return an array of project ids for which the user has explicitly turned mail notifications on def notified_projects_ids @@ -210,6 +217,11 @@ class User < Principal 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.user.active? ? token.user : nil + end + # Makes find_by_mail case-insensitive def self.find_by_mail(mail) find(:first, :conditions => ["LOWER(mail) = ?", mail.to_s.downcase]) |