aboutsummaryrefslogtreecommitdiff
path: root/id/server/auth/src
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2015-07-17 11:41:14 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2015-07-17 11:41:14 +0200
commit59dee0f36a25d0c5f19d5d5d5652c3d919956cde (patch)
tree3c2927f5a4a2511b7c403dd592f64fab079f4919 /id/server/auth/src
parent2a5dc4175eeb29331b1af83b0e03fa965d447533 (diff)
parentb92da70a3071e1dbf910ee38ff4efbe61ecc8be6 (diff)
downloadmoa-id-spss-59dee0f36a25d0c5f19d5d5d5652c3d919956cde.tar.gz
moa-id-spss-59dee0f36a25d0c5f19d5d5d5652c3d919956cde.tar.bz2
moa-id-spss-59dee0f36a25d0c5f19d5d5d5652c3d919956cde.zip
Merge first STORK 2 changes
Conflicts: id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/ConsentEvaluator.java pom.xml
Diffstat (limited to 'id/server/auth/src')
-rw-r--r--id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml2
1 files changed, 1 insertions, 1 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 54debca81..8f01ca22b 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml
@@ -74,7 +74,7 @@
<to type="forward">/dispatcher?mod=id_stork2&amp;action=AttributeCollector&amp;%{query-string}</to>
</rule>
<rule match-type="regex">
- <from>^/stork2/CompleteAuthentication$</from>
+ <from>^/stork2/GetConsent$</from>
<to type="forward">/dispatcher?mod=id_stork2&amp;action=ConsentEvaluator&amp;%{query-string}</to>
</rule>
<rule match-type="regex">