maestro_token

.docker/development/phpfpm/Dockerfile

@@ -0,0 +1,13 @@
+FROM itkdev/php8.1-fpm:latest
+
+USER root
+
+# https://github.com/axllent/mailpit#download-static-binary-windows-linux-and-mac
+# https://github.com/axllent/mailpit/releases/tag/v1.8.1
+RUN <<'EOF'
+curl --location https://github.com/axllent/mailpit/releases/download/v1.8.1/mailpit-linux-amd64.tar.gz > mailpit-linux-amd64.tar.gz
+tar xvf mailpit-linux-amd64.tar.gz --directory /usr/local/bin mailpit
+rm mailpit-linux-amd64.tar.gz
+EOF
+
+USER deploy

.docker/server/phpfpm/Dockerfile

@@ -0,0 +1,13 @@
+FROM itkdev/php8.1-fpm:alpine
+
+USER root
+
+# https://github.com/axllent/mailpit#download-static-binary-windows-linux-and-mac
+# https://github.com/axllent/mailpit/releases/tag/v1.8.1
+RUN <<EOF
+curl --location https://github.com/axllent/mailpit/releases/download/v1.8.1/mailpit-linux-amd64.tar.gz > mailpit-linux-amd64.tar.gz
+tar xvf mailpit-linux-amd64.tar.gz --directory /usr/local/bin mailpit
+rm mailpit-linux-amd64.tar.gz
+EOF
+
+USER deploy

.docker/vhost.conf

@@ -86,6 +86,16 @@ server {
         log_not_found off;
     }
 
+    # Enforce clean URLs
+    # Removes index.php from urls like:
+    # www.example.com/index.php/my-page --> www.example.com/my-page
+    #
+    # Could be done with 301 for permanent or other redirect codes.
+    absolute_redirect off;
+    if ($request_uri ~* "^(.*/)index\.php/(.*)") {
+        return 301 /$2;
+    }
+
     error_log /dev/stderr;
     access_log /dev/stdout main;
 }

.gitignore

@@ -66,7 +66,9 @@
 !/web/modules/custom/os2forms_fbs_handler
 
 # Ignore site specific modules.
-/web/sites/*/modules
+/web/sites/*/modules/*
+!/web/sites/default/modules/os2forms_maestro_webform
+!/web/sites/default/modules/os2forms_forloeb
 
 # Ignore directories generated by Composer
 #

CHANGELOG.md

@@ -18,6 +18,8 @@ Nedenfor ses dato for release og beskrivelse af opgaver som er implementeret.
 * Tilføjede [OpenId Connect Server
   Mock](https://github.com/Soluto/oidc-server-mock) til test af OIDC-login under
   udvikling.
+* Opgraderede `drupal/maestro` til
+  `https://git.drupalcode.org/project/maestro/-/tree/maestro_token`.
 
 ## [2.4.2]
 

README.md

@@ -149,8 +149,8 @@ docker compose exec phpfpm composer coding-standards-check
 ```
 
 ```sh
-docker compose run node yarn --cwd /app install
-docker compose run node yarn --cwd /app coding-standards-check
+docker compose run --rm node yarn --cwd /app install
+docker compose run --rm node yarn --cwd /app coding-standards-check
 ```
 
 ## Testing

composer.json

@@ -41,6 +41,10 @@
         {
             "type": "composer",
             "url": "https://packages.drupal.org/8"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/itk-dev/os2forms_forloeb"
         }
     ],
     "require": {
@@ -56,7 +60,7 @@
         "drupal/key_auth": "^2.1",
         "drupal/keyboard_shortcuts": "^1.1.1",
         "drupal/lang_dropdown": "^2.0",
-        "drupal/maestro": "^3.0",
+        "drupal/maestro": "^3.1",
         "drupal/memcache": "^2.5",
         "drupal/menu_link_attributes": "^1.3",
         "drupal/openid_connect": "^2.0",
@@ -69,11 +73,13 @@
         "itk-dev/itkdev-booking": "^1.0.3",
         "itk-dev/os2forms_cpr_lookup": "^1.8.0",
         "itk-dev/os2forms_cvr_lookup": "^1.4",
-        "itk-dev/os2forms_digital_post": "^2.0",
         "itk-dev/os2forms_failed_jobs": "^1.2",
         "itk-dev/os2forms_nemlogin_openid_connect": "^1.3",
         "itk-dev/os2forms_user_field_lookup": "^1.0",
+        "itk-dev/serviceplatformen": "dev-feature/guzzle6-adapter as 1.5",
         "itk-dev/web_accessibility_statement": "^1.0",
+        "os2forms/os2forms_digital_post": "^3.0",
+        "os2forms/os2forms_forloeb": "dev-feature/maestro-stuff as 2.6",
         "os2forms/os2forms_forloeb_profile": "^1.12",
         "os2forms/os2forms_get_organized": "^1.1.2",
         "os2forms/os2forms_organisation": "^1.1.1",
@@ -138,11 +144,8 @@
                 "webform_revisions_install called twice during site:install --existing-config": "patches/drupal/config_entity_revisions/webform_revisions.install.patch"
             },
             "drupal/permissions_by_term": {
-                "Change check for node form": "patches/drupal/permissions_by_term/changeNodeCheck.patch",
-                "https://www.drupal.org/project/permissions_by_term/issues/3354478": "https://git.drupalcode.org/project/permissions_by_term/-/merge_requests/20.patch"
-            },
-            "drupal/lang_dropdown": {
-                "https://www.drupal.org/project/lang_dropdown/issues/3348277": "https://www.drupal.org/files/issues/2023-03-16/lang_dropdown-2-0-0--3348277-16.patch"
+                "Change check for node form": "patches/drupal/permissions_by_term/changeNodeCheck.patch"
+
             }
         },
         "patches-ignore": {