aboutsummaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorhellekin <hellekin@cepheide.org>2021-02-02 23:18:27 +0100
committerhellekin <hellekin@cepheide.org>2021-02-02 23:25:57 +0100
commit7f880e3ab041584f77daf098e585bc3c4a08a38a (patch)
tree31bb92a7e60027df4af30153a6781b2f11cf6986 /app/controllers
parentb5739232a535f89b48b54ee52ea7d9bb59f8a46f (diff)
downloadincommon-map-7f880e3ab041584f77daf098e585bc3c4a08a38a.tar.gz
[FIX] Account for users without an avatar or group
1. Ensure new users belong to an Agent Users may come without the correct group information, leading to a situation where they have no Agent assigned to them. The application cannot handle this, so we ensure new users are at least associated to the new Anonymous Agent. 2. Introduce a default avatar Users coming without an avatar would see a broken view. Now they're assigned a default avatar, which shows the IN COMMON icon logo instead.
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/welcome_controller.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index 85246e5..5fce0cf 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -121,16 +121,15 @@ class WelcomeController < ApplicationController
# Update user agents
def perform_background_jobs
if @current_user.present?
- AgencyWatcherJob.perform_later(@current_user, @sso.user_info[:groups].split(','))
+ EnsureAgentJob.perform_later(@current_user, @sso.user_info[:groups].split(','))
end
end
# Save User ID and current agent in session
def update_current_session
if @current_user.present?
- session[:current_user] = @current_user[:external_id]
- # TODO: make this a bit smarter
- session[:current_agent] = @current_user&.agents&.pluck(:name)&.last
+ session[:current_user] = @current_user[:external_id]
+ session[:current_agent] = current_agent_name
end
end
end