From 8f409f0212a3d2564de5fa48e0d3109f50c7f0b8 Mon Sep 17 00:00:00 2001
From: hel-platta-automation
 <95360595+hel-platta-automation@users.noreply.github.com>
Date: Wed, 9 Oct 2024 08:04:45 +0000
Subject: [PATCH] Update configuration

---
 composer.lock                 | 24 ++++++++++++------------
 tools/make/project/install.mk | 15 ++++++++++++---
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/composer.lock b/composer.lock
index 78ae25c9d..b5a0e8a1b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4253,16 +4253,16 @@
         },
         {
             "name": "drupal/hdbt",
-            "version": "6.7.8",
+            "version": "6.7.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git",
-                "reference": "9ad05cc9c80d0dc536132ae07625ae4375c51d3d"
+                "reference": "09da3d83c2c01a36420329b87592eb701ae8ccb7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/9ad05cc9c80d0dc536132ae07625ae4375c51d3d",
-                "reference": "9ad05cc9c80d0dc536132ae07625ae4375c51d3d",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/09da3d83c2c01a36420329b87592eb701ae8ccb7",
+                "reference": "09da3d83c2c01a36420329b87592eb701ae8ccb7",
                 "shasum": ""
             },
             "require": {
@@ -4281,10 +4281,10 @@
                 "Drupal"
             ],
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.7.8",
+                "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.7.9",
                 "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues"
             },
-            "time": "2024-10-07T12:37:51+00:00"
+            "time": "2024-10-09T08:00:11+00:00"
         },
         {
             "name": "drupal/hdbt_admin",
@@ -10837,16 +10837,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v5.3.0",
+            "version": "v5.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "3abf7425cd284141dc5d8d14a9ee444de3345d1a"
+                "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/3abf7425cd284141dc5d8d14a9ee444de3345d1a",
-                "reference": "3abf7425cd284141dc5d8d14a9ee444de3345d1a",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
+                "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
                 "shasum": ""
             },
             "require": {
@@ -10889,9 +10889,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
             },
-            "time": "2024-09-29T13:56:26+00:00"
+            "time": "2024-10-08T18:51:32+00:00"
         },
         {
             "name": "nodespark/des-connector",
diff --git a/tools/make/project/install.mk b/tools/make/project/install.mk
index 02cca319e..9e3d7a59e 100644
--- a/tools/make/project/install.mk
+++ b/tools/make/project/install.mk
@@ -1,9 +1,9 @@
 ifeq ($(DRUPAL_CONF_EXISTS),yes)
-	DRUPAL_NEW_TARGETS := up build drush-si drush-cr drush-locale-update drush-helfi-locale-import drush-uli
+	DRUPAL_NEW_TARGETS := up build drush-si drush-cr drush-locale-update drush-helfi-locale-import drush-unblock-uli
 else
-	DRUPAL_NEW_TARGETS := up build drush-si drush-helfi-enable-modules drush-locale-update drush-helfi-locale-import drush-uli
+	DRUPAL_NEW_TARGETS := up build drush-si drush-helfi-enable-modules drush-locale-update drush-helfi-locale-import drush-unblock-uli
 endif
-DRUPAL_POST_INSTALL_TARGETS := drush-locale-update drush-deploy drush-helfi-locale-import drush-uli
+DRUPAL_POST_INSTALL_TARGETS := drush-locale-update drush-deploy drush-helfi-locale-import drush-unblock-uli
 
 OC_LOGIN_TOKEN ?= $(shell bash -c 'read -s -p "You must obtain an API token by visiting https://oauth-openshift.apps.arodevtest.hel.fi/oauth/token/request (Token):" token; echo $$token')
 
@@ -46,3 +46,12 @@ drush-helfi-locale-import:  ## Update translations from helfi platform config.
 	$(call step,Import helfi platform config translations...)
 	$(call drush,helfi:locale-import helfi_platform_config)
 	$(call drush,cr)
+
+PHONY += drush-unblock-uli
+drush-unblock-uli: DRUPAL_UID ?= 1
+drush-unblock-uli: DRUPAL_DESTINATION ?= admin/reports/status
+drush-unblock-uli: ## Get login link
+	$(call step,Unblocking user...\n)
+	$(call drush,user:unblock$(if $(DRUPAL_UID), --uid=$(DRUPAL_UID), --uid=1))
+	$(call step,Login to your site with:\n)
+	$(call drush,uli$(if $(DRUPAL_UID), --uid=$(DRUPAL_UID),) $(DRUPAL_DESTINATION))