Allow oauth signup without email

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Allow oauth signup without email
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets
1 parent 4e002a71
Showing 6 changed files with 29 additions and 4 deletions Show diff stats
app/controllers/application_controller.rb
app/controllers/profiles/emails_controller.rb
app/controllers/profiles_controller.rb
app/models/user.rb
app/views/profiles/show.html.haml
lib/gitlab/oauth/user.rb
@@ -11,6 +11,7 @@ class ApplicationController &lt; ActionController::Base
   before_filter :default_headers
   before_filter :add_gon_variables
   before_filter :configure_permitted_parameters, if: :devise_controller?
+  before_filter :require_email
   protect_from_forgery
@@ -234,4 +235,10 @@ class ApplicationController &lt; ActionController::Base
   def hexdigest(string)
     Digest::SHA1.hexdigest string
   end
+
+  def require_email
+    if current_user && current_user.temp_oauth_email?
+      redirect_to profile_path, notice: 'Please complete your profile with email address' and return
+    end
+  end
 end
@@ -8,7 +8,7 @@ class Profiles::EmailsController &lt; ApplicationController
   def create
     @email = current_user.emails.new(params[:email])
-    
+
     flash[:alert] = @email.errors.full_messages.first unless @email.save
     redirect_to profile_emails_url
@@ -3,6 +3,7 @@ class ProfilesController &lt; ApplicationController
   before_filter :user
   before_filter :authorize_change_username!, only: :update_username
+  skip_before_filter :require_email, only: [:show, :update]
   layout 'profile'
@@ -462,4 +462,12 @@ class User &lt; ActiveRecord::Base
   def all_ssh_keys
     keys.map(&:key)
   end
+
+  def temp_oauth_email?
+    email =~ /\Atemp-email-for-oauth/
+  end
+
+  def generate_tmp_oauth_email
+    self.email = "temp-email-for-oauth-#{username}"
+  end
 end
@@ -30,7 +30,10 @@
             %span.help-block.light
               Email is read-only for LDAP user
           - else
-            = f.text_field :email, class: "form-control", required: true
+            - if @user.temp_oauth_email?
+              = f.text_field :email, class: "form-control", required: true, value: nil
+            - else
+              = f.text_field :email, class: "form-control", required: true
             - if @user.unconfirmed_email.present?
               %span.help-block
                 We sent confirmation email to
@@ -29,7 +29,13 @@ module Gitlab
           user = model.build_user(opts, as: :admin)
           user.skip_confirmation!
-          user.save!
+
+          if user.email.blank?
+            user.generate_tmp_oauth_email
+          end
+
+          user.save!(validate: false)
+
           log.info "(OAuth) Creating user #{email} from login with extern_uid => #{uid}"
           if Gitlab.config.omniauth['block_auto_created_users'] && !ldap?
@@ -58,7 +64,7 @@ module Gitlab
         end
         def username
-          email.match(/^[^@]*/)[0]
+          auth.info.nickname.to_s.force_encoding("utf-8")
         end
         def provider
	@@ -8,7 +8,7 @@ class Profiles::EmailsController < ApplicationController		@@ -8,7 +8,7 @@ class Profiles::EmailsController < ApplicationController
8		8
9	def create	9	def create
10	@email = current_user.emails.new(params[:email])	10	@email = current_user.emails.new(params[:email])
11	-	11	+
12	flash[:alert] = @email.errors.full_messages.first unless @email.save	12	flash[:alert] = @email.errors.full_messages.first unless @email.save
13		13
14	redirect_to profile_emails_url	14	redirect_to profile_emails_url
	@@ -3,6 +3,7 @@ class ProfilesController < ApplicationController		@@ -3,6 +3,7 @@ class ProfilesController < ApplicationController
3		3
4	before_filter :user	4	before_filter :user
5	before_filter :authorize_change_username!, only: :update_username	5	before_filter :authorize_change_username!, only: :update_username
		6	+ skip_before_filter :require_email, only: [:show, :update]
6		7
7	layout 'profile'	8	layout 'profile'
8		9
	@@ -462,4 +462,12 @@ class User < ActiveRecord::Base		@@ -462,4 +462,12 @@ class User < ActiveRecord::Base
462	def all_ssh_keys	462	def all_ssh_keys
463	keys.map(&:key)	463	keys.map(&:key)
464	end	464	end
		465	+
		466	+ def temp_oauth_email?
		467	+ email =~ /\Atemp-email-for-oauth/
		468	+ end
		469	+
		470	+ def generate_tmp_oauth_email
		471	+ self.email = "temp-email-for-oauth-#{username}"
		472	+ end
465	end	473	end