Skip to content

Exclude transient query parameter from identities request when false #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rolodato merged 3 commits into from
Jun 24, 2025
Merged

Exclude transient query parameter from identities request when false #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a64715
Exclude transient query parameter from identities request when false
caselett May 30, 2025
e6acfbc
Do not include transient parameter if false
rolodato Jun 23, 2025
0038652
Remove unnecessary interceptor
rolodato Jun 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion FlagsmithClient/src/main/java/com/flagsmith/Flagsmith.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ class Flagsmith constructor(
}

fun getIdentity(identity: String, transient: Boolean = false, result: (Result<IdentityFlagsAndTraits>) -> Unit) =
retrofit.getIdentityFlagsAndTraits(identity, transient).enqueueWithResult(defaults = null, result = result)
retrofit.getIdentityFlagsAndTraits(identity, if (transient) true else null).enqueueWithResult(defaults = null, result = result)
.also { lastUsedIdentity = identity }

fun clearCache() {
Expand Down
2 changes: 1 addition & 1 deletion FlagsmithClient/src/main/java/com/flagsmith/internal/FlagsmithRetrofitService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import com.google.gson.GsonBuilder
interface FlagsmithRetrofitService {

@GET("identities/")
fun getIdentityFlagsAndTraits(@Query("identifier") identity: String, @Query("transient") transient: Boolean = false) : Call<IdentityFlagsAndTraits>
fun getIdentityFlagsAndTraits(@Query("identifier") identity: String, @Query("transient") transient: Boolean? = null) : Call<IdentityFlagsAndTraits>

@GET("flags/")
fun getFlags() : Call<List<Flag>>
Expand Down
32 changes: 32 additions & 0 deletions FlagsmithClient/src/test/java/com/flagsmith/IdentityTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,38 @@ class IdentityTests {
}
}

@Test(expected = AssertionError::class)
fun testGetIdentityWithExpectedParameterMissing() {
mockServer.mockResponseFor(MockEndpoint.GET_IDENTITIES)
runBlocking {
flagsmith.getIdentitySync("person")

mockServer.verify(
request()
.withPath("/identities/")
.withMethod("GET")
.withQueryStringParameter("transient")
)
}
}

@Test
fun testGetIdentityWithoutTransientParameter() {
mockServer.mockResponseFor(MockEndpoint.GET_IDENTITIES)
runBlocking {
flagsmith.getIdentitySync("person")
val requests = mockServer.retrieveRecordedRequests(
request()
.withPath("/identities/")
.withMethod("GET")
)
assertEquals(1, requests.size)
val request = requests[0]
val transientParam = request.queryStringParameterList.find { it.name.toString() == "transient" }
assertNull("transient parameter should not be present", transientParam)
}
}

@Test
fun testGetTransientIdentity() {
mockServer.mockResponseFor(MockEndpoint.GET_TRANSIENT_IDENTITIES)
Expand Down
Loading