htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed retrieval of user data from openHPI to API v2

Browse Source
This commit is contained in:
Ralf Teusner
2017-03-28 13:52:02 +02:00
parent 8dda5659a2
commit 025212c90e
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/xikolo/client.rb
View File

@ -10,7 +10,7 @@ class Xikolo::Client
end end
def self.user_profile_url(user_id) def self.user_profile_url(user_id)
return url + 'users/' + user_id return url + 'v2/users/' + user_id
end end
def self.post_request(url, params) def self.post_request(url, params)
@ -38,11 +38,11 @@ class Xikolo::Client
end end
def self.accept def self.accept
'application/vnd.xikolo.v1, application/json' 'application/vnd.xikolo.v1, application/vnd.api+json, application/json'
end end
def self.token def self.token
'Token token="'+Rails.application.secrets.openhpi_api_token+'"' 'Token token='+Rails.application.secrets.openhpi_api_token#+'"'
end end
private private

10
lib/xikolo/user_client.rb
View File

@ -4,12 +4,10 @@ class Xikolo::UserClient
# return default values if user is not found or if there is a server issue: # return default values if user is not found or if there is a server issue:
if user if user
if user['display_name'].present? name = user.dig('data', 'attributes', 'name') || "User " + user_id
name = user['display_name'] user_visual = user.dig('data', 'attributes', 'avatar_url') || ActionController::Base.helpers.image_path('default.png')
else language = user.dig('data', 'attributes', 'language') || "DE"
name = user['first_name'] return {display_name: name, user_visual: user_visual, language: language}
end
return {display_name: name, user_visual: user['user_visual'], language: user['language']}
else else
return {display_name: "User " + user_id, user_visual: ActionController::Base.helpers.image_path('default.png'), language: "DE"} return {display_name: "User " + user_id, user_visual: ActionController::Base.helpers.image_path('default.png'), language: "DE"}
end end