floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

FIX educoder platform register bug when mail exists

This commit is contained in:
Jasder 2020-08-22 13:24:58 +08:00
parent 701b56ea90
commit 6d0eb74683
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/controllers/oauth/educoder_controller.rb
View File

@ -8,7 +8,7 @@ class Oauth::EducoderController < Oauth::BaseController
::OauthEducoderForm.new({login: login, token: token, callback_url: callback_url}).validate!
open_user= OpenUsers::Educoder.find_by(uid: login)
open_user= OpenUsers::Educoder.find_by(uid: login) || OpenUsers::Educoder.find_by(uid: mail)
if open_user.present? && open_user.user.present? && open_user.user.email_binded?
Rails.logger.info "######## open_user exist and open_user.user exsit and email is binded ok"
@ -17,10 +17,20 @@ class Oauth::EducoderController < Oauth::BaseController
redirect_to callback_url
else
Rails.logger.info "######## open user not exits"
user = User.find_by('login = ? or mail = ?', login, mail)
user, uid = nil
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)
OpenUsers::Educoder.create!(user: user, uid: login)
OpenUsers::Educoder.create!(user: user, uid: uid)
successful_authentication(user)
redirect_to callback_url