Merge branch 'main' into feat/user-profile-widget

Author: itaihanski

.github/workflows/ci.yml

@@ -8,9 +8,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       - name: Set up JDK 17
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+        uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
         with:
           distribution: "zulu"
           java-version: "17"

.github/workflows/detekt.yml

@@ -23,10 +23,10 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-    - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
     - name: Setup detekt
-      uses: peter-murray/setup-detekt@26449609a63e843a5b9bad8a4b63ef0ee717f7a5 # v3.0.0
+      uses: peter-murray/setup-detekt@4c0b45d6dac2620e84abd4ea7008a8a140b9f20a # v4.0.0
       with:
         detekt_version: 1.23
 

.github/workflows/publish.yml

@@ -9,9 +9,9 @@ jobs:
       contents: read
       packages: write
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       - name: Set up JDK 17
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+        uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
         with:
           distribution: "zulu"
           java-version: "17"

descopesdk/src/main/java/com/descope/internal/http/Responses.kt

@@ -21,6 +21,7 @@ internal data class JwtServerResponse(
     val cookiePath: String,
     val cookieName: String?,
     val sessionCookieName: String?,
+    val externalToken: String?,
 ) {
     companion object {
         fun fromJson(json: String, cookies: List<HttpCookie>) = JSONObject(json).run {
@@ -49,6 +50,7 @@ internal data class JwtServerResponse(
                 cookiePath = stringOrEmptyAsNull("cookiePath") ?: "",
                 cookieName = cookieName,
                 sessionCookieName = sessionCookieName,
+                externalToken = stringOrEmptyAsNull("externalToken"),
             )
         }
     }

descopesdk/src/main/java/com/descope/internal/routes/Shared.kt

@@ -61,6 +61,7 @@ internal fun JwtServerResponse.convert(): AuthenticationResponse {
         sessionToken = Token(sessionJwt),
         user = user.convert(),
         isFirstAuthentication = firstSeen,
+        externalToken = externalToken,
     )
 }
 

descopesdk/src/main/java/com/descope/types/Responses.kt

@@ -9,12 +9,14 @@ import com.descope.session.DescopeToken
  * @property refreshToken the refresh token is used to refresh expired session tokens.
  * @property isFirstAuthentication whether this the user's first authentication.
  * @property user information about the user.
+ * @property externalToken a token provided by an external token connector, when configured in the project.
  */
 data class AuthenticationResponse(
     val sessionToken: DescopeToken,
     val refreshToken: DescopeToken,
     val isFirstAuthentication: Boolean,
     val user: DescopeUser,
+    val externalToken: String? = null,
 )
 
 /**

descopesdk/src/test/java/com/descope/internal/http/JwtServerResponseTest.kt

@@ -0,0 +1,34 @@
+package com.descope.internal.http
+
+import org.junit.Assert.*
+import org.junit.Test
+
+class JwtServerResponseTest {
+
+    @Test
+    fun externalToken_populatedWhenPresent() {
+        val json = """
+            {
+                "sessionJwt": "session",
+                "refreshJwt": "refresh",
+                "firstSeen": true,
+                "externalToken": "ext-token-value"
+            }
+        """.trimIndent()
+        val response = JwtServerResponse.fromJson(json, emptyList())
+        assertEquals("ext-token-value", response.externalToken)
+    }
+
+    @Test
+    fun externalToken_nullWhenAbsent() {
+        val json = """
+            {
+                "sessionJwt": "session",
+                "refreshJwt": "refresh",
+                "firstSeen": true
+            }
+        """.trimIndent()
+        val response = JwtServerResponse.fromJson(json, emptyList())
+        assertNull(response.externalToken)
+    }
+}

descopesdk/src/test/java/com/descope/internal/routes/TestUtils.kt

@@ -111,6 +111,7 @@ internal val mockJwtResponse = JwtServerResponse(
     cookiePath = "/path",
     cookieName = null,
     sessionCookieName = null,
+    externalToken = null,
 )
 
 private object MockInfo: SystemInfo {