Merge branch 'pre_trustie_server' into trustie_server

app/controllers/bind_users_controller.rb

@@ -12,6 +12,7 @@ class BindUsersController < ApplicationController
     tip_exception '该账号已被绑定，请更换其他账号进行绑定' if bind_user.bind_open_user?(params[:type].to_s)
 
     "OpenUsers::#{params[:type].to_s.capitalize}".constantize.create!(user: bind_user, uid: session[:unionid])
+    successful_authentication(bind_user)
     @user = bind_user
   end
 

app/controllers/oauth/callbacks_controller.rb

@@ -69,6 +69,8 @@ class Oauth::CallbacksController < Oauth::BaseController
     open_user = "OpenUsers::#{platform.to_s.capitalize}".constantize.find_by(uid: uid)
     if open_user.present? && open_user.user.present?
       successful_authentication(open_user.user)
+      redirect_to root_path(new_user: false)
+      return
     else
       if current_user.blank? || !current_user.logged?
         session[:unionid] = uid
@@ -76,6 +78,7 @@ class Oauth::CallbacksController < Oauth::BaseController
         "OpenUsers::#{platform.to_s.capitalize}".constantize.create!(user: current_user, uid: uid)
       end
     end
+    Rails.logger.info("[OAuth2] session[:unionid] -> #{session[:unionid]}")
     redirect_to "/bindlogin/#{platform}"
   end
 

app/views/bind_users/create.json.jbuilder

@@ -1,3 +1,4 @@
+json.status 0
 json.username @user.full_name
 json.real_name @user.real_name
 json.login @user.login