From 83c9c08e6d3efeafcf3078e8aa33678ebe71036d Mon Sep 17 00:00:00 2001
From: Daniel <d.knudsen@spawntree.de>
Date: Tue, 23 Jan 2024 15:05:31 +0100
Subject: [PATCH] xdebug

---
 .ddev/addon-metadata/phpmyadmin/manifest.yaml       | 4 ++--
 .ddev/commands/host/phpmyadmin                      | 5 +++++
 .ddev/web-build/Dockerfile                          | 3 +++
 .env                                                | 9 ++++-----
 src/EventListener/AuthenticationSuccessListener.php | 3 ++-
 5 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 .ddev/web-build/Dockerfile

diff --git a/.ddev/addon-metadata/phpmyadmin/manifest.yaml b/.ddev/addon-metadata/phpmyadmin/manifest.yaml
index 5f554be..2d82a88 100644
--- a/.ddev/addon-metadata/phpmyadmin/manifest.yaml
+++ b/.ddev/addon-metadata/phpmyadmin/manifest.yaml
@@ -1,7 +1,7 @@
 name: phpmyadmin
 repository: ddev/ddev-phpmyadmin
-version: v0.3.2
-install_date: "2023-12-06T15:28:03+01:00"
+version: v0.3.3
+install_date: "2024-01-23T13:35:25+01:00"
 project_files:
     - docker-compose.phpmyadmin.yaml
     - docker-compose.phpmyadmin-norouter.yaml
diff --git a/.ddev/commands/host/phpmyadmin b/.ddev/commands/host/phpmyadmin
index e0c9bc6..9761b57 100755
--- a/.ddev/commands/host/phpmyadmin
+++ b/.ddev/commands/host/phpmyadmin
@@ -5,6 +5,11 @@
 ## Usage: phpmyadmin
 ## Example: "ddev phpmyadmin"
 
+if [ "${DDEV_PROJECT_STATUS-running}" != "running" ]; then
+  echo "Project ${DDEV_PROJECT} is not running, starting it"
+  ddev start
+fi
+
 DDEV_PHPMYADMIN_PORT=8036
 DDEV_PHPMYADMIN_HTTPS_PORT=8037
 
diff --git a/.ddev/web-build/Dockerfile b/.ddev/web-build/Dockerfile
new file mode 100644
index 0000000..8a6e07b
--- /dev/null
+++ b/.ddev/web-build/Dockerfile
@@ -0,0 +1,3 @@
+ARG BASE_IMAGE
+FROM $BASE_IMAGE
+RUN enable_xdebug
\ No newline at end of file
diff --git a/.env b/.env
index 9776eb5..c39989b 100644
--- a/.env
+++ b/.env
@@ -39,13 +39,12 @@ MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0
 ###> symfony/mailer ###
 # MAILER_DSN=null://null
 ###< symfony/mailer ###
-
-###> nelmio/cors-bundle ###
-CORS_ALLOW_ORIGIN='^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$'
-###< nelmio/cors-bundle ###
-
 ###> lexik/jwt-authentication-bundle ###
 JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private.pem
 JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public.pem
 JWT_PASSPHRASE=dd92770a0c99773cc99cf1bdc4bd425986dacbcde1bc753e9934614aa6f364b6
 ###< lexik/jwt-authentication-bundle ###
+
+###> nelmio/cors-bundle ###
+CORS_ALLOW_ORIGIN='^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$'
+###< nelmio/cors-bundle ###
diff --git a/src/EventListener/AuthenticationSuccessListener.php b/src/EventListener/AuthenticationSuccessListener.php
index 772297f..1be827b 100644
--- a/src/EventListener/AuthenticationSuccessListener.php
+++ b/src/EventListener/AuthenticationSuccessListener.php
@@ -32,7 +32,8 @@ class AuthenticationSuccessListener
             return;
         }
 
-        $data['id'] = $this->iriConverter->getIriFromResource($user);
+        $data['id'] = $user->getId();
+        //$data['id'] = $this->iriConverter->getIriFromResource($user);
         $data['email'] = $user->getEmail();
         $data['firstName'] = $user->getFirstName();
         $data['lastName'] = $user->getLastName();