Merge branch 'ISAICP-7087' into 'master'

ISAICP-7087: Login link doesn't work

See merge request !40

composer.json

@@ -261,6 +261,9 @@
             "drupal/config_devel": {
                 "Add a Drush command for manipulating module info files @see https://www.drupal.org/project/config_devel/issues/2392929": "https://git.drupalcode.org/project/config_devel/-/merge_requests/4.diff"
             },
+            "drupal/cas": {
+                "Cached redirect response issue with failed ticket validation @see https://www.drupal.org/project/cas/issues/3277861": "https://git.drupalcode.org/project/cas/-/merge_requests/12.diff"
+            },
             "drupal/core": {
                 "Use email verification when changing user email addresses @see https://www.drupal.org/project/drupal/issues/85494": "https://www.drupal.org/files/issues/2022-01-17/85494-376-9.3.x.patch",
                 "Use READ COMMITTED by default for MySQL transactions @see https://www.drupal.org/project/drupal/issues/1650930": "https://www.drupal.org/files/issues/2021-10-13/1650930-144.patch",
@@ -380,6 +383,9 @@
             },
             "openeuropa/oe_bootstrap_theme": {
                 "Preserve link attributes in navigation menus @see https://github.com/openeuropa/oe_bootstrap_theme/pull/38": "https://patch-diff.githubusercontent.com/raw/openeuropa/oe_bootstrap_theme/pull/38.diff"
+            },
+            "openeuropa/task-runner": {
+                "Array options @see https://github.com/openeuropa/task-runner/pull/137": "https://patch-diff.githubusercontent.com/raw/openeuropa/task-runner/pull/137.diff"
             }
         },
         "artifacts": {

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "ea9b188ee24059ce03745fc4855c3108",
+    "content-hash": "2e99367e29bae434a7103ee769ff5970",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -1542,7 +1542,7 @@
             "extra": {
                 "drupal": {
                     "version": "8.x-1.4",
-                    "datestamp": "1643490593",
+                    "datestamp": "1643490687",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -4405,6 +4405,10 @@
                     "name": "RobLoach",
                     "homepage": "https://www.drupal.org/user/61114"
                 },
+                {
+                    "name": "bnjmnm",
+                    "homepage": "https://www.drupal.org/user/2369194"
+                },
                 {
                     "name": "jjeff",
                     "homepage": "https://www.drupal.org/user/17190"
@@ -17335,17 +17339,17 @@
         },
         {
             "name": "drupal/cas_mock_server",
-            "version": "1.3.0",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/cas_mock_server.git",
-                "reference": "8.x-1.3"
+                "reference": "8.x-1.4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/cas_mock_server-8.x-1.3.zip",
-                "reference": "8.x-1.3",
-                "shasum": "b7fb047fc048f0f92136cd961a515f8ec7a43615"
+                "url": "https://ftp.drupal.org/files/projects/cas_mock_server-8.x-1.4.zip",
+                "reference": "8.x-1.4",
+                "shasum": "2f21bc0c878ee1219b598e1dc8348cd514f32aa0"
             },
             "require": {
                 "drupal/core": "^8 || ^9"
@@ -17370,8 +17374,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.3",
-                    "datestamp": "1630943966",
+                    "version": "8.x-1.4",
+                    "datestamp": "1651515347",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"

web/modules/custom/joinup_cas_mock_server/src/Config/JoinupCasMockServerConfigOverrider.php

@@ -36,8 +36,8 @@ public function __construct(ConfigFactoryInterface $config_factory) {
    */
   public function loadOverrides($names): array {
     return [
-      // Configure the CAS authentication form so it uses the same interface
-      // text as on EU Login.
+      // Configure the CAS authentication form, so that is using the same
+      // interface text as on EU Login.
       'cas_mock_server.settings' => [
         'login_form' => [
           'title' => 'Sign in to continue',

web/modules/custom/joinup_eulogin/src/Event/Subscriber/JoinupEuLoginAnonymous403Subscriber.php

@@ -62,7 +62,7 @@ public function on403(GetResponseForExceptionEvent $event) {
     $options = [
       'absolute' => TRUE,
       'query' => [
-        'returnto' => $destination,
+        'destination' => $destination,
       ],
     ];
     $redirect_url = Url::fromRoute('cas.login', [], $options)->toString();

web/modules/custom/joinup_group/src/Form/JoinGroupAnonymousRedirectForm.php

@@ -121,7 +121,7 @@ public function submitForm(array &$form, FormStateInterface $form_state): void {
     // to the group page.
     $url = new Url('cas.login', [
       'query' => [
-        'returnto' => $this->group->toUrl()->setAbsolute()->toString(),
+        'destination' => $this->group->toUrl()->setAbsolute()->toString(),
       ],
     ]);
     $form_state->setRedirectUrl($url);