FIX educoder account oauth
This commit is contained in:
parent
6ec599a946
commit
061f4cae45
|
@ -17,20 +17,10 @@ class Oauth::EducoderController < Oauth::BaseController
|
||||||
redirect_to callback_url
|
redirect_to callback_url
|
||||||
else
|
else
|
||||||
Rails.logger.info "######## open user not exits"
|
Rails.logger.info "######## open user not exits"
|
||||||
user, uid = nil
|
user = User.find_by(login: login) || User.find_by(mail: mail)
|
||||||
login_user = User.find_by(login: login)
|
|
||||||
|
|
||||||
if login_user
|
|
||||||
uid = login
|
|
||||||
user = login_user
|
|
||||||
else
|
|
||||||
mail_user = User.find_by(mail: mail)
|
|
||||||
uid = mail
|
|
||||||
user = mail_user
|
|
||||||
end
|
|
||||||
|
|
||||||
if user.is_a?(User) && !user.is_a?(AnonymousUser)
|
if user.is_a?(User) && !user.is_a?(AnonymousUser)
|
||||||
OpenUsers::Educoder.create!(user: user, uid: uid)
|
OpenUsers::Educoder.create!(user: user, uid: login)
|
||||||
successful_authentication(user)
|
successful_authentication(user)
|
||||||
|
|
||||||
redirect_to callback_url
|
redirect_to callback_url
|
||||||
|
|
Loading…
Reference in New Issue