Skip to content

Remove request URL from error strings #48

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

Open
mosherBT wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −3
Open

Remove request URL from error strings #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 android_sdk/src/main/java/co/optable/sdk/core/IdentifiersEncoder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ internal class IdentifiersEncoder(

return "e:$id"
} catch (e: Exception) {
Log.e("OptableSDK", "Can't get eid from $urlString", e)
Log.e("OptableSDK", "Can't get eid from deep link", e)
}
return null
}
Expand Down
2 changes: 1 addition & 1 deletion android_sdk/src/main/java/co/optable/sdk/core/network/NetworkClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ internal class NetworkClient(
if (response.isSuccessful) {
return@withContext NetworkResponse.Success(response.body()!!)
} else {
return@withContext NetworkResponse.Error("Request failed with status code $response: ${response.errorBody()}")
return@withContext NetworkResponse.Error("Request failed with status code ${response.code()}: ${response.errorBody()?.string()}")
}
}
}
Expand Down
8 changes: 7 additions & 1 deletion android_sdk/src/test/java/co/optable/sdk/core/network/NetworkClientTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import io.mockk.mockk
import kotlinx.coroutines.runBlocking
import okhttp3.ResponseBody
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test
Expand Down Expand Up @@ -59,14 +60,19 @@ class NetworkClientTest {

@Test
fun identify_shouldReturnError_whenApiCallIsUnsuccessful() = runBlocking {
val errorBody = ResponseBody.create(null, "Error")
val errorBody = ResponseBody.create(null, """{"error":"Tenant not found"}""")
val expectedResponse: Response<Unit> = Response.error(404, errorBody)

`when`(mockEdgeService.identify(emptyList())).thenReturn(expectedResponse)

val result = networkClient.identify(emptyList())

assertTrue(result is NetworkResponse.Error)
val message = (result as NetworkResponse.Error).message
assertTrue(message.contains("404"))
assertTrue(message.contains("Tenant not found"))
assertFalse(message.contains("url="))
assertFalse(message.contains("localhost"))
}

@Test
Expand Down
Loading