diff options
| author | Julien Lancelot <julien.lancelot@sonarsource.com> | 2016-02-02 17:41:39 +0100 |
|---|---|---|
| committer | Julien Lancelot <julien.lancelot@sonarsource.com> | 2016-02-04 10:09:53 +0100 |
| commit | 64e4e6e7714870919f2f7eedb09c383120d1f599 (patch) | |
| tree | f098df228675f478736eea670852ee68a599641f /server | |
| parent | c4abedc8615e05322cb6b2015d5e4e74bc625da5 (diff) | |
| download | sonarqube-64e4e6e7714870919f2f7eedb09c383120d1f599.tar.gz sonarqube-64e4e6e7714870919f2f7eedb09c383120d1f599.zip | |
SONAR-6226 Id provider info are set when users signup
Diffstat (limited to 'server')
| -rw-r--r-- | server/sonar-web/src/main/webapp/WEB-INF/app/controllers/users_controller.rb | 2 | ||||
| -rw-r--r-- | server/sonar-web/src/main/webapp/WEB-INF/app/models/user.rb | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/users_controller.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/users_controller.rb index ac643f9c0d4..7a0729b623a 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/users_controller.rb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/users_controller.rb @@ -66,6 +66,8 @@ class UsersController < ApplicationController def prepare_user user = User.new(params[:user]) + user.external_identity = user.login + user.external_identity_provider = 'sonarqube' default_group_name=java_facade.getSettings().getString('sonar.defaultGroup') default_group=Group.find_by_name(default_group_name) user.groups<<default_group if default_group 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 a22804d9a33..a619978a305 100644 --- 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 @@ -85,6 +85,14 @@ class User < ActiveRecord::Base write_attribute :email, (value && value.downcase) end + def external_identity=(value) + write_attribute :external_identity, value + end + + def external_identity_provider=(value) + write_attribute :external_identity_provider, value + end + # SCM accounts should also contain login and email def full_scm_accounts new_scm_accounts = self.scm_accounts.split(/\r?\n/).reject { |c| c.empty? } if self.scm_accounts |