From 4c37f923d90b85c88cb54140ac49975d5e37cb39 Mon Sep 17 00:00:00 2001
From: Heiko Bernloehr <Heiko.Bernloehr@FreeIT.de>
Date: Thu, 3 Jul 2014 19:10:34 +0200
Subject: Fixed anonymous authentication error.

Moved authentication code for "authenticated participants" at the end of the
authentication queue again.
---
 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 6041c60..4ea8cfb 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -73,12 +73,6 @@ protected
       logger.info "X-EcsAuthId: #{participant.identities[0].name} -- Subparticipant-ID: #{participant.id}"
       return @participant= participant
     end
-    # 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?
@@ -92,6 +86,12 @@ 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
     false
   end
 
-- 
cgit v1.2.3