diff options
author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-01-22 13:52:48 +0100 |
---|---|---|
committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-01-22 13:52:48 +0100 |
commit | 5b0754bddacd5bc7586b56c5a93e78f67d5cb060 (patch) | |
tree | a318ee77db5ac52afd2fda9412e7bcc7deab362d /id/server/auth/src/main/webapp/WEB-INF | |
parent | e2ca81976097a5f83183e091ec6a5c9a6afb5269 (diff) | |
parent | 1672ef1dc32bf37c966660c33e422729addd5b41 (diff) | |
download | moa-id-spss-5b0754bddacd5bc7586b56c5a93e78f67d5cb060.tar.gz moa-id-spss-5b0754bddacd5bc7586b56c5a93e78f67d5cb060.tar.bz2 moa-id-spss-5b0754bddacd5bc7586b56c5a93e78f67d5cb060.zip |
Merge branch 'eSense_eIDAS_development' into moa-id-3.2_(OPB)
Conflicts:
id/server/idserverlib/pom.xml
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfiguration.java
id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/CreateStorkAuthRequestFormTask.java
Diffstat (limited to 'id/server/auth/src/main/webapp/WEB-INF')
-rw-r--r-- | id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml index 8f01ca22b..c3cf396b3 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml @@ -93,6 +93,10 @@ <from>^/stork2/RetrieveMandate$</from> <to type="forward">/dispatcher?mod=id_stork2&action=MandateRetrievalRequest&%{query-string}</to> </rule> + <rule match-type="regex"> + <from>^/eidas/ColleagueRequest$</from> + <to type="forward">/dispatcher?mod=eidas&action=AuthenticationRequest&%{query-string}</to> + </rule> <rule match-type="regex"> |