From 35ab14dff2f2f2d21a72b211e9652e5edb703a3e Mon Sep 17 00:00:00 2001
From: p31729568 <winse.wang@foxmail.com>
Date: Wed, 16 Oct 2019 17:08:50 +0800
Subject: [PATCH] weapp: modify codesession api
---
app/controllers/weapps/code_sessions_controller.rb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/app/controllers/weapps/code_sessions_controller.rb b/app/controllers/weapps/code_sessions_controller.rb
index 7c1978e5f..ef2b9a4ce 100644
--- a/app/controllers/weapps/code_sessions_controller.rb
+++ b/app/controllers/weapps/code_sessions_controller.rb
@@ -1,5 +1,6 @@
class Weapps::CodeSessionsController < Weapps::BaseController
def create
+ logged = false
return render_error('code不能为空') if params[:code].blank?
result = Wechat::Weapp.jscode2session(params[:code])
@@ -12,6 +13,7 @@ class Weapps::CodeSessionsController < Weapps::BaseController
if open_user.present? && open_user.user
set_session_unionid(result['unionid'])
successful_authentication(open_user.user)
+ logged = true
else
# 新用户
user_info = Wechat::Weapp.decrypt(result['session_key'], params[:encrypted_data], params[:iv])
@@ -19,6 +21,6 @@ class Weapps::CodeSessionsController < Weapps::BaseController
set_session_unionid(user_info['unionId'])
end
- render_ok(openid: result['openid'])
+ render_ok(openid: result['openid'], logged: logged)
end
end
\ No newline at end of file