From 65fe2bcbff216656c579df48f4af9c88b80123a8 Mon Sep 17 00:00:00 2001
From: Marco Montalbano <marco.montalbano@commercelayer.io>
Date: Wed, 8 Apr 2026 12:24:54 +0200
Subject: [PATCH] feat: improve the default for the my-account link

---
 packages/organization-config/src/getMfeConfig.test.ts | 2 +-
 packages/organization-config/src/getMfeConfig.ts      | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/organization-config/src/getMfeConfig.test.ts b/packages/organization-config/src/getMfeConfig.test.ts
index fd43905..2bdbd4a 100644
--- a/packages/organization-config/src/getMfeConfig.test.ts
+++ b/packages/organization-config/src/getMfeConfig.test.ts
@@ -352,7 +352,7 @@ describe("getMfeConfig function", () => {
         checkout: `https://demo-store.commercelayer.app/checkout/order123?accessToken=${ioAccessToken}`,
         identity: `https://demo-store.commercelayer.app/identity/login?clientId=client123&scope=scope123&publicScope=public_scope123&returnUrl=https://example.com/return&resetPasswordUrl=https://example.com/reset-password`,
         microstore: `https://demo-store.commercelayer.app/microstore/list/skuList123?accessToken=${ioAccessToken}`,
-        my_account: `https://demo-store.commercelayer.app/my-account?accessToken=${ioAccessToken}`,
+        my_account: `https://demo-store.commercelayer.app/my-account?accessToken=${ioAccessToken}&returnUrl=https://example.com/return`,
       },
     })
   })
diff --git a/packages/organization-config/src/getMfeConfig.ts b/packages/organization-config/src/getMfeConfig.ts
index dea3d9e..3a3756b 100644
--- a/packages/organization-config/src/getMfeConfig.ts
+++ b/packages/organization-config/src/getMfeConfig.ts
@@ -174,7 +174,12 @@ function getDefaults({ params }: GetMfeConfigProps): DefaultMfeConfig {
       links: {
         cart: `${appEndpoint}/cart/:order_id?accessToken=:access_token`,
         checkout: `${appEndpoint}/checkout/:order_id?accessToken=:access_token`,
-        my_account: `${appEndpoint}/my-account?accessToken=:access_token`,
+        my_account: `${appEndpoint}/my-account?${[
+          "accessToken=:access_token",
+          params.returnUrl != null ? "returnUrl=:return_url" : null,
+        ]
+          .filter((part) => part != null)
+          .join("&")}`,
         identity: `${appEndpoint}/identity/:identity_type?${[
           "clientId=:client_id",
           "scope=:scope",