X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7b9e852c9d53318cfc949fe4ceef2d3b665e2020..0ea9f92be50a8763331a81d3c32a5f5a157265c6:/app/models/user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index f99ad3b40..43f1bd851 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -29,9 +29,12 @@ class User < ActiveRecord::Base
   validates_email_format_of :email
   validates_email_format_of :new_email, :allow_blank => true
   validates_format_of :display_name, :with => /^[^\/;.,?]*$/
+  validates_format_of :display_name, :with => /^\S/, :message => "has leading whitespace"
+  validates_format_of :display_name, :with => /\S$/, :message => "has trailing whitespace"
   validates_numericality_of :home_lat, :allow_nil => true
   validates_numericality_of :home_lon, :allow_nil => true
   validates_numericality_of :home_zoom, :only_integer => true, :allow_nil => true
+  validates_inclusion_of :preferred_editor, :in => Editors::ALL_EDITORS, :allow_nil => true
 
   before_save :encrypt_password
 
@@ -201,4 +204,10 @@ class User < ActiveRecord::Base
 
     return score.to_i
   end
+
+  ##
+  # return an oauth access token for a specified application
+  def access_token(application_key)
+    return ClientApplication.find_by_key(application_key).access_token_for_user(self)
+  end
 end