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] 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;
           }