Fixed: User#identity_url raises an error when invalid url is supplied (#2742).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2476 e93f8b46-1217-0410-a6f0-8f06a7374b81

Fixed: User#identity_url raises an error when invalid url is supplied (#2742).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2476 e93f8b46-1217-0410-a6f0-8f06a7374b81
d643d9a9 · Jean-Philippe Lang · 3183445a · d643d9a9 · d643d9a9
Commit d643d9a9 authored Feb 15, 2009 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 19 additions and 4 deletions

user.rb app/models/user.rb +8 -4

user_test.rb test/unit/user_test.rb +11 -0

No files found.
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -81,10 +81,14 @@ class User < ActiveRecord::Base
  end
  
  def identity_url=(url)
-    begin
-      self.write_attribute(:identity_url, OpenIdAuthentication.normalize_identifier(url))
-    rescue InvalidOpenId
-      # Invlaid url, don't save
+    if url.blank?
+      write_attribute(:identity_url, '')
+    else
+      begin
+        write_attribute(:identity_url, OpenIdAuthentication.normalize_identifier(url))
+      rescue OpenIdAuthentication::InvalidOpenId
+        # Invlaid url, don't save
+      end
    end
    self.read_attribute(:identity_url)
  end

--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -204,6 +204,17 @@ class UserTest < Test::Unit::TestCase
    u = User.new( :identity_url => 'example.com' )
    assert_equal normalized_open_id_url, u.identity_url
  end
+    
+  def test_setting_blank_identity_url
+    u = User.new( :identity_url => 'example.com' )
+    u.identity_url = ''
+    assert u.identity_url.blank?
+  end
+    
+  def test_setting_invalid_identity_url
+    u = User.new( :identity_url => 'this is not an openid url' )
+    assert u.identity_url.blank?
+  end
  
  else
    puts "Skipping openid tests."