mail: Create EOAuthConfigurationFactory (2193f462) · Commits · e / os / Mail

app-thunderbird/src/main/kotlin/net/thunderbird/android/ThunderbirdKoinModule.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@ import app.k9mail.feature.widget.shortcut.LauncherShortcutActivity
		import com.fsck.k9.AppConfig
		import com.fsck.k9.activity.MessageCompose
		import com.fsck.k9.preferences.FilePrefixProvider
		import net.thunderbird.android.auth.TbOAuthConfigurationFactory
		import net.thunderbird.android.auth.EOAuthConfigurationFactory
		import net.thunderbird.android.dev.developmentModuleAdditions
		import net.thunderbird.android.feature.featureModule
		import net.thunderbird.android.featureflag.TbFeatureFlagFactory
		@@ -32,7 +32,7 @@ val appModule = module {
		single(named("ClientInfoAppName")) { BuildConfig.CLIENT_INFO_APP_NAME }
		single(named("ClientInfoAppVersion")) { BuildConfig.VERSION_NAME }
		single<AppConfig> { appConfig }
		single<OAuthConfigurationFactory> { TbOAuthConfigurationFactory() }
		single<OAuthConfigurationFactory> { EOAuthConfigurationFactory() }
		single {
		TbAppNameProvider(androidContext())
		} binds arrayOf(AppNameProvider::class, BrandNameProvider::class, FilePrefixProvider::class)

app-thunderbird/src/main/kotlin/net/thunderbird/android/auth/EOAuthConfigurationFactory.kt

0 → 100644

+107 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 MURENA SAS
		*
		* This program is free software: you can redistribute it and/or modify
		* it under the terms of the GNU General Public License as published by
		* the Free Software Foundation, either version 3 of the License, or
		* (at your option) any later version.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program. If not, see <https://www.gnu.org/licenses/>.
		*
		*/
		package net.thunderbird.android.auth

		import app.k9mail.core.common.oauth.OAuthConfiguration
		import app.k9mail.core.common.oauth.OAuthConfigurationFactory
		import net.thunderbird.android.BuildConfig

		@Suppress("ktlint:standard:max-line-length")
		class EOAuthConfigurationFactory : OAuthConfigurationFactory {
		override fun createConfigurations(): Map<List<String>, OAuthConfiguration> {
		return mapOf(
		createAolConfiguration(),
		createGmailConfiguration(),
		createFastmailConfiguration(),
		createMicrosoftConfiguration(),
		createYahooConfiguration(),
		)
		}

		private fun createAolConfiguration(): Pair<List<String>, OAuthConfiguration> {
		return listOf(
		"imap.aol.com",
		"smtp.aol.com",
		) to OAuthConfiguration(
		clientId = "dj0yJmk9QTVYM0I0RGQ0VDFBJmQ9WVdrOVNYcFphVWRVYVhnbWNHbzlNQT09JnM9Y29uc3VtZXJzZWNyZXQmc3Y9MCZ4PTA1",
		scopes = listOf("mail-w"),
		authorizationEndpoint = "https://api.login.aol.com/oauth2/request_auth",
		tokenEndpoint = "https://api.login.aol.com/oauth2/get_token",
		redirectUri = "${BuildConfig.APPLICATION_ID}://oauth2redirect",
		)
		}

		private fun createFastmailConfiguration(): Pair<List<String>, OAuthConfiguration> {
		return listOf(
		"imap.fastmail.com",
		"smtp.fastmail.com",
		) to OAuthConfiguration(
		clientId = "353e41ae",
		scopes = listOf("https://www.fastmail.com/dev/protocol-imap", "https://www.fastmail.com/dev/protocol-smtp"),
		authorizationEndpoint = "https://api.fastmail.com/oauth/authorize",
		tokenEndpoint = "https://api.fastmail.com/oauth/refresh",
		redirectUri = "${BuildConfig.APPLICATION_ID}://oauth2redirect",
		)
		}

		// TODO: Update clientId and redirectUri once new client ID is available
		private fun createGmailConfiguration(): Pair<List<String>, OAuthConfiguration> {
		return listOf(
		"imap.gmail.com",
		"imap.googlemail.com",
		"smtp.gmail.com",
		"smtp.googlemail.com",
		) to OAuthConfiguration(
		clientId = "406964657835-pq5dckrt5j6ijkicfp2jf4vdhesncql6.apps.googleusercontent.com",
		scopes = listOf("https://mail.google.com/"),
		authorizationEndpoint = "https://accounts.google.com/o/oauth2/v2/auth",
		tokenEndpoint = "https://oauth2.googleapis.com/token",
		redirectUri = "${BuildConfig.APPLICATION_ID}.desktop:/oauth2redirect",
		)
		}

		private fun createMicrosoftConfiguration(): Pair<List<String>, OAuthConfiguration> {
		return listOf(
		"outlook.office365.com",
		"smtp.office365.com",
		) to OAuthConfiguration(
		clientId = "e6f8716e-299d-4ed9-bbf3-453f192f44e5",
		scopes = listOf(
		"https://outlook.office.com/IMAP.AccessAsUser.All",
		"https://outlook.office.com/SMTP.Send",
		"offline_access",
		),
		authorizationEndpoint = "https://login.microsoftonline.com/common/oauth2/v2.0/authorize",
		tokenEndpoint = "https://login.microsoftonline.com/common/oauth2/v2.0/token",
		redirectUri = "msauth://net.thunderbird.android/S9nqeF27sTJcEfaInpC%2BDHzHuCY%3D",
		)
		}

		private fun createYahooConfiguration(): Pair<List<String>, OAuthConfiguration> {
		return listOf(
		"imap.mail.yahoo.com",
		"smtp.mail.yahoo.com",
		) to OAuthConfiguration(
		clientId = "dj0yJmk9SW1VbkV0R0FJYU1mJmQ9WVdrOU1Hc3dlSEp3YzNFbWNHbzlNQT09JnM9Y29uc3VtZXJzZWNyZXQmc3Y9MCZ4PWNk",
		scopes = listOf("mail-w"),
		authorizationEndpoint = "https://api.login.yahoo.com/oauth2/request_auth",
		tokenEndpoint = "https://api.login.yahoo.com/oauth2/get_token",
		redirectUri = "${BuildConfig.APPLICATION_ID}://oauth2redirect",
		)
		}
		}