mirror of https://github.com/tasks/tasks
Add support for microsoft organization accounts
Alex Baker
8 months ago
parent
68d7a02db8
commit
c3e10bde94
@ -0,0 +1,20 @@
|
|||||||
|
{
|
||||||
|
"client_id" : "9d4babd5-e7ba-4286-ba4b-17274495a901",
|
||||||
|
"authorization_user_agent" : "DEFAULT",
|
||||||
|
"redirect_uri" : "msauth://org.tasks/8wnYBRqh5nnQgFzbIXfxXSs41xE%3D",
|
||||||
|
"account_mode" : "MULTIPLE",
|
||||||
|
"authorities" : [
|
||||||
|
{
|
||||||
|
"type": "AAD",
|
||||||
|
"audience": {
|
||||||
|
"type": "AzureADandPersonalMicrosoftAccount",
|
||||||
|
"tenant_id": "common"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"logging": {
|
||||||
|
"level": "verbose",
|
||||||
|
"logcat_enabled": true,
|
||||||
|
"pii_enabled": true
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,20 @@
|
|||||||
|
{
|
||||||
|
"client_id" : "9d4babd5-e7ba-4286-ba4b-17274495a901",
|
||||||
|
"authorization_user_agent" : "DEFAULT",
|
||||||
|
"redirect_uri" : "msauth://org.tasks/sEe08kX5nGJi4miFX3VkNXICC%2FY%3D",
|
||||||
|
"account_mode" : "MULTIPLE",
|
||||||
|
"authorities" : [
|
||||||
|
{
|
||||||
|
"type": "AAD",
|
||||||
|
"audience": {
|
||||||
|
"type": "AzureADandPersonalMicrosoftAccount",
|
||||||
|
"tenant_id": "common"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"logging": {
|
||||||
|
"level": "info",
|
||||||
|
"logcat_enabled": true,
|
||||||
|
"pii_enabled": false
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,4 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
<string name="google_oauth_scheme">com.googleusercontent.apps.363426363175-jdrijf7hql9030klgjcjlpi6k5spviif</string>
|
<string name="google_oauth_scheme">com.googleusercontent.apps.363426363175-jdrijf7hql9030klgjcjlpi6k5spviif</string>
|
||||||
|
<string name="microsoft_oauth_path">/sEe08kX5nGJi4miFX3VkNXICC/Y=</string>
|
||||||
</resources>
|
</resources>
|
||||||
@ -1,22 +0,0 @@
|
|||||||
package org.tasks.auth
|
|
||||||
|
|
||||||
import android.net.Uri
|
|
||||||
import androidx.core.net.toUri
|
|
||||||
|
|
||||||
data class IdentityProvider(
|
|
||||||
val name: String,
|
|
||||||
val discoveryEndpoint: Uri,
|
|
||||||
val clientId: String,
|
|
||||||
val redirectUri: Uri,
|
|
||||||
val scope: String
|
|
||||||
) {
|
|
||||||
companion object {
|
|
||||||
val MICROSOFT = IdentityProvider(
|
|
||||||
"Microsoft",
|
|
||||||
"https://login.microsoftonline.com/consumers/v2.0/.well-known/openid-configuration".toUri(),
|
|
||||||
"9d4babd5-e7ba-4286-ba4b-17274495a901",
|
|
||||||
"msauth://org.tasks/8wnYBRqh5nnQgFzbIXfxXSs41xE%3D".toUri(),
|
|
||||||
"user.read Tasks.ReadWrite openid offline_access email"
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,152 +0,0 @@
|
|||||||
package org.tasks.auth
|
|
||||||
|
|
||||||
import android.os.Bundle
|
|
||||||
import android.widget.Toast
|
|
||||||
import android.widget.Toast.LENGTH_LONG
|
|
||||||
import androidx.activity.ComponentActivity
|
|
||||||
import androidx.activity.compose.setContent
|
|
||||||
import androidx.compose.foundation.background
|
|
||||||
import androidx.compose.foundation.layout.Box
|
|
||||||
import androidx.compose.foundation.layout.size
|
|
||||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
|
||||||
import androidx.compose.material3.CircularProgressIndicator
|
|
||||||
import androidx.compose.runtime.getValue
|
|
||||||
import androidx.compose.runtime.mutableStateOf
|
|
||||||
import androidx.compose.runtime.remember
|
|
||||||
import androidx.compose.runtime.setValue
|
|
||||||
import androidx.compose.ui.Alignment
|
|
||||||
import androidx.compose.ui.Modifier
|
|
||||||
import androidx.compose.ui.graphics.Color.Companion.White
|
|
||||||
import androidx.compose.ui.unit.dp
|
|
||||||
import androidx.compose.ui.window.Dialog
|
|
||||||
import androidx.compose.ui.window.DialogProperties
|
|
||||||
import androidx.lifecycle.lifecycleScope
|
|
||||||
import dagger.hilt.android.AndroidEntryPoint
|
|
||||||
import kotlinx.coroutines.Dispatchers
|
|
||||||
import kotlinx.coroutines.launch
|
|
||||||
import kotlinx.coroutines.withContext
|
|
||||||
import net.openid.appauth.AuthState
|
|
||||||
import net.openid.appauth.AuthorizationException
|
|
||||||
import net.openid.appauth.AuthorizationResponse
|
|
||||||
import net.openid.appauth.AuthorizationServiceDiscovery
|
|
||||||
import okhttp3.Request
|
|
||||||
import org.json.JSONObject
|
|
||||||
import org.tasks.R
|
|
||||||
import org.tasks.analytics.Constants
|
|
||||||
import org.tasks.analytics.Firebase
|
|
||||||
import org.tasks.data.UUIDHelper
|
|
||||||
import org.tasks.data.dao.CaldavDao
|
|
||||||
import org.tasks.data.entity.CaldavAccount
|
|
||||||
import org.tasks.data.entity.CaldavAccount.Companion.TYPE_MICROSOFT
|
|
||||||
import org.tasks.http.HttpClientFactory
|
|
||||||
import org.tasks.preferences.fragments.TasksAccountViewModel.Companion.getStringOrNull
|
|
||||||
import org.tasks.security.KeyStoreEncryption
|
|
||||||
import org.tasks.sync.microsoft.requestTokenExchange
|
|
||||||
import javax.inject.Inject
|
|
||||||
|
|
||||||
@AndroidEntryPoint
|
|
||||||
class MicrosoftAuthenticationActivity : ComponentActivity() {
|
|
||||||
|
|
||||||
@Inject lateinit var caldavDao: CaldavDao
|
|
||||||
@Inject lateinit var encryption: KeyStoreEncryption
|
|
||||||
@Inject lateinit var httpClientFactory: HttpClientFactory
|
|
||||||
@Inject lateinit var firebase: Firebase
|
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
|
||||||
super.onCreate(savedInstanceState)
|
|
||||||
val authState = AuthState(
|
|
||||||
AuthorizationResponse.fromIntent(intent),
|
|
||||||
AuthorizationException.fromIntent(intent)
|
|
||||||
)
|
|
||||||
authState.authorizationException?.let {
|
|
||||||
error(it.message ?: "Authentication failed")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
lifecycleScope.launch {
|
|
||||||
val (resp, ex) = requestTokenExchange(authState.lastAuthorizationResponse!!)
|
|
||||||
authState.update(resp, ex)
|
|
||||||
if (authState.isAuthorized) {
|
|
||||||
val email = getEmail(authState.accessToken) ?: run {
|
|
||||||
error("Failed to fetch profile")
|
|
||||||
return@launch
|
|
||||||
}
|
|
||||||
caldavDao
|
|
||||||
.getAccount(TYPE_MICROSOFT, email)
|
|
||||||
?.let {
|
|
||||||
caldavDao.update(
|
|
||||||
it.copy(password = encryption.encrypt(authState.jsonSerializeString()))
|
|
||||||
)
|
|
||||||
}
|
|
||||||
?: caldavDao
|
|
||||||
.insert(
|
|
||||||
CaldavAccount(
|
|
||||||
uuid = UUIDHelper.newUUID(),
|
|
||||||
name = email,
|
|
||||||
username = email,
|
|
||||||
password = encryption.encrypt(authState.jsonSerializeString()),
|
|
||||||
accountType = TYPE_MICROSOFT,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
.also {
|
|
||||||
firebase.logEvent(
|
|
||||||
R.string.event_sync_add_account,
|
|
||||||
R.string.param_type to Constants.SYNC_TYPE_MICROSOFT
|
|
||||||
)
|
|
||||||
}
|
|
||||||
finish()
|
|
||||||
} else {
|
|
||||||
error(ex?.message ?: "Token exchange failed")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
setContent {
|
|
||||||
var showDialog by remember { mutableStateOf(true) }
|
|
||||||
if (showDialog) {
|
|
||||||
Dialog(
|
|
||||||
onDismissRequest = { showDialog = false },
|
|
||||||
DialogProperties(dismissOnBackPress = false, dismissOnClickOutside = false)
|
|
||||||
) {
|
|
||||||
Box(
|
|
||||||
contentAlignment = Alignment.Center,
|
|
||||||
modifier = Modifier
|
|
||||||
.size(100.dp)
|
|
||||||
.background(White, shape = RoundedCornerShape(8.dp))
|
|
||||||
) {
|
|
||||||
CircularProgressIndicator()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private suspend fun getEmail(accessToken: String?): String? = withContext(Dispatchers.IO) {
|
|
||||||
if (accessToken == null) {
|
|
||||||
return@withContext null
|
|
||||||
}
|
|
||||||
val discovery = AuthorizationServiceDiscovery(
|
|
||||||
JSONObject(
|
|
||||||
intent.getStringExtra(EXTRA_SERVICE_DISCOVERY)!!
|
|
||||||
)
|
|
||||||
)
|
|
||||||
val userInfo = httpClientFactory
|
|
||||||
.newClient(foreground = false)
|
|
||||||
.newCall(
|
|
||||||
Request.Builder()
|
|
||||||
.url(discovery.userinfoEndpoint!!.toString())
|
|
||||||
.addHeader("Authorization", "Bearer $accessToken")
|
|
||||||
.build()
|
|
||||||
)
|
|
||||||
.execute()
|
|
||||||
val response = userInfo.body?.string() ?: return@withContext null
|
|
||||||
JSONObject(response).getStringOrNull("email")
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun error(message: String) {
|
|
||||||
Toast.makeText(this@MicrosoftAuthenticationActivity, message, LENGTH_LONG).show()
|
|
||||||
finish()
|
|
||||||
}
|
|
||||||
|
|
||||||
companion object {
|
|
||||||
const val EXTRA_SERVICE_DISCOVERY = "extra_service_discovery"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
package org.tasks.sync.microsoft
|
|
||||||
|
|
||||||
import android.content.Context
|
|
||||||
import net.openid.appauth.*
|
|
||||||
import org.tasks.auth.IdentityProvider
|
|
||||||
import kotlin.coroutines.suspendCoroutine
|
|
||||||
|
|
||||||
suspend fun IdentityProvider.retrieveConfig(): AuthorizationServiceConfiguration {
|
|
||||||
return suspendCoroutine { cont ->
|
|
||||||
AuthorizationServiceConfiguration.fetchFromUrl(discoveryEndpoint) { serviceConfiguration, ex ->
|
|
||||||
cont.resumeWith(
|
|
||||||
when {
|
|
||||||
ex != null -> Result.failure(ex)
|
|
||||||
serviceConfiguration != null -> Result.success(serviceConfiguration)
|
|
||||||
else -> Result.failure(IllegalStateException())
|
|
||||||
}
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun Context.requestTokenRefresh(state: AuthState) =
|
|
||||||
requestToken(state.createTokenRefreshRequest())
|
|
||||||
|
|
||||||
suspend fun Context.requestTokenExchange(response: AuthorizationResponse) =
|
|
||||||
requestToken(response.createTokenExchangeRequest())
|
|
||||||
|
|
||||||
private suspend fun Context.requestToken(tokenRequest: TokenRequest): Pair<TokenResponse?, AuthorizationException?> {
|
|
||||||
val authService = AuthorizationService(this)
|
|
||||||
return try {
|
|
||||||
suspendCoroutine { cont ->
|
|
||||||
authService.performTokenRequest(tokenRequest) { response, ex ->
|
|
||||||
cont.resumeWith(Result.success(Pair(response, ex)))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
authService.dispose()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,74 +1,94 @@
|
|||||||
package org.tasks.sync.microsoft
|
package org.tasks.sync.microsoft
|
||||||
|
|
||||||
import android.app.Activity
|
import android.app.Activity
|
||||||
import android.app.PendingIntent
|
|
||||||
import android.content.Intent
|
|
||||||
import androidx.lifecycle.ViewModel
|
import androidx.lifecycle.ViewModel
|
||||||
import androidx.lifecycle.viewModelScope
|
import androidx.lifecycle.viewModelScope
|
||||||
|
import com.microsoft.identity.client.AcquireTokenParameters
|
||||||
|
import com.microsoft.identity.client.AuthenticationCallback
|
||||||
|
import com.microsoft.identity.client.IAuthenticationResult
|
||||||
|
import com.microsoft.identity.client.Prompt
|
||||||
|
import com.microsoft.identity.client.PublicClientApplication
|
||||||
|
import com.microsoft.identity.client.exception.MsalException
|
||||||
import dagger.hilt.android.lifecycle.HiltViewModel
|
import dagger.hilt.android.lifecycle.HiltViewModel
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import net.openid.appauth.AppAuthConfiguration
|
import org.tasks.R
|
||||||
import net.openid.appauth.AuthorizationRequest
|
import org.tasks.analytics.Constants
|
||||||
import net.openid.appauth.AuthorizationService
|
import org.tasks.analytics.Firebase
|
||||||
import net.openid.appauth.ResponseTypeValues
|
import org.tasks.data.UUIDHelper
|
||||||
import net.openid.appauth.browser.AnyBrowserMatcher
|
import org.tasks.data.dao.CaldavDao
|
||||||
import net.openid.appauth.connectivity.DefaultConnectionBuilder
|
import org.tasks.data.entity.CaldavAccount
|
||||||
import org.tasks.BuildConfig
|
import org.tasks.data.entity.CaldavAccount.Companion.TYPE_MICROSOFT
|
||||||
import org.tasks.auth.DebugConnectionBuilder
|
import org.tasks.extensions.Context.toast
|
||||||
import org.tasks.auth.IdentityProvider
|
import timber.log.Timber
|
||||||
import org.tasks.auth.MicrosoftAuthenticationActivity
|
|
||||||
import org.tasks.auth.MicrosoftAuthenticationActivity.Companion.EXTRA_SERVICE_DISCOVERY
|
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
@HiltViewModel
|
@HiltViewModel
|
||||||
class MicrosoftSignInViewModel @Inject constructor(
|
class MicrosoftSignInViewModel @Inject constructor(
|
||||||
private val debugConnectionBuilder: DebugConnectionBuilder,
|
private val caldavDao: CaldavDao,
|
||||||
|
private val firebase: Firebase,
|
||||||
) : ViewModel() {
|
) : ViewModel() {
|
||||||
fun signIn(activity: Activity) {
|
fun signIn(activity: Activity) {
|
||||||
viewModelScope.launch {
|
viewModelScope.launch(Dispatchers.IO) {
|
||||||
val idp = IdentityProvider.MICROSOFT
|
val app = PublicClientApplication.createMultipleAccountPublicClientApplication(
|
||||||
val serviceConfig = idp.retrieveConfig()
|
activity,
|
||||||
val authRequest = AuthorizationRequest
|
R.raw.microsoft_config
|
||||||
.Builder(
|
|
||||||
serviceConfig,
|
|
||||||
idp.clientId,
|
|
||||||
ResponseTypeValues.CODE,
|
|
||||||
idp.redirectUri
|
|
||||||
)
|
|
||||||
.setScope(idp.scope)
|
|
||||||
.setPrompt(AuthorizationRequest.Prompt.SELECT_ACCOUNT)
|
|
||||||
.build()
|
|
||||||
val intent = Intent(activity, MicrosoftAuthenticationActivity::class.java)
|
|
||||||
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
|
|
||||||
intent.putExtra(
|
|
||||||
EXTRA_SERVICE_DISCOVERY,
|
|
||||||
serviceConfig.discoveryDoc!!.docJson.toString()
|
|
||||||
)
|
)
|
||||||
|
|
||||||
val authorizationService = AuthorizationService(
|
val parameters = AcquireTokenParameters.Builder()
|
||||||
activity,
|
.startAuthorizationFromActivity(activity)
|
||||||
AppAuthConfiguration.Builder()
|
.withScopes(scopes)
|
||||||
.setBrowserMatcher(AnyBrowserMatcher.INSTANCE)
|
.withPrompt(Prompt.SELECT_ACCOUNT)
|
||||||
.setConnectionBuilder(
|
.withCallback(object : AuthenticationCallback {
|
||||||
if (BuildConfig.DEBUG) {
|
override fun onSuccess(authenticationResult: IAuthenticationResult) {
|
||||||
debugConnectionBuilder
|
val email = authenticationResult.account.claims?.get("preferred_username") as? String
|
||||||
} else {
|
if (email == null) {
|
||||||
DefaultConnectionBuilder.INSTANCE
|
Timber.e("No email found")
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
Timber.d("Successfully signed in")
|
||||||
|
viewModelScope.launch {
|
||||||
|
caldavDao
|
||||||
|
.getAccount(TYPE_MICROSOFT, email)
|
||||||
|
?.let {
|
||||||
|
caldavDao.update(
|
||||||
|
it.copy(error = null)
|
||||||
)
|
)
|
||||||
.build()
|
}
|
||||||
|
?: caldavDao
|
||||||
|
.insert(
|
||||||
|
CaldavAccount(
|
||||||
|
uuid = UUIDHelper.newUUID(),
|
||||||
|
name = email,
|
||||||
|
username = email,
|
||||||
|
accountType = TYPE_MICROSOFT,
|
||||||
)
|
)
|
||||||
authorizationService.performAuthorizationRequest(
|
)
|
||||||
authRequest,
|
.also {
|
||||||
PendingIntent.getActivity(
|
firebase.logEvent(
|
||||||
activity,
|
R.string.event_sync_add_account,
|
||||||
authRequest.hashCode(),
|
R.string.param_type to Constants.SYNC_TYPE_MICROSOFT
|
||||||
intent,
|
|
||||||
PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_CANCEL_CURRENT
|
|
||||||
),
|
|
||||||
authorizationService.createCustomTabsIntentBuilder()
|
|
||||||
.build()
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun onError(exception: MsalException?) {
|
||||||
|
Timber.e(exception)
|
||||||
|
activity.toast(exception?.message ?: exception?.javaClass?.simpleName ?: "Sign in failed")
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onCancel() {
|
||||||
|
Timber.d("onCancel")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.build()
|
||||||
|
|
||||||
|
app.acquireToken(parameters)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
val scopes = listOf("https://graph.microsoft.com/.default")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue