From 07fdaff191aa7ee151eeb9aa34fcf9a07cb922a9 Mon Sep 17 00:00:00 2001 From: Heiko Bernloehr Date: Wed, 18 Jun 2014 11:01:57 +0200 Subject: Check for authenticated participants first. --- app/controllers/application_controller.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 109e951..913ca5f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -67,6 +67,12 @@ class ApplicationController < ActionController::Base protected def authentication + # authenticated participants + auth_id, participant = authenticated_participant + if participant + logger.info "X-EcsAuthId: #{auth_id} -- Participant-ID: #{participant.id}" + return @participant= participant + end if ECS_CONFIG["participants"]["allow_anonymous"] # new anonymous participant if new_anonymous_participant? @@ -80,12 +86,6 @@ protected return @participant = participant end end - # authenticated participants - auth_id, participant = authenticated_participant - if participant - logger.info "X-EcsAuthId: #{auth_id} -- Participant-ID: #{participant.id}" - return @participant= participant - end end def new_anonymous_participant? -- cgit v1.2.3