diff options
5 files changed, 20 insertions, 9 deletions
diff --git a/basicConfig/templates/error_message.html b/basicConfig/templates/error_message.html index b1367962..f0bbf830 100644 --- a/basicConfig/templates/error_message.html +++ b/basicConfig/templates/error_message.html @@ -13,9 +13,9 @@ <body> <div id="page"> <div id="page1" class="case selected-case" role="main"> - <h2 class="OA_header" role="heading">Authentication error arise</h2> + <h2 class="OA_header" role="heading">Authentication error arise</h2> - <div class="hell" role="application" > + <div class="hell" role="application" > <h2 class="OA_header" role="heading" th:text="#{gui.errorpage.msg.title}">Error Header</h2> <div id="alert_area" class="hell" role="application" > @@ -24,9 +24,8 @@ <p><b th:text="#{gui.errorpage.msg.errorcode}">Code :</b> <span th:text="${extErrorCode}"></span></p> <p><b th:text="#{gui.errorpage.msg.errormsg}">Msg :</b > <span th:text="${#messages.msgWithParams('__${errorCode}__', '__${errorParams}__')}"></span></p> </div> - </div> - - </div> - </div> + </div> + </div> + </div> </body> </html> diff --git a/connector/pom.xml b/connector/pom.xml index 244a08fb..8ec63765 100644 --- a/connector/pom.xml +++ b/connector/pom.xml @@ -45,6 +45,10 @@ </exclusions> </dependency> <dependency> + <groupId>at.gv.egiz.eaaf</groupId> + <artifactId>eaaf_module_pvp2_sp</artifactId> + </dependency> + <dependency> <groupId>at.asitplus.eidas.ms_specific</groupId> <artifactId>connector_lib</artifactId> </dependency> @@ -159,7 +163,6 @@ <dependency> <groupId>at.asitplus.eidas.ms_specific.modules</groupId> <artifactId>authmodule-eIDAS-v2</artifactId> - <classifier>tests</classifier> <scope>test</scope> <type>test-jar</type> </dependency> diff --git a/eidas_modules/authmodule_id-austria/src/main/resources/process/id_austria.Authentication.process.xml b/eidas_modules/authmodule_id-austria/src/main/resources/process/id_austria.Authentication.process.xml index ebd5c54d..e8a83e68 100644 --- a/eidas_modules/authmodule_id-austria/src/main/resources/process/id_austria.Authentication.process.xml +++ b/eidas_modules/authmodule_id-austria/src/main/resources/process/id_austria.Authentication.process.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <pd:ProcessDefinition id="idAustriaForEidasProxyService" - xmlns:pd="http://reference.e-government.gv.at/namespace/moa/process/definition/v1"> + xmlns:pd="http://reference.e-government.gv.at/namespace/moa/process/definition/v1"> <pd:Task id="createAuthnRequestTask" class="createIdAustriaAuthnRequestTask" /> <pd:Task id="receiveAuthnResponseTask" class="receiveIdAustriaAuthnResponseTask" async="true" /> @@ -10,7 +10,7 @@ <pd:Transition from="start" to="createAuthnRequestTask" /> <pd:Transition from="createAuthnRequestTask" to="receiveAuthnResponseTask" /> - <pd:Transition from="receiveAuthnResponseTask" to="finalizeAuthentication" /> + <pd:Transition from="receiveAuthnResponseTask" to="finalizeAuthentication" /> <pd:Transition from="finalizeAuthentication" to="end" /> <pd:EndEvent id="end" /> diff --git a/eidas_modules/authmodule_id-austria/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/IdAustriaEidasProxyAuthenticationModulImplTest.java b/eidas_modules/authmodule_id-austria/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/IdAustriaEidasProxyAuthenticationModulImplTest.java index 733d2e19..5a4c8b7e 100644 --- a/eidas_modules/authmodule_id-austria/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/IdAustriaEidasProxyAuthenticationModulImplTest.java +++ b/eidas_modules/authmodule_id-austria/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/IdAustriaEidasProxyAuthenticationModulImplTest.java @@ -20,6 +20,7 @@ import at.asitplus.eidas.specific.modules.msproxyservice.protocol.ProxyServicePe import at.gv.egiz.eaaf.core.api.data.EaafConfigConstants; import at.gv.egiz.eaaf.core.api.idp.IConfiguration; import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext; +import at.gv.egiz.eaaf.core.api.idp.process.ProcessEngine; import at.gv.egiz.eaaf.core.impl.idp.auth.modules.ModuleRegistration; import at.gv.egiz.eaaf.core.impl.idp.module.test.DummyConfiguration; import at.gv.egiz.eaaf.core.impl.idp.module.test.DummySpConfiguration; @@ -35,6 +36,8 @@ public class IdAustriaEidasProxyAuthenticationModulImplTest { @Autowired ModuleRegistration moduleReg; @Autowired ResourceLoader loader; + @Autowired ProcessEngine processEngine; + private final ExecutionContext executionContext = new ExecutionContextImpl(); private DummySpConfiguration oaParam; @@ -79,6 +82,8 @@ public class IdAustriaEidasProxyAuthenticationModulImplTest { Assert.assertNotNull("Process is null", result); Assert.assertEquals("Process Id not match", "idAustriaForEidasProxyService", result); + Assert.assertNotNull("Can not initalize process", processEngine.createProcessInstance(result)); + } @Test diff --git a/eidas_modules/authmodule_id-austria/src/test/resources/spring/SpringTest-context_basic_test.xml b/eidas_modules/authmodule_id-austria/src/test/resources/spring/SpringTest-context_basic_test.xml index 16959dc5..99778839 100644 --- a/eidas_modules/authmodule_id-austria/src/test/resources/spring/SpringTest-context_basic_test.xml +++ b/eidas_modules/authmodule_id-austria/src/test/resources/spring/SpringTest-context_basic_test.xml @@ -25,4 +25,8 @@ <bean id="dummyVelocityBuilder" class="at.gv.egiz.eaaf.core.impl.idp.module.gui.DummyVelocityGuiFormBuilder" /> + <bean id="FinalizeAuthenticationTask" + class="at.gv.egiz.eaaf.core.impl.idp.controller.tasks.FinalizeAuthenticationTask" + scope="prototype" /> + </beans>
\ No newline at end of file |