Refactor Oauth::User class to use instance methods

parent e8f1331f
...@@ -474,10 +474,6 @@ class User < ActiveRecord::Base ...@@ -474,10 +474,6 @@ class User < ActiveRecord::Base
email =~ /\Atemp-email-for-oauth/ email =~ /\Atemp-email-for-oauth/
end end
def generate_tmp_oauth_email
self.email = "temp-email-for-oauth-#{username}@gitlab.localhost"
end
def public_profile? def public_profile?
authorized_projects.public_only.any? authorized_projects.public_only.any?
end end
......
...@@ -68,6 +68,10 @@ module Gitlab ...@@ -68,6 +68,10 @@ module Gitlab
private private
def needs_blocking?
false
end
def find_by_uid_and_provider def find_by_uid_and_provider
find_by_uid(uid) find_by_uid(uid)
end end
......
...@@ -16,97 +16,105 @@ module Gitlab ...@@ -16,97 +16,105 @@ module Gitlab
def create(auth) def create(auth)
@auth = auth @auth = auth
password = Devise.friendly_token[0, 8].downcase user = new(auth).user
opts = {
extern_uid: uid,
provider: provider,
name: name,
username: username,
email: email,
password: password,
password_confirmation: password,
}
user = model.build_user(opts)
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
elsif provider != "ldap"
# Google oauth returns email but dont return nickname
# So we use part of email as username for new user
# For LDAP, username is already set to the user's
# uid/userid/sAMAccountName.
email_username = email.match(/^[^@]*/)[0]
# Strip apostrophes since they are disallowed as part of username
user.username = email_username.gsub("'", "")
end
begin
user.save!
rescue ActiveRecord::RecordInvalid => e
log.info "(OAuth) Email #{e.record.errors[:email]}. Username #{e.record.errors[:username]}"
return nil, e.record.errors
end
user.save!
log.info "(OAuth) Creating user #{email} from login with extern_uid => #{uid}" log.info "(OAuth) Creating user #{email} from login with extern_uid => #{uid}"
user.block if needs_blocking?
if Gitlab.config.omniauth['block_auto_created_users'] && !ldap?
user.block
end
user user
rescue ActiveRecord::RecordInvalid => e
log.info "(OAuth) Email #{e.record.errors[:email]}. Username #{e.record.errors[:username]}"
return nil, e.record.errors
end end
private private
def find_by_uid_and_provider def find_by_uid_and_provider
model.where(provider: provider, extern_uid: uid).last ::User.where(provider: provider, extern_uid: uid).last
end
def provider
auth.provider
end end
def uid def uid
auth.uid.to_s auth.uid.to_s
end end
def email def needs_blocking?
return unless auth.info.respond_to?(:email) Gitlab.config.omniauth['block_auto_created_users']
auth.info.email.downcase unless auth.info.email.nil?
end end
end
def name attr_accessor :auth, :user
if auth.info.name.nil?
"#{auth.info.first_name} #{auth.info.last_name}".force_encoding('utf-8')
else
auth.info.name.to_s.force_encoding('utf-8')
end
end
def username def initialize(auth)
return unless auth.info.respond_to?(:nickname) self.auth = auth
auth.info.nickname.to_s.force_encoding("utf-8") self.user = ::User.new(user_attributes)
end user.skip_confirmation!
end
def provider def user_attributes
auth.provider {
end extern_uid: uid,
provider: provider,
name: name,
username: username,
email: email,
password: password,
password_confirmation: password,
}
end
def log def uid
Gitlab::AppLogger auth.uid.to_s
end end
def model def provider
::User auth.provider
end end
def raise_error(message) def info
raise OmniAuth::Error, "(OAuth) " + message auth.info
end end
def ldap? def name
provider == 'ldap' (info.name || full_name).to_s.force_encoding('utf-8')
end end
def full_name
"#{info.first_name} #{info.last_name}"
end
def username
(info.try(:nickname) || generate_username).to_s.force_encoding('utf-8')
end
def email
(info.try(:email) || generate_temporarily_email).downcase
end
def password
@password ||= Devise.friendly_token[0, 8].downcase
end
def log
Gitlab::AppLogger
end
def raise_error(message)
raise OmniAuth::Error, "(OAuth) " + message
end
# Get the first part of the email address (before @)
# In addtion in removes illegal characters
def generate_username
email.match(/^[^@]*/)[0].parameterize
end
def generate_temporarily_email
"temp-email-for-oauth-#{username}@gitlab.localhost"
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment