diff options
author | Heiko Bernloehr <Heiko.Bernloehr@FreeIT.de> | 2014-07-03 19:10:34 +0200 |
---|---|---|
committer | Heiko Bernloehr <Heiko.Bernloehr@FreeIT.de> | 2016-01-27 01:50:42 +0100 |
commit | 4c37f923d90b85c88cb54140ac49975d5e37cb39 (patch) | |
tree | c76c681b34615731f27fd8f7814f96e3c2cba035 | |
parent | cc572b738ee204286dd3c866b4341801ff511211 (diff) | |
download | ecs2-4c37f923d90b85c88cb54140ac49975d5e37cb39.tar.gz ecs2-4c37f923d90b85c88cb54140ac49975d5e37cb39.zip |
Fixed anonymous authentication error.
Moved authentication code for "authenticated participants" at the end of the
authentication queue again.
-rw-r--r-- | app/controllers/application_controller.rb | 12 |
1 files 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 |