From 6d2a6e0331057f585278fd186460e437a3fd60d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Wed, 12 Oct 2022 15:44:46 +0800
Subject: [PATCH] =?UTF-8?q?cloudIDE=20saas=E5=AE=9A=E5=88=B6api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/projects_helper.rb     |  3 ++-
 app/views/users/info.json.jbuilder | 18 ++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 41d8d5bf..b4c21e04 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -131,10 +131,11 @@ module ProjectsHelper
 
 
   def cloud_ide_saas_url(user)
+    "" unless user.logged?
     token = Token.get_token_from_user(user, "autologin")
     oauth_url = "#{Rails.application.config_for(:configuration)['platform_url']}/api/users/info.json"
     saas_url = EduSetting.get("cloud_ide_saas_url") || "https://saasfactory.test.opentrs.com"
-    "#{saas_url}/oauth/login?product_account_id=PA1001218&tenant_code=TI1001383&oauth_url=#{oauth_url}&token=#{token}"
+    "#{saas_url}/oauth/login?product_account_id=PA1001218&tenant_code=TI1001383&oauth_url=#{oauth_url}&token=#{token.value}"
   end
 
   def aes_encrypt(key, des_text)
diff --git a/app/views/users/info.json.jbuilder b/app/views/users/info.json.jbuilder
index ac19f341..64ae9fa9 100644
--- a/app/views/users/info.json.jbuilder
+++ b/app/views/users/info.json.jbuilder
@@ -1,11 +1,13 @@
 json.code @code
 json.message @message
-json.userInfoBo do
-  json.name @user.real_name
-  json.userEmail @user.mail
-  json.phone @user.phone
-  json.login @user.login
-  json.user_id @user.id
-  json.image_url url_to_avatar(@user)
-  json.admin @user.admin
+if @user.present?
+  json.userInfoBo do
+    json.name @user.real_name
+    json.userEmail @user.mail
+    json.phone @user.phone
+    json.login @user.login
+    json.user_id @user.id
+    json.image_url url_to_avatar(@user)
+    json.admin @user.admin
+  end
 end
\ No newline at end of file