diff --git a/app/src/beta/AndroidManifest.xml b/app/src/beta/AndroidManifest.xml deleted file mode 100644 index 59bebfd0cf..0000000000 --- a/app/src/beta/AndroidManifest.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/app/src/beta/res/xml/network_security_config.xml b/app/src/beta/res/xml/network_security_config.xml index 1628e32282..7233f8ec0c 100644 --- a/app/src/beta/res/xml/network_security_config.xml +++ b/app/src/beta/res/xml/network_security_config.xml @@ -29,6 +29,7 @@ bitwarden.com bitwarden.eu bitwarden.pw + bitwarden-gov.com diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml index 2d4e1a5eb2..e1b3fd96c6 100644 --- a/app/src/debug/AndroidManifest.xml +++ b/app/src/debug/AndroidManifest.xml @@ -7,20 +7,6 @@ - - - - - - - - - - - - diff --git a/app/src/debug/res/xml/network_security_config.xml b/app/src/debug/res/xml/network_security_config.xml index 8f1ce1d3c8..d3a58c851d 100644 --- a/app/src/debug/res/xml/network_security_config.xml +++ b/app/src/debug/res/xml/network_security_config.xml @@ -18,6 +18,7 @@ bitwarden.com bitwarden.eu bitwarden.pw + bitwarden-gov.com diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index efc47a1ff7..ba4f19d608 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -83,6 +83,8 @@ + + @@ -171,6 +173,7 @@ + diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/util/DuoUtils.kt b/app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/util/DuoUtils.kt index 4aa9728369..48a98fa623 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/util/DuoUtils.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/util/DuoUtils.kt @@ -5,7 +5,12 @@ import android.net.Uri import androidx.browser.auth.AuthTabIntent import com.bitwarden.annotation.OmitFromCoverage -private val BITWARDEN_HOSTS: List = listOf("bitwarden.com", "bitwarden.eu", "bitwarden.pw") +private val BITWARDEN_HOSTS: List = listOf( + "bitwarden.com", + "bitwarden.eu", + "bitwarden.pw", + "bitwarden-gov.com", +) private const val APP_LINK_SCHEME: String = "https" private const val DEEPLINK_SCHEME: String = "bitwarden" private const val CALLBACK: String = "duo-callback" diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/util/SsoUtils.kt b/app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/util/SsoUtils.kt index 13f64907bc..3c9a3ca420 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/util/SsoUtils.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/util/SsoUtils.kt @@ -11,7 +11,12 @@ import java.net.URLEncoder import java.security.MessageDigest import java.util.Base64 -private val BITWARDEN_HOSTS: List = listOf("bitwarden.com", "bitwarden.eu", "bitwarden.pw") +private val BITWARDEN_HOSTS: List = listOf( + "bitwarden.com", + "bitwarden.eu", + "bitwarden.pw", + "bitwarden-gov.com", +) private const val APP_LINK_SCHEME: String = "https" private const val DEEPLINK_SCHEME: String = "bitwarden" private const val CALLBACK: String = "sso-callback" diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/util/WebAuthUtils.kt b/app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/util/WebAuthUtils.kt index 484b555ad1..92da8e2ce3 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/util/WebAuthUtils.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/util/WebAuthUtils.kt @@ -12,7 +12,12 @@ import kotlinx.serialization.json.put import java.net.URLEncoder import java.util.Base64 -private val BITWARDEN_HOSTS: List = listOf("bitwarden.com", "bitwarden.eu", "bitwarden.pw") +private val BITWARDEN_HOSTS: List = listOf( + "bitwarden.com", + "bitwarden.eu", + "bitwarden.pw", + "bitwarden-gov.com", +) private const val APP_LINK_SCHEME: String = "https" private const val DEEPLINK_SCHEME: String = "bitwarden" private const val CALLBACK: String = "webauthn-callback" diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml index bbfd7a2e34..8115867bce 100644 --- a/app/src/main/res/xml/network_security_config.xml +++ b/app/src/main/res/xml/network_security_config.xml @@ -29,6 +29,7 @@ bitwarden.com bitwarden.eu bitwarden.pw + bitwarden-gov.com