SONAR-6226 Populate external identity columns in rails authentication

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/models/user.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/models/user.rb
index e6e3e2dc7ccecf525b12e1c53a02a9244052dece..a22804d9a33d9a1f265ee9965f65c661c55a13cb 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/models/user.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/models/user.rb
@@ -61,8 +61,8 @@ class User < ActiveRecord::Base
   # HACK HACK HACK -- how to do attr_accessible from here?
   # prevents a user from submitting a crafted form that bypasses activation
   # anything else you want your user to change should be added here.
-  attr_accessible :login, :email, :name, :password, :password_confirmation
-  attr_accessor :token_authenticated
+  attr_accessible :login, :email, :name, :password, :password_confirmation, :external_identity, :external_identity_provider
+  attr_accessor :token_authenticated, :external_identity, :external_identity_provider
 
   ####
   # As now dates are saved in long they should be no more automatically managed by Rails

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/lib/need_authentication.rb b/server/sonar-web/src/main/webapp/WEB-INF/lib/need_authentication.rb
index c51a0a0a034a72e32702f800a42585c002e985df..86c07064133743efb611dc9fc27d5cca7e06fdcf 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/lib/need_authentication.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/lib/need_authentication.rb
@@ -132,6 +132,8 @@ class PluginRealm
         return nil if !Api::Utils.java_facade.getSettings().getBoolean('sonar.authenticator.createUsers')
         # Automatically create a user in the sonar db if authentication has been successfully done
         user = User.new(:login => username, :name => username, :email => '', :created_at => now, :updated_at => now)
+        user.external_identity = username
+        user.external_identity_provider = 'sonarqube'
 
         if details
           user.name = details.getName()