diff --git a/lib/xikolo/client.rb b/lib/xikolo/client.rb index 06e4ecf4..4e6f22b2 100644 --- a/lib/xikolo/client.rb +++ b/lib/xikolo/client.rb @@ -10,7 +10,7 @@ class Xikolo::Client end def self.user_profile_url(user_id) - return url + 'users/' + user_id + return url + 'v2/users/' + user_id end def self.post_request(url, params) @@ -38,11 +38,11 @@ class Xikolo::Client end def self.accept - 'application/vnd.xikolo.v1, application/json' + 'application/vnd.xikolo.v1, application/vnd.api+json, application/json' end def self.token - 'Token token="'+Rails.application.secrets.openhpi_api_token+'"' + 'Token token='+Rails.application.secrets.openhpi_api_token#+'"' end private diff --git a/lib/xikolo/user_client.rb b/lib/xikolo/user_client.rb index 63412e46..c681c999 100644 --- a/lib/xikolo/user_client.rb +++ b/lib/xikolo/user_client.rb @@ -4,12 +4,10 @@ class Xikolo::UserClient # return default values if user is not found or if there is a server issue: if user - if user['display_name'].present? - name = user['display_name'] - else - name = user['first_name'] - end - return {display_name: name, user_visual: user['user_visual'], language: user['language']} + name = user.dig('data', 'attributes', 'name') || "User " + user_id + user_visual = user.dig('data', 'attributes', 'avatar_url') || ActionController::Base.helpers.image_path('default.png') + language = user.dig('data', 'attributes', 'language') || "DE" + return {display_name: name, user_visual: user_visual, language: language} else return {display_name: "User " + user_id, user_visual: ActionController::Base.helpers.image_path('default.png'), language: "DE"} end