From c40777be2bcffefb380d3e667cde209108be0dd7 Mon Sep 17 00:00:00 2001 From: Jasder <2053003901@@qq.com> Date: Sun, 16 Aug 2020 00:54:22 +0800 Subject: [PATCH 1/3] FIX debug token --- app/controllers/concerns/login_helper.rb | 1 + app/controllers/oauth/educoder_controller.rb | 8 ++++---- app/models/token.rb | 4 ++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/controllers/concerns/login_helper.rb b/app/controllers/concerns/login_helper.rb index 1752e4f6c..45d08a02b 100644 --- a/app/controllers/concerns/login_helper.rb +++ b/app/controllers/concerns/login_helper.rb @@ -11,6 +11,7 @@ module LoginHelper def set_autologin_cookie(user) token = Token.get_or_create_permanent_login_token(user, "autologin") + Rails.logger.info "###### def set_autologin_cookie and get_or_create_permanent_login_token result: #{token&.value}" cookie_options = { :value => token.value, :expires => 1.month.from_now, diff --git a/app/controllers/oauth/educoder_controller.rb b/app/controllers/oauth/educoder_controller.rb index bc1a0cb6d..87d8c8f8a 100644 --- a/app/controllers/oauth/educoder_controller.rb +++ b/app/controllers/oauth/educoder_controller.rb @@ -10,12 +10,12 @@ class Oauth::EducoderController < Oauth::BaseController open_user= OpenUsers::Educoder.find_by(uid: login) if open_user.present? && open_user.user.present? && open_user.user.email_binded? - if current_user != open_user.user - logout_user - successful_authentication(open_user.user) - end + Rails.logger.info "######## open_user exist and open_user.user exsit and email is binded ok" + successful_authentication(open_user.user) + redirect_to callback_url else + Rails.logger.info "######## open user not exits" if current_user.blank? || !current_user.logged? user = User.find_by(login: login) if user diff --git a/app/models/token.rb b/app/models/token.rb index cd61090be..d40388440 100644 --- a/app/models/token.rb +++ b/app/models/token.rb @@ -27,8 +27,10 @@ class Token < ActiveRecord::Base def self.get_or_create_permanent_login_token(user, type) token = Token.get_token_from_user(user, type) + Rails.logger.info "###### Token.get_token_from_user result: #{token&.value}" unless token token = Token.create(:user => user, :action => type) + Rails.logger.info "###### Token.get_token_from_user is nul and agine create token: #{token&.value}" else token.update_attribute(:created_on, Time.now) end @@ -37,8 +39,10 @@ class Token < ActiveRecord::Base def self.get_token_from_user(user, action) token = Token.where(:action => action, :user_id => user).first + Rails.logger.info "###### self.get_token_from_user query result: #{token&.value}" unless token token = Token.create!(user_id: user.id, action: action) + Rails.logger.info "###### self.get_token_from_user query is nil and create result: #{token&.value}" end token end From 086ebc34b260a973a3e4e6c700f8000a0abfd53a Mon Sep 17 00:00:00 2001 From: Jasder <2053003901@@qq.com> Date: Sun, 16 Aug 2020 02:26:21 +0800 Subject: [PATCH 2/3] FIX login_hepler set cookie's bug --- app/controllers/concerns/login_helper.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/controllers/concerns/login_helper.rb b/app/controllers/concerns/login_helper.rb index 45d08a02b..8891ad029 100644 --- a/app/controllers/concerns/login_helper.rb +++ b/app/controllers/concerns/login_helper.rb @@ -22,9 +22,11 @@ module LoginHelper if edu_setting('cookie_domain').present? cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain')) end - unless cookies[autologin_cookie_name].present? - cookies[autologin_cookie_name] = cookie_options - end + # unless cookies[autologin_cookie_name].present? + # cookies[autologin_cookie_name] = cookie_options + # end + cookies[autologin_cookie_name] = cookie_options + # for action cable cookies.signed[:user_id] ||= user.id From c68c8ed089c5fe023b23edbb4d96bf81bbe9111c Mon Sep 17 00:00:00 2001 From: Jasder <2053003901@@qq.com> Date: Sun, 16 Aug 2020 13:48:48 +0800 Subject: [PATCH 3/3] FIX remote regitster bug --- app/controllers/oauth/educoder_controller.rb | 18 ++++-------- app/controllers/oauth_controller.rb | 30 ++++++++++---------- app/views/oauth/register.html.erb | 2 +- 3 files changed, 22 insertions(+), 28 deletions(-) diff --git a/app/controllers/oauth/educoder_controller.rb b/app/controllers/oauth/educoder_controller.rb index 87d8c8f8a..b194f6922 100644 --- a/app/controllers/oauth/educoder_controller.rb +++ b/app/controllers/oauth/educoder_controller.rb @@ -16,20 +16,14 @@ class Oauth::EducoderController < Oauth::BaseController redirect_to callback_url else Rails.logger.info "######## open user not exits" - if current_user.blank? || !current_user.logged? - user = User.find_by(login: login) - if user - successful_authentication(user) - OpenUsers::Educoder.create!(user: user, uid: user.login) + user = User.find_by(login: login) + if user + OpenUsers::Educoder.create!(user: user, uid: user.login) + successful_authentication(user) - redirect_to callback_url - else - redirect_to oauth_register_path(login: login, callback_url: callback_url) - end - else - # forge平台已登录 - OpenUsers::Educoder.create!(user: current_user, uid: login) redirect_to callback_url + else + redirect_to oauth_register_path(login: login, callback_url: callback_url) end end rescue WechatOauth::Error => ex diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb index 1cdeb4aa3..5da9297a6 100644 --- a/app/controllers/oauth_controller.rb +++ b/app/controllers/oauth_controller.rb @@ -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 diff --git a/app/views/oauth/register.html.erb b/app/views/oauth/register.html.erb index d9b39543c..59a3d4857 100644 --- a/app/views/oauth/register.html.erb +++ b/app/views/oauth/register.html.erb @@ -60,7 +60,7 @@ success: function(data) { console.log(data) if (data) { - if(data.message){ + if(data.email_exist){ $(".emailCheck span").html("该邮箱已存在."); return; }