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

fixed ci4s oauth2接入 user_info log

This commit is contained in:
xxq250 2024-10-23 14:56:07 +08:00
parent 527c1a5e9c
commit 67b7206183
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/controllers/oauth/ci4s_controller.rb
View File

@ -8,7 +8,7 @@ class Oauth::Ci4sController < Oauth::BaseController
# 需要educoder那边设置回调地址 # 需要educoder那边设置回调地址
def create def create
# begin begin
code = params['code'].to_s.strip code = params['code'].to_s.strip
tip_exception("code不能为空") if code.blank? tip_exception("code不能为空") if code.blank?
@ -32,23 +32,22 @@ class Oauth::Ci4sController < Oauth::BaseController
login = user_info['username'] login = user_info['username']
email = user_info['email'] email = user_info['email']
email = "#{login}@forge.com" if email.blank? email = "#{login}@forge.com" if email.blank?
reg_result = autologin_register(login,email, "Ec#{login}2021#", 'educoder', user_info['mobile']) reg_result = autologin_register(login, email, "Ec#{login}2021#", 'educoder', user_info['mobile'])
Rails.logger.info("[OAuth2] reg_result -> #{reg_result}") Rails.logger.info("[OAuth2] reg_result -> #{reg_result}")
if reg_result[:message].blank? if reg_result[:message].blank?
open_user = OpenUsers::Ci4s.create!(user_id: reg_result[:user][:id], uid: login, extra: user_info) open_user = OpenUsers::Ci4s.create!(user_id: reg_result[:user][:id], uid: login, extra: user_info)
successful_authentication(open_user.user) successful_authentication(open_user.user)
else else
render_error(reg_result[:message]) tip_exception(reg_result[:message])
end end
else else
OpenUsers::Ci4s.create!(user: current_user, uid: user_info['username'], extra: user_info) OpenUsers::Ci4s.create!(user: current_user, uid: user_info['username'], extra: user_info)
end end
end end
Rails.logger.info("[OAuth2] session[:unionid] -> #{session[:unionid]}") Rails.logger.info("[OAuth2] session[:unionid] -> #{session[:unionid]}")
redirect_to root_path(new_user: new_user)
redirect_to root_path(new_user: new_user) && return rescue Exception => ex
# rescue Exception => ex render_error(ex.message)
# render_error(ex.message) end
# end
end end
end end