Add more fields to the DescopeUser to align with other mobile SDKs

Author: itaihanski

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

@@ -3,6 +3,7 @@ package com.descope.internal.http
 import com.descope.internal.others.optionalMap
 import com.descope.internal.others.secToMs
 import com.descope.internal.others.stringOrEmptyAsNull
+import com.descope.internal.others.toBooleanMap
 import com.descope.internal.others.toObjectList
 import com.descope.internal.others.toStringList
 import org.json.JSONObject
@@ -54,6 +55,11 @@ internal data class UserResponse(
     val givenName: String?,
     val middleName: String?,
     val familyName: String?,
+    val password: Boolean,
+    val status: String,
+    val roleNames: List<String>,
+    val ssoAppIds: List<String>,
+    val oauthProviders: Map<String, Boolean>,
 ) {
     companion object {
         @Suppress("UNUSED_PARAMETER")
@@ -74,6 +80,11 @@ internal data class UserResponse(
                 givenName = stringOrEmptyAsNull("givenName"),
                 middleName = stringOrEmptyAsNull("middleName"),
                 familyName = stringOrEmptyAsNull("familyName"),
+                password = optBoolean("password"),
+                status = getString("status"),
+                roleNames = getJSONArray("roleNames").toStringList(),
+                ssoAppIds = getJSONArray("ssoAppIds").toStringList(),
+                oauthProviders = getJSONObject("OAuth").toBooleanMap(), 
             )
         }
     }

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

@@ -36,6 +36,11 @@ internal fun UserResponse.convert(): DescopeUser = DescopeUser(
     givenName = givenName,
     middleName = middleName,
     familyName = familyName,
+    hasPassword = password,
+    status = status,
+    roleNames = roleNames,
+    ssoAppIds = ssoAppIds,
+    oauthProviders = oauthProviders.keys.toList(),
 )
 
 internal fun JwtServerResponse.convert(): AuthenticationResponse {

descopesdk/src/main/java/com/descope/session/Storage.kt

@@ -186,6 +186,11 @@ private fun deserializeDescopeUser(json: JSONObject): DescopeUser = json.run {
         givenName = stringOrEmptyAsNull("givenName"),
         middleName = stringOrEmptyAsNull("middleName"),
         familyName = stringOrEmptyAsNull("familyName"),
+        hasPassword = optBoolean("hasPassword"),
+        status = stringOrEmptyAsNull("status") ?: "unknown",
+        roleNames = optJSONArray("roleNames")?.toStringList() ?: emptyList(),
+        ssoAppIds = optJSONArray("ssoAppIds")?.toStringList() ?: emptyList(),
+        oauthProviders = optJSONArray("oauthProviders")?.toStringList() ?: emptyList()
     )
 }
 
@@ -203,6 +208,11 @@ private fun DescopeUser.toJson() = JSONObject().apply {
     put("givenName", givenName)
     put("middleName", middleName)
     put("familyName", familyName)
+    put("hasPassword", hasPassword)
+    put("status", status)
+    put("roleNames", roleNames.toJsonArray())
+    put("ssoAppIds", ssoAppIds.toJsonArray())
+    put("oauthProviders", oauthProviders.toJsonArray())
 }
 
 private fun createEncryptedStore(context: Context, projectId: String, logger: DescopeLogger?): SessionStorage.Store {

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

@@ -56,6 +56,11 @@ import com.descope.session.DescopeSession
  * @property givenName optional user's given name.
  * @property middleName optional user's middle name.
  * @property familyName optional user's family name.
+ * @property hasPassword whether the user has a password set or not.
+ * @property status the user's status, one of 'enabled', 'disabled' or 'invited'.
+ * @property roleNames a list of role names the user is associated with. Can be empty.
+ * @property ssoAppIds a list of SSO App IDs the user is associated with. Can be empty.
+ * @property oauthProviders a list of OAuth providers the user has used. Can be empty.
  */
 data class DescopeUser(
     val userId: String,
@@ -71,4 +76,9 @@ data class DescopeUser(
     val givenName: String?,
     val middleName: String?,
     val familyName: String?,
+    val hasPassword: Boolean,
+    val status: String,
+    val roleNames: List<String>,
+    val ssoAppIds: List<String>,
+    val oauthProviders: List<String>,
 )

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

@@ -34,6 +34,11 @@ class AuthTest {
             givenName = null,
             middleName = null,
             familyName = null,
+            password = false,
+            status = "enabled",
+            roleNames = emptyList(),
+            ssoAppIds = emptyList(),
+            oauthProviders = emptyMap(),
         )
         val response = auth.me("refreshJwt")
         assertEquals("name", response.name)

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

@@ -97,6 +97,11 @@ internal val mockJwtResponse = JwtServerResponse(
         givenName = "givenName",
         middleName = "middleName",
         familyName = "familyName",
+        password = true,
+        status = "disabled",
+        roleNames = listOf("role1", "role2"),
+        ssoAppIds = listOf("sso1", "sso2"),
+        oauthProviders = mapOf("google" to true, "github" to true)
     )
 )