Merge branch 'main' into work-magiclink

wso2-extensions · Jan 18, 2024 · 2affc2f · 2affc2f
2 parents d608511 + 4e8ae6f
commit 2affc2f
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 3 deletions.
diff --git a/components/org.wso2.carbon.identity.application.authenticator.magiclink/pom.xml b/components/org.wso2.carbon.identity.application.authenticator.magiclink/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.local.auth.magiclink</groupId>
         <artifactId>identity-local-auth-magiclink</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>1.1.18-SNAPSHOT</version>
+        <version>1.1.20-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/.../org/wso2/carbon/identity/application/authenticator/magiclink/MagicLinkAuthenticator.java b/.../org/wso2/carbon/identity/application/authenticator/magiclink/MagicLinkAuthenticator.java
@@ -65,6 +65,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
 import static org.wso2.carbon.identity.application.authentication.framework.util.FrameworkConstants.RequestParams.RESTART_FLOW;
@@ -214,6 +215,15 @@ protected void initiateAuthenticationRequest(HttpServletRequest request, HttpSer
                 if (StringUtils.isNotEmpty(magicToken)) {
                     String expiryTime =
                             TimeUnit.SECONDS.toMinutes(getExpiryTime()) + " " + TimeUnit.MINUTES.name().toLowerCase();
+                    if (Boolean.parseBoolean((String) context.getProperty(IS_API_BASED))) {
+                        /* Setting a state param to the request for the client to be able to correlate the
+                        magic link coming to the app in API based authentication flow. The code is written in
+                        this manner as it is not possible to dynamically set params to the email template. */
+                        String state = UUID.randomUUID().toString();
+                        context.setProperty(MagicLinkAuthenticatorConstants.AUTHENTICATOR_NAME +
+                                MagicLinkAuthenticatorConstants.STATE_PARAM_SUFFIX, state);
+                        magicToken = magicToken + "&" + MagicLinkAuthenticatorConstants.STATE_PARAM + "=" + state;
+                    }
                     triggerEvent(user, context, magicToken, expiryTime);
                 }
             }
@@ -369,6 +379,12 @@ public String getName() {
         return MagicLinkAuthenticatorConstants.AUTHENTICATOR_NAME;
     }
 
+    @Override
+    public String getI18nKey() {
+
+        return MagicLinkAuthenticatorConstants.AUTHENTICATOR_MAGIC_LINK;
+    }
+
     /**
      * Method to Trigger the Magic Link event.
      *
@@ -662,6 +678,13 @@ public Optional<AuthenticatorData> getAuthInitiationData(AuthenticationContext c
             requiredParams.add(MLT);
             authenticatorData.setRequiredParams(requiredParams);
             setAuthParams(authenticatorData);
+            Map<String, String> additionalAuthenticationParams = new HashMap<>();
+            String state = (String) context.getProperty(MagicLinkAuthenticatorConstants.AUTHENTICATOR_NAME +
+                    MagicLinkAuthenticatorConstants.STATE_PARAM_SUFFIX);
+            additionalAuthenticationParams.put(MagicLinkAuthenticatorConstants.STATE_PARAM, state);
+            AdditionalData additionalData = new AdditionalData();
+            additionalData.setAdditionalAuthenticationParams(additionalAuthenticationParams);
+            authenticatorData.setAdditionalData(additionalData);
         }
 
         return Optional.of(authenticatorData);

diff --git a/.../carbon/identity/application/authenticator/magiclink/MagicLinkAuthenticatorConstants.java b/.../carbon/identity/application/authenticator/magiclink/MagicLinkAuthenticatorConstants.java
@@ -29,6 +29,7 @@ private MagicLinkAuthenticatorConstants() {
     }
 
     public static final String AUTHENTICATOR_NAME = "MagicLinkAuthenticator";
+    public static final String AUTHENTICATOR_MAGIC_LINK = "authenticator.magic.link";
     public static final String MLT = "mlt";
     public static final String AUTHENTICATOR_FRIENDLY_NAME = "Magic Link";
     public static final String MAGIC_LINK_NOTIFICATION_PAGE = "authenticationendpoint/magic_link_notification.do";
@@ -56,6 +57,8 @@ private MagicLinkAuthenticatorConstants() {
     public static final String EXPIRYTIME = "expiry-time";
     public static final String IS_API_BASED_AUTHENTICATION_SUPPORTED = "isAPIBasedAuthenticationSupported";
     public static final String CALLBACK_URL = "callbackUrl";
+    public static final String STATE_PARAM_SUFFIX = "_state_param";
+    public static final String STATE_PARAM = "state";
     public static final String MULTI_OPTION_QUERY_PARAM = "multiOptionURI";
 
     /**

diff --git a/features/org.wso2.carbon.identity.local.auth.magiclink.server.feature/pom.xml b/features/org.wso2.carbon.identity.local.auth.magiclink.server.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-local-auth-magiclink</artifactId>
         <groupId>org.wso2.carbon.identity.local.auth.magiclink</groupId>
-        <version>1.1.18-SNAPSHOT</version>
+        <version>1.1.20-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -27,7 +27,7 @@
     <groupId>org.wso2.carbon.identity.local.auth.magiclink</groupId>
     <artifactId>identity-local-auth-magiclink</artifactId>
     <packaging>pom</packaging>
-    <version>1.1.18-SNAPSHOT</version>
+    <version>1.1.20-SNAPSHOT</version>
     <name>WSO2 Carbon - MagicLink Authenticator</name>
     <scm>
         <url>https://github.com/wso2-extensions/identity-local-auth-magiclink.git</url>