From 16c51916694ebde7ae30848cc7a8cd432658b70b Mon Sep 17 00:00:00 2001 From: Ralf Teusner Date: Wed, 4 May 2016 14:48:30 +0200 Subject: [PATCH] fetch usernames via xikolo api --- lib/xikolo/client.rb | 5 ++--- lib/xikolo/user_client.rb | 9 +++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/xikolo/client.rb b/lib/xikolo/client.rb index ecad50e7..34876692 100644 --- a/lib/xikolo/client.rb +++ b/lib/xikolo/client.rb @@ -34,8 +34,7 @@ class Xikolo::Client end def self.url - #todo: JanR: set an environment variable here, fallback value: http://open.hpi.de/api/ - 'http://localhost:2000/api/' + @url ||= Config.new(:code_ocean).read.fetch(:xikolo_api_url, 'http://localhost:3000/api/') #caches this with ||=, second value of fetch is default value end def self.accept @@ -43,7 +42,7 @@ class Xikolo::Client end def self.token - 'Token token="'+Rails.application.config.xikolo[: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 44c21a73..0df70e02 100644 --- a/lib/xikolo/user_client.rb +++ b/lib/xikolo/user_client.rb @@ -4,9 +4,14 @@ class Xikolo::UserClient # return default values if user is not found or if there is a server issue: if user - return {display_name: user['first_name'], user_visual: user['user_visual'], language: user['language']} + 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']} else - return {display_name: "Name" + 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 end \ No newline at end of file