Merge branch 'improve-oauth'

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

Conflicts:
	CHANGELOG

CHANGELOG

@@ -10,6 +10,7 @@ v 6.8.0
   - Protected branch does not allow force push
   - Fix popen bug in `rake gitlab:satellites:create`
   - Disable connection reaping for MySQL
+  - Allow oauth signup without email for twitter and github
 
 v 6.7.3
   - Fix the merge notification email not being sent (Pierre de La Morinerie)

app/controllers/application_controller.rb

@@ -11,6 +11,7 @@ class ApplicationController < ActionController::Base
   before_filter :default_headers
   before_filter :add_gon_variables
   before_filter :configure_permitted_parameters, if: :devise_controller?
+  before_filter :require_email, unless: :devise_controller?
 
   protect_from_forgery
 
@@ -234,4 +235,10 @@ class ApplicationController < 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

app/controllers/profiles_controller.rb

@@ -3,6 +3,7 @@ class ProfilesController < ApplicationController
 
   before_filter :user
   before_filter :authorize_change_username!, only: :update_username
+  skip_before_filter :require_email, only: [:show, :update]
 
   layout 'profile'
 

app/models/user.rb

@@ -462,4 +462,12 @@ class User < 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}@gitlab.localhost"
+  end
 end

app/views/devise/sessions/_oauth_providers.html.haml

@@ -9,5 +9,3 @@
           = link_to authbutton(provider, 32), omniauth_authorize_path(resource_name, provider)
         - else
           = link_to provider.to_s.titleize, omniauth_authorize_path(resource_name, provider), class: "btn"
-    %br
-    %small * Make sure your email address is public

app/views/profiles/show.html.haml

@@ -29,6 +29,9 @@
             = f.text_field :email, class: "form-control", required: true, readonly: true
             %span.help-block.light
               Email is read-only for LDAP user
+          - else
+            - 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?

lib/gitlab/oauth/user.rb

@@ -29,6 +29,17 @@ module Gitlab
 
           user = model.build_user(opts, as: :admin)
           user.skip_confirmation!
+
+          # Services like twitter and github does not return email via oauth
+          # In this case we generate temporary email and force user to fill it later
+          if user.email.blank?
+            user.generate_tmp_oauth_email
+          else
+            # Google oauth returns email but dont return nickname
+            # So we use part of email as username for new user
+            user.username = email.match(/^[^@]*/)[0]
+          end
+
           user.save!
           log.info "(OAuth) Creating user #{email} from login with extern_uid => #{uid}"
 
@@ -58,7 +69,7 @@ module Gitlab
         end
 
         def username
-          email.match(/^[^@]*/)[0]
+          auth.info.nickname.to_s.force_encoding("utf-8")
         end
 
         def provider

spec/lib/oauth_spec.rb

@@ -8,6 +8,7 @@ describe Gitlab::OAuth::User do
 
     @info = double(
       uid: '12djsak321',
+      nickname: 'john',
       name: 'John',
       email: 'john@mail.com'
     )