refactor(auth): remove non-null assertions in OIDC auth request (564c593b) · Commits · e / os / AccountManager

app/src/main/kotlin/at/bitfire/davdroid/ui/setup/OpenIdAuthenticationViewModel.kt

+6 −5

Original line number	Diff line number	Diff line
		@@ -95,22 +95,23 @@ class OpenIdAuthenticationViewModel @Inject constructor(
		intent: Intent
		) {
		authState = AuthState(serviceConfiguration)
		val provider = requireNotNull(identityProvider) { "identityProvider must be set before requestAuthCode()" }

		val loginHint = intent.getStringExtra(LoginActivity.USERNAME_HINT)
		val scope = if (
		identityProvider == IdentityProvider.MURENA &&
		provider == IdentityProvider.MURENA &&
		intent.getBooleanExtra(LoginActivity.MURENA_OFFLINE_ACCESS_REQUESTED, false)
		) {
		"${identityProvider!!.scope} offline_access"
		"${provider.scope} offline_access"
		} else {
		identityProvider!!.scope
		provider.scope
		}

		val authRequest = AuthorizationRequest.Builder(
		serviceConfiguration,
		identityProvider!!.clientId,
		provider.clientId,
		ResponseTypeValues.CODE,
		identityProvider!!.redirectUri
		provider.redirectUri
		)
		.setScope(scope)
		.setLoginHint(sanitizeHint(loginHint))