fix back links

cas/cas-server/src/main/java/fr/gouv/vitamui/cas/webflow/actions/CustomDelegatedClientAuthenticationAction.java

@@ -140,6 +140,12 @@ public class CustomDelegatedClientAuthenticationAction extends DelegatedClientAu
         val flowScope = context.getFlowScope();
         flowScope.put(Constants.PORTAL_URL, vitamuiPortalUrl);
 
+        // retrieve the service if it exists to prepare the serviceUrl parameter (for the back links)
+        val service = WebUtils.getService(context);
+        if (service != null) {
+            flowScope.put("serviceUrl", service.getOriginalUrl());
+        }
+
         val event = super.doExecute(context);
         if ("error".equals(event.getId())) {
 

cas/cas-server/src/main/resources/templates/casLoginView.html

@@ -110,7 +110,7 @@
             <button type="submit" class="vitamui-primary" name="submit" accesskey="l" th:value="Suivant" tabindex="6">OK</button>
         </form>
         <p class="helper">Appuyez sur <strong>Entrée</strong> pour valider</p>
-		<button class="back" type="button" th:onclick="|location.href = '@{/login}';|" th:if="${!#strings.isEmpty(superUser)}">
+		<button class="back" type="button" th:onclick="|location.href = '@{/login(service=${serviceUrl})}';|" th:if="${!#strings.isEmpty(superUser)}">
 			<i class="material-icons">arrow_back</i> Retour
 	    </button>
     </div>

cas/cas-server/src/main/resources/templates/casPwdView.html

@@ -96,7 +96,7 @@
             </button>
         </form>
 
-		<button class="back" type="button" th:onclick="|location.href = '@{/login}';|">
+		<button class="back" type="button" th:onclick="|location.href = '@{/login(service=${serviceUrl})}';|">
 			<i class="material-icons">arrow_back</i> Retour
 	    </button>
     </div>

cas/cas-server/src/main/resources/templates/layout.html

@@ -59,7 +59,7 @@
         	<p/>
     	</div>
 
-		<button class="back" type="button" th:onclick="|location.href = '@{/login}';|">
+		<button class="back" type="button" th:onclick="|location.href = '@{/login(service=${serviceUrl})}';|">
         	<i class="material-icons">arrow_back</i> Retour
         </button>
     </div>