mirror of
https://github.com/bitwarden/android.git
synced 2024-10-31 07:05:35 +03:00
[PM-12406] handle verified organization domain sso details within the SSO Login flow. Feature flag also used.
This commit is contained in:
parent
23ede756d7
commit
c75cf4fa48
1 changed files with 74 additions and 6 deletions
|
@ -9,12 +9,15 @@ import com.x8bit.bitwarden.data.auth.repository.AuthRepository
|
||||||
import com.x8bit.bitwarden.data.auth.repository.model.LoginResult
|
import com.x8bit.bitwarden.data.auth.repository.model.LoginResult
|
||||||
import com.x8bit.bitwarden.data.auth.repository.model.OrganizationDomainSsoDetailsResult
|
import com.x8bit.bitwarden.data.auth.repository.model.OrganizationDomainSsoDetailsResult
|
||||||
import com.x8bit.bitwarden.data.auth.repository.model.PrevalidateSsoResult
|
import com.x8bit.bitwarden.data.auth.repository.model.PrevalidateSsoResult
|
||||||
|
import com.x8bit.bitwarden.data.auth.repository.model.VerifiedOrganizationDomainSsoDetailsResult
|
||||||
import com.x8bit.bitwarden.data.auth.repository.util.CaptchaCallbackTokenResult
|
import com.x8bit.bitwarden.data.auth.repository.util.CaptchaCallbackTokenResult
|
||||||
import com.x8bit.bitwarden.data.auth.repository.util.SSO_URI
|
import com.x8bit.bitwarden.data.auth.repository.util.SSO_URI
|
||||||
import com.x8bit.bitwarden.data.auth.repository.util.SsoCallbackResult
|
import com.x8bit.bitwarden.data.auth.repository.util.SsoCallbackResult
|
||||||
import com.x8bit.bitwarden.data.auth.repository.util.generateUriForCaptcha
|
import com.x8bit.bitwarden.data.auth.repository.util.generateUriForCaptcha
|
||||||
import com.x8bit.bitwarden.data.auth.repository.util.generateUriForSso
|
import com.x8bit.bitwarden.data.auth.repository.util.generateUriForSso
|
||||||
|
import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager
|
||||||
import com.x8bit.bitwarden.data.platform.manager.NetworkConnectionManager
|
import com.x8bit.bitwarden.data.platform.manager.NetworkConnectionManager
|
||||||
|
import com.x8bit.bitwarden.data.platform.manager.model.FlagKey
|
||||||
import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository
|
import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository
|
||||||
import com.x8bit.bitwarden.data.platform.repository.util.baseIdentityUrl
|
import com.x8bit.bitwarden.data.platform.repository.util.baseIdentityUrl
|
||||||
import com.x8bit.bitwarden.data.tools.generator.repository.GeneratorRepository
|
import com.x8bit.bitwarden.data.tools.generator.repository.GeneratorRepository
|
||||||
|
@ -43,6 +46,7 @@ private const val RANDOM_STRING_LENGTH = 64
|
||||||
class EnterpriseSignOnViewModel @Inject constructor(
|
class EnterpriseSignOnViewModel @Inject constructor(
|
||||||
private val authRepository: AuthRepository,
|
private val authRepository: AuthRepository,
|
||||||
private val environmentRepository: EnvironmentRepository,
|
private val environmentRepository: EnvironmentRepository,
|
||||||
|
private val featureFlagManager: FeatureFlagManager,
|
||||||
private val generatorRepository: GeneratorRepository,
|
private val generatorRepository: GeneratorRepository,
|
||||||
private val networkConnectionManager: NetworkConnectionManager,
|
private val networkConnectionManager: NetworkConnectionManager,
|
||||||
private val savedStateHandle: SavedStateHandle,
|
private val savedStateHandle: SavedStateHandle,
|
||||||
|
@ -123,6 +127,10 @@ class EnterpriseSignOnViewModel @Inject constructor(
|
||||||
is EnterpriseSignOnAction.Internal.OnReceiveCaptchaToken -> {
|
is EnterpriseSignOnAction.Internal.OnReceiveCaptchaToken -> {
|
||||||
handleOnReceiveCaptchaToken(action)
|
handleOnReceiveCaptchaToken(action)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
is EnterpriseSignOnAction.Internal.OnVerifiedOrganizationDomainSsoDetailsReceive -> {
|
||||||
|
handleOnVerifiedOrganizationDomainSsoDetailsReceive(action)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -209,6 +217,48 @@ class EnterpriseSignOnViewModel @Inject constructor(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun handleOnVerifiedOrganizationDomainSsoDetailsReceive(
|
||||||
|
action: EnterpriseSignOnAction.Internal.OnVerifiedOrganizationDomainSsoDetailsReceive,
|
||||||
|
) {
|
||||||
|
when (val orgDetails = action.verifiedOrgDomainSsoDetailsResult) {
|
||||||
|
is VerifiedOrganizationDomainSsoDetailsResult.Failure -> {
|
||||||
|
mutableStateFlow.update {
|
||||||
|
it.copy(
|
||||||
|
dialogState = null,
|
||||||
|
orgIdentifierInput = authRepository.rememberedOrgIdentifier ?: "",
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
is VerifiedOrganizationDomainSsoDetailsResult.Success -> {
|
||||||
|
handleOnVerifiedOrganizationDomainSsoDetailsSuccess(orgDetails)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun handleOnVerifiedOrganizationDomainSsoDetailsSuccess(
|
||||||
|
orgDetails: VerifiedOrganizationDomainSsoDetailsResult.Success,
|
||||||
|
) {
|
||||||
|
if (orgDetails.verifiedOrganizationDomainSsoDetails.isEmpty()) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
val organizationIdentifier = orgDetails
|
||||||
|
.verifiedOrganizationDomainSsoDetails
|
||||||
|
.first()
|
||||||
|
.organizationIdentifier
|
||||||
|
|
||||||
|
mutableStateFlow.update {
|
||||||
|
it.copy(
|
||||||
|
orgIdentifierInput = organizationIdentifier,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// If the email address is associated with a claimed organization we can proceed to the
|
||||||
|
// prevalidation step.
|
||||||
|
prevalidateSso()
|
||||||
|
}
|
||||||
|
|
||||||
private fun handleOnOrganizationDomainSsoDetailsReceive(
|
private fun handleOnOrganizationDomainSsoDetailsReceive(
|
||||||
action: EnterpriseSignOnAction.Internal.OnOrganizationDomainSsoDetailsReceive,
|
action: EnterpriseSignOnAction.Internal.OnOrganizationDomainSsoDetailsReceive,
|
||||||
) {
|
) {
|
||||||
|
@ -375,12 +425,23 @@ class EnterpriseSignOnViewModel @Inject constructor(
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
viewModelScope.launch {
|
viewModelScope.launch {
|
||||||
val result = authRepository.getOrganizationDomainSsoDetails(
|
if (featureFlagManager.getFeatureFlag(key = FlagKey.VerifiedSsoDomainEndpoint)) {
|
||||||
email = EnterpriseSignOnArgs(savedStateHandle).emailAddress,
|
val result = authRepository.getVerifiedOrganizationDomainSsoDetails(
|
||||||
)
|
email = EnterpriseSignOnArgs(savedStateHandle).emailAddress,
|
||||||
sendAction(
|
)
|
||||||
EnterpriseSignOnAction.Internal.OnOrganizationDomainSsoDetailsReceive(result),
|
sendAction(
|
||||||
)
|
EnterpriseSignOnAction.Internal.OnVerifiedOrganizationDomainSsoDetailsReceive(
|
||||||
|
result,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
val result = authRepository.getOrganizationDomainSsoDetails(
|
||||||
|
email = EnterpriseSignOnArgs(savedStateHandle).emailAddress,
|
||||||
|
)
|
||||||
|
sendAction(
|
||||||
|
EnterpriseSignOnAction.Internal.OnOrganizationDomainSsoDetailsReceive(result),
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -561,6 +622,13 @@ sealed class EnterpriseSignOnAction {
|
||||||
* A captcha callback result has been received
|
* A captcha callback result has been received
|
||||||
*/
|
*/
|
||||||
data class OnReceiveCaptchaToken(val tokenResult: CaptchaCallbackTokenResult) : Internal()
|
data class OnReceiveCaptchaToken(val tokenResult: CaptchaCallbackTokenResult) : Internal()
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A result was received when requesting an [VerifiedOrganizationDomainSsoDetailsResult].
|
||||||
|
*/
|
||||||
|
data class OnVerifiedOrganizationDomainSsoDetailsReceive(
|
||||||
|
val verifiedOrgDomainSsoDetailsResult: VerifiedOrganizationDomainSsoDetailsResult,
|
||||||
|
) : Internal()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue