fix: ext related

supertokens · Sep 18, 2024 · b791bf4 · b791bf4
1 parent bd0a918
commit b791bf4
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 7 deletions.
diff --git a/src/main/java/io/supertokens/oauth/OAuthToken.java b/src/main/java/io/supertokens/oauth/OAuthToken.java
@@ -102,6 +102,11 @@ public static String reSignToken(AppIdentifier appIdentifier, Main main, String
         payload.addProperty("iss", iss);
         payload.addProperty("stt", tokenType.getValue());
 
+        if (tokenType == TokenType.ACCESS_TOKEN) {
+            // we need to move rsub, tId and sessionHandle from ext to root
+            Transformations.transformExt(payload);
+        }
+
         if (payloadUpdate != null) {
             for (Map.Entry<String, JsonElement> entry : payloadUpdate.entrySet()) {
                 if (!NON_OVERRIDABLE_TOKEN_PROPS.contains(entry.getKey())) {

diff --git a/src/main/java/io/supertokens/oauth/Transformations.java b/src/main/java/io/supertokens/oauth/Transformations.java
@@ -8,6 +8,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -21,6 +22,7 @@
 import io.supertokens.utils.Utils;
 
 public class Transformations {
+    private static Set<String> EXT_PROPS = Set.of("rsub", "tId", "sessionHandle");
 
     public static Map<String, String> transformRequestHeadersForHydra(Map<String, String> requestHeaders) {
         if (requestHeaders == null) {
@@ -204,4 +206,20 @@ public static JsonObject transformJsonForHydra(JsonObject jsonInput) {
         }
         return transformedJsonInput;
     }
+
+    public static void transformExt(JsonObject payload) {
+        if (payload.has("ext")) {
+            JsonObject ext = payload.get("ext").getAsJsonObject();
+            for (String prop : EXT_PROPS) {
+                if (ext.has(prop)) {
+                    payload.addProperty(prop, ext.get(prop).getAsString());
+                    ext.remove(prop);
+                }
+            }
+
+            if (ext.entrySet().size() == 0) {
+                payload.remove("ext");
+            }
+        }
+    }
 }
diff --git a/src/main/java/io/supertokens/webserver/api/oauth/OAuthTokenIntrospectAPI.java b/src/main/java/io/supertokens/webserver/api/oauth/OAuthTokenIntrospectAPI.java
@@ -21,6 +21,7 @@
 import io.supertokens.jwt.exceptions.UnsupportedJWTSigningAlgorithmException;
 import io.supertokens.multitenancy.exception.BadPermissionException;
 import io.supertokens.oauth.OAuth;
+import io.supertokens.oauth.Transformations;
 import io.supertokens.pluginInterface.RECIPE_ID;
 import io.supertokens.pluginInterface.Storage;
 import io.supertokens.pluginInterface.exceptions.StorageQueryException;
@@ -76,13 +77,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws I
                         JsonObject response = jsonBody.getAsJsonObject();
 
                         response.addProperty("iss", iss);
-                        if (response.has("ext")) {
-                            JsonObject ext = response.get("ext").getAsJsonObject();
-                            for (Map.Entry<String, JsonElement> entry : ext.entrySet()) {
-                                response.add(entry.getKey(), entry.getValue());
-                            }
-                            response.remove("ext");
-                        }
+                        Transformations.transformExt(response);
 
                         response.addProperty("status", "OK");
                         return response;