floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-03 03:40:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

FIX remote regitster bug

Browse Source
This commit is contained in:
Jasder
2020-08-16 13:48:48 +08:00
parent 086ebc34b2
commit c68c8ed089
3 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/controllers/oauth_controller.rb
View File

@@ -65,22 +65,22 @@ class OauthController < ApplicationController
platform = params[:plathform] || 'educoder'
if User.where(mail: email).exists?
render_error("该邮箱已使用过.") and return
end
result = autologin_register(login, email, password, platform)
logger.info "[Oauth educoer] =====#{result}"
if result[:message].blank?
logger.info "[Oauth educoer] ====auto_register success"
user = User.find result[:user][:id]
successful_authentication(user)
OpenUsers::Educoder.create!(user: user, uid: user.login)
render_ok({callback_url: callback_url})
# redirect_to callback_url
render json: { email_exist: '该邮箱已使用过' }
else
logger.info "[Oauth educoer] ====auto_register failed."
render :action => "auto_register"
result = autologin_register(login, email, password, platform)
logger.info "[Oauth educoer] =====#{result}"
if result[:message].blank?
logger.info "[Oauth educoer] ====auto_register success"
user = User.find result[:user][:id]
successful_authentication(user)
OpenUsers::Educoder.create!(user: user, uid: user.login)
render json: { callback_url: callback_url }
# redirect_to callback_url
else
logger.info "[Oauth educoer] ====auto_register failed."
render :action => "auto_register"
end
end
end