Skip to content

Commit a344d48

Browse files
committed
Remove project filtering
1 parent c3fa50f commit a344d48

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

descopesdk/src/main/java/com/descope/android/DescopeFlowCoordinator.kt

+5-10
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,8 @@ class DescopeFlowCoordinator(val webView: WebView) {
9797
val jwtServerResponse = JwtServerResponse.fromJson(success, emptyList())
9898
// take tokens from cookies if missing
9999
val cookieString = CookieManager.getInstance().getCookie(url)
100-
val projectId = sdk?.client?.config?.projectId
101-
jwtServerResponse.sessionJwt = jwtServerResponse.sessionJwt ?: findJwtInCookies(cookieString, projectId = projectId, name = SESSION_COOKIE_NAME)
102-
jwtServerResponse.refreshJwt = jwtServerResponse.refreshJwt ?: findJwtInCookies(cookieString, projectId = projectId, name = REFRESH_COOKIE_NAME)
100+
jwtServerResponse.sessionJwt = jwtServerResponse.sessionJwt ?: findJwtInCookies(cookieString, name = SESSION_COOKIE_NAME)
101+
jwtServerResponse.refreshJwt = jwtServerResponse.refreshJwt ?: findJwtInCookies(cookieString, name = REFRESH_COOKIE_NAME)
103102
handler.post {
104103
try {
105104
val authResponse = jwtServerResponse.convert()
@@ -501,7 +500,7 @@ private fun String.escapeForBackticks() = replace("\\", "\\\\")
501500

502501
// Cookies
503502

504-
internal fun findJwtInCookies(cookieString: String?, projectId: String?, name: String): String? {
503+
internal fun findJwtInCookies(cookieString: String?, name: String): String? {
505504
// split and aggregate all cookies
506505
val cookies = mutableListOf<HttpCookie>().apply {
507506
cookieString?.split("; ")?.forEach {
@@ -512,18 +511,14 @@ internal fun findJwtInCookies(cookieString: String?, projectId: String?, name: S
512511
}
513512
}
514513

515-
var filtered = cookies.filter { it.name == name } // filter according cookie name
514+
return cookies.filter { it.name == name } // filter according cookie name
516515
.mapNotNull { httpCookie -> // parse token
517516
try {
518517
Token(httpCookie.value)
519518
} catch (e: Exception) {
520519
null
521520
}
522-
}
523-
projectId?.let { pId ->
524-
filtered = filtered.filter { it.projectId == projectId } // enforce projectId
525-
}
526-
return filtered.maxByOrNull { it.issuedAt }?.jwt // take latest
521+
}.maxByOrNull { it.issuedAt }?.jwt // take latest
527522
}
528523

529524
// URI

0 commit comments

Comments
 (0)