From 67b7206183f06b313a8ea1da9f5793559c3e41b3 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Wed, 23 Oct 2024 14:56:07 +0800 Subject: [PATCH] =?UTF-8?q?fixed=20ci4s=20oauth2=E6=8E=A5=E5=85=A5=20user?= =?UTF-8?q?=5Finfo=20log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/oauth/ci4s_controller.rb | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/app/controllers/oauth/ci4s_controller.rb b/app/controllers/oauth/ci4s_controller.rb index f7924c51a..a36454562 100644 --- a/app/controllers/oauth/ci4s_controller.rb +++ b/app/controllers/oauth/ci4s_controller.rb @@ -8,7 +8,7 @@ class Oauth::Ci4sController < Oauth::BaseController # 需要educoder那边设置回调地址 def create - # begin + begin code = params['code'].to_s.strip tip_exception("code不能为空") if code.blank? @@ -32,23 +32,22 @@ class Oauth::Ci4sController < Oauth::BaseController login = user_info['username'] email = user_info['email'] 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}") if reg_result[:message].blank? open_user = OpenUsers::Ci4s.create!(user_id: reg_result[:user][:id], uid: login, extra: user_info) successful_authentication(open_user.user) else - render_error(reg_result[:message]) + tip_exception(reg_result[:message]) end else OpenUsers::Ci4s.create!(user: current_user, uid: user_info['username'], extra: user_info) end end Rails.logger.info("[OAuth2] session[:unionid] -> #{session[:unionid]}") - - redirect_to root_path(new_user: new_user) && return - # rescue Exception => ex - # render_error(ex.message) - # end + redirect_to root_path(new_user: new_user) + rescue Exception => ex + render_error(ex.message) + end end end