github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-04-29 20:38:41 -05:00
Code Issues 936 Packages Projects Releases 122 Wiki Activity

[PM-8331] Using default send url when on US cloud (#4925)

Browse Source
This commit is contained in:
aj-rosado
2025-03-27 18:30:49 +00:00
committed by GitHub
parent 346961856f
commit 8dd5a9df9f
5 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/x8bit/bitwarden/data/platform/repository/util/EnvironmentUrlDataJsonExtensions.kt
View File

@@ -59,7 +59,15 @@ val EnvironmentUrlDataJson.baseWebSendUrl: String
get() = get() =
this this
.baseWebVaultUrlOrNull .baseWebVaultUrlOrNull
?.let { "$it/#/send/" } ?.let {
// Only on US Cloud we should use the default web send URL
// On all other server instances we should use the base web send URL
if (it == DEFAULT_WEB_VAULT_URL) {
DEFAULT_WEB_SEND_URL
} else {
"$it/#/send/"
}
}
?: DEFAULT_WEB_SEND_URL ?: DEFAULT_WEB_SEND_URL
/** /**

11
app/src/test/java/com/x8bit/bitwarden/data/platform/repository/util/EnvironmentUrlsDataJsonExtensionsTest.kt
View File

@@ -164,6 +164,17 @@ class EnvironmentUrlsDataJsonExtensionsTest {
assertEquals("https://send.bitwarden.com/#", result) assertEquals("https://send.bitwarden.com/#", result)
} }
@Test
fun `baseWebSendUrl should return the default when webvault matches default webvault`() {
val result = DEFAULT_CUSTOM_ENVIRONMENT_URL_DATA
.copy(
webVault = "https://vault.bitwarden.com",
base = "",
)
.baseWebSendUrl
assertEquals("https://send.bitwarden.com/#", result)
}
@Test @Test
fun `labelOrBaseUrlHost should correctly convert US environment to the correct label`() { fun `labelOrBaseUrlHost should correctly convert US environment to the correct label`() {
val environment = EnvironmentUrlDataJson.DEFAULT_US val environment = EnvironmentUrlDataJson.DEFAULT_US

2
app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModelTest.kt
View File

@@ -1637,7 +1637,7 @@ private val DEFAULT_STATE: SearchState = SearchState(
viewState = SearchState.ViewState.Loading, viewState = SearchState.ViewState.Loading,
dialogState = null, dialogState = null,
vaultFilterData = null, vaultFilterData = null,
baseWebSendUrl = "https://vault.bitwarden.com/#/send/", baseWebSendUrl = "https://send.bitwarden.com/#",
baseIconUrl = "https://vault.bitwarden.com/icons", baseIconUrl = "https://vault.bitwarden.com/icons",
isIconLoadingDisabled = false, isIconLoadingDisabled = false,
hasMasterPassword = true, hasMasterPassword = true,

2
app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModelTest.kt
View File

@@ -1062,7 +1062,7 @@ class AddSendViewModelTest : BaseViewModelTest() {
selectedType = DEFAULT_SELECTED_TYPE_STATE, selectedType = DEFAULT_SELECTED_TYPE_STATE,
) )
private const val DEFAULT_ENVIRONMENT_URL = "https://vault.bitwarden.com/#/send/" private const val DEFAULT_ENVIRONMENT_URL = "https://send.bitwarden.com/#"
private val DEFAULT_STATE = AddSendState( private val DEFAULT_STATE = AddSendState(
addSendType = AddSendType.AddItem, addSendType = AddSendType.AddItem,

8
app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataUtil.kt
View File

@@ -301,10 +301,10 @@ fun createMockDisplayItemForSend(
overflowOptions = listOf( overflowOptions = listOf(
ListingItemOverflowAction.SendAction.EditClick(sendId = "mockId-$number"), ListingItemOverflowAction.SendAction.EditClick(sendId = "mockId-$number"),
ListingItemOverflowAction.SendAction.CopyUrlClick( ListingItemOverflowAction.SendAction.CopyUrlClick(
sendUrl = "https://vault.bitwarden.com/#/send/mockAccessId-$number/mockKey-$number", sendUrl = "https://send.bitwarden.com/#mockAccessId-$number/mockKey-$number",
), ),
ListingItemOverflowAction.SendAction.ShareUrlClick( ListingItemOverflowAction.SendAction.ShareUrlClick(
sendUrl = "https://vault.bitwarden.com/#/send/mockAccessId-$number/mockKey-$number", sendUrl = "https://send.bitwarden.com/#mockAccessId-$number/mockKey-$number",
), ),
ListingItemOverflowAction.SendAction.RemovePasswordClick(sendId = "mockId-$number"), ListingItemOverflowAction.SendAction.RemovePasswordClick(sendId = "mockId-$number"),
ListingItemOverflowAction.SendAction.DeleteClick(sendId = "mockId-$number"), ListingItemOverflowAction.SendAction.DeleteClick(sendId = "mockId-$number"),
@@ -344,10 +344,10 @@ fun createMockDisplayItemForSend(
overflowOptions = listOf( overflowOptions = listOf(
ListingItemOverflowAction.SendAction.EditClick(sendId = "mockId-$number"), ListingItemOverflowAction.SendAction.EditClick(sendId = "mockId-$number"),
ListingItemOverflowAction.SendAction.CopyUrlClick( ListingItemOverflowAction.SendAction.CopyUrlClick(
sendUrl = "https://vault.bitwarden.com/#/send/mockAccessId-$number/mockKey-$number", sendUrl = "https://send.bitwarden.com/#mockAccessId-$number/mockKey-$number",
), ),
ListingItemOverflowAction.SendAction.ShareUrlClick( ListingItemOverflowAction.SendAction.ShareUrlClick(
sendUrl = "https://vault.bitwarden.com/#/send/mockAccessId-$number/mockKey-$number", sendUrl = "https://send.bitwarden.com/#mockAccessId-$number/mockKey-$number",
), ),
ListingItemOverflowAction.SendAction.RemovePasswordClick(sendId = "mockId-$number"), ListingItemOverflowAction.SendAction.RemovePasswordClick(sendId = "mockId-$number"),
ListingItemOverflowAction.SendAction.DeleteClick(sendId = "mockId-$number"), ListingItemOverflowAction.SendAction.DeleteClick(sendId = "mockId-$number"),