diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 41d8d5bf1..b4c21e044 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 ac19f3418..64ae9fa93 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