From cf4856337d50ca3eab59a34e8d5a10441999a920 Mon Sep 17 00:00:00 2001 From: Aishwarya Subramanian Date: Mon, 26 Aug 2019 21:53:38 +0530 Subject: Added routes for trial registration api --- app/services/users/build_service.rb | 8 +++++++- config/routes.rb | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/services/users/build_service.rb b/app/services/users/build_service.rb index 026bcfcdaf4..c853d6fce33 100644 --- a/app/services/users/build_service.rb +++ b/app/services/users/build_service.rb @@ -87,7 +87,9 @@ module Users :password_automatically_set, :name, :password, - :username + :username, + :first_name, + :last_name ] end @@ -107,6 +109,10 @@ module Users if user_params[:skip_confirmation].nil? user_params[:skip_confirmation] = skip_user_confirmation_email_from_setting end + + if (user_params[:first_name].present? || user_params[:last_name].present?) && !user_params[:name].present? + user_params[:name] = "#{user_params[:first_name]} #{user_params[:last_name]}" + end end if user_default_internal_regex_enabled? && !user_params.key?(:external) diff --git a/config/routes.rb b/config/routes.rb index d633228a495..3cdb0328604 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -188,6 +188,10 @@ Rails.application.routes.draw do draw :user draw :project + Gitlab.ee do + draw :trial_registration + end + root to: "root#index" get '*unmatched_route', to: 'application#route_not_found' -- cgit v1.2.3 From ab560c72b85c521054146ea606aacf6e420694ea Mon Sep 17 00:00:00 2001 From: Aishwarya Subramanian Date: Mon, 26 Aug 2019 22:03:35 +0530 Subject: Added skip_authorization as true for trials --- app/controllers/registrations_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index e773ec09924..3701abe9d32 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -115,7 +115,7 @@ class RegistrationsController < Devise::RegistrationsController end def resource - @resource ||= Users::BuildService.new(current_user, sign_up_params).execute + @resource ||= Users::BuildService.new(current_user, sign_up_params).execute(skip_authorization: true) end def devise_mapping -- cgit v1.2.3 From 1a90baa13ae875677adccebb45c6834805dd9af9 Mon Sep 17 00:00:00 2001 From: Aishwarya Subramanian Date: Tue, 27 Aug 2019 03:46:03 +0530 Subject: Modified route to nest under - --- app/controllers/registrations_controller.rb | 2 +- config/routes.rb | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index 3701abe9d32..e773ec09924 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -115,7 +115,7 @@ class RegistrationsController < Devise::RegistrationsController end def resource - @resource ||= Users::BuildService.new(current_user, sign_up_params).execute(skip_authorization: true) + @resource ||= Users::BuildService.new(current_user, sign_up_params).execute end def devise_mapping diff --git a/config/routes.rb b/config/routes.rb index 3cdb0328604..c333550f758 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -110,6 +110,7 @@ Rails.application.routes.draw do draw :smartcard draw :jira_connect draw :username + draw :trial_registration end Gitlab.ee do @@ -188,10 +189,6 @@ Rails.application.routes.draw do draw :user draw :project - Gitlab.ee do - draw :trial_registration - end - root to: "root#index" get '*unmatched_route', to: 'application#route_not_found' -- cgit v1.2.3 From a520b5a4172608ef3af6221aa5880ae5edb517ca Mon Sep 17 00:00:00 2001 From: Aishwarya Subramanian Date: Tue, 27 Aug 2019 04:23:17 +0530 Subject: Moved construction of name to EE namespace --- app/services/users/build_service.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/services/users/build_service.rb b/app/services/users/build_service.rb index c853d6fce33..614ed734c3e 100644 --- a/app/services/users/build_service.rb +++ b/app/services/users/build_service.rb @@ -109,10 +109,6 @@ module Users if user_params[:skip_confirmation].nil? user_params[:skip_confirmation] = skip_user_confirmation_email_from_setting end - - if (user_params[:first_name].present? || user_params[:last_name].present?) && !user_params[:name].present? - user_params[:name] = "#{user_params[:first_name]} #{user_params[:last_name]}" - end end if user_default_internal_regex_enabled? && !user_params.key?(:external) -- cgit v1.2.3 From 5025da6d305482279f884b19de5e1265271fa9bb Mon Sep 17 00:00:00 2001 From: Aishwarya Subramanian Date: Tue, 27 Aug 2019 20:50:11 +0530 Subject: Moved construction of name to EE namespace --- app/services/users/build_service.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/services/users/build_service.rb b/app/services/users/build_service.rb index 614ed734c3e..026bcfcdaf4 100644 --- a/app/services/users/build_service.rb +++ b/app/services/users/build_service.rb @@ -87,9 +87,7 @@ module Users :password_automatically_set, :name, :password, - :username, - :first_name, - :last_name + :username ] end -- cgit v1.2.3