From c24739b04d61ea8cf7ffa555fffd2ad4eda7a545 Mon Sep 17 00:00:00 2001
From: sandushi <sandushidileka2@gmail.com>
Date: Mon, 18 Mar 2024 14:42:36 +0530
Subject: [PATCH 1/2] Fix magic link issue when multi attribute login is
 enabled

---
 .../authenticator/magiclink/MagicLinkAuthenticator.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/org.wso2.carbon.identity.application.authenticator.magiclink/src/main/java/org/wso2/carbon/identity/application/authenticator/magiclink/MagicLinkAuthenticator.java b/components/org.wso2.carbon.identity.application.authenticator.magiclink/src/main/java/org/wso2/carbon/identity/application/authenticator/magiclink/MagicLinkAuthenticator.java
index 0459d45..1f2a665 100644
--- a/components/org.wso2.carbon.identity.application.authenticator.magiclink/src/main/java/org/wso2/carbon/identity/application/authenticator/magiclink/MagicLinkAuthenticator.java
+++ b/components/org.wso2.carbon.identity.application.authenticator.magiclink/src/main/java/org/wso2/carbon/identity/application/authenticator/magiclink/MagicLinkAuthenticator.java
@@ -199,7 +199,7 @@ protected void initiateAuthenticationRequest(HttpServletRequest request, HttpSer
                         e.getMessage(), user, e);
             }
         } else {
-            User user = getUser(context.getLastAuthenticatedUser());
+            User user = getUser(context.getLastAuthenticatedUser(), context);
             if (user != null) {
                 MagicLinkAuthContextData magicLinkAuthContextData = new MagicLinkAuthContextData();
                 String magicToken = TokenGenerator.generateToken(MagicLinkAuthenticatorConstants.TOKEN_LENGTH);

From e34cbc792fbadec6bc672c8230a7ad781c9d3d69 Mon Sep 17 00:00:00 2001
From: sandushi <sandushidileka2@gmail.com>
Date: Mon, 18 Mar 2024 15:03:44 +0530
Subject: [PATCH 2/2] Bump framework version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ca16215..17dccf2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -217,7 +217,7 @@
         <identity.application.authenticator.magiclink.exp.pkg.version>${project.version}
         </identity.application.authenticator.magiclink.exp.pkg.version>
         <carbon.kernel.version>4.9.10</carbon.kernel.version>
-        <carbon.identity.framework.version>5.25.522</carbon.identity.framework.version>
+        <carbon.identity.framework.version>7.0.106</carbon.identity.framework.version>
         <apache.felix.scr.ds.annotations.version>1.2.10</apache.felix.scr.ds.annotations.version>
         <identity.event.handler.notification.version>1.3.14</identity.event.handler.notification.version>
         <identity.inbound.auth.oauth.version>6.11.172</identity.inbound.auth.oauth.version>