Update FxaServer.kt
parent
670e03c3b2
commit
8cbdce58e6
|
@ -14,15 +14,14 @@ import org.mozilla.fenix.ext.settings
|
||||||
|
|
||||||
object FxaServer {
|
object FxaServer {
|
||||||
private const val CLIENT_ID = "a2270f727f45f648"
|
private const val CLIENT_ID = "a2270f727f45f648"
|
||||||
|
|
||||||
const val REDIRECT_URL = "urn:ietf:wg:oauth:2.0:oob:oauth-redirect-webchannel"
|
const val REDIRECT_URL = "urn:ietf:wg:oauth:2.0:oob:oauth-redirect-webchannel"
|
||||||
|
|
||||||
fun config(context: Context): ServerConfig {
|
fun config(context: Context): ServerConfig {
|
||||||
val serverOverride = context.settings().overrideFxAServer
|
val serverOverride = context.settings().overrideFxAServer
|
||||||
val tokenServerOverride = context.settings().overrideSyncTokenServer.ifEmpty { null }
|
val tokenServerOverride = context.settings().overrideSyncTokenServer.ifEmpty { null }
|
||||||
if (serverOverride.isEmpty()) {
|
if (serverOverride.isEmpty()) {
|
||||||
return ServerConfig(Server.RELEASE, CLIENT_ID, redirectUrl(), tokenServerOverride)
|
return ServerConfig(Server.RELEASE, CLIENT_ID, REDIRECT_URL, tokenServerOverride)
|
||||||
}
|
}
|
||||||
return ServerConfig(serverOverride, CLIENT_ID, redirectUrl(), tokenServerOverride)
|
return ServerConfig(serverOverride, CLIENT_ID, REDIRECT_URL, tokenServerOverride)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,7 +26,7 @@ class Services(
|
||||||
private val accountManager: FxaAccountManager
|
private val accountManager: FxaAccountManager
|
||||||
) {
|
) {
|
||||||
val accountsAuthFeature by lazy {
|
val accountsAuthFeature by lazy {
|
||||||
FirefoxAccountsAuthFeature(accountManager, FxaServer.redirectUrl()) { context, authUrl ->
|
FirefoxAccountsAuthFeature(accountManager, FxaServer.REDIRECT_URL) { context, authUrl ->
|
||||||
CoroutineScope(Dispatchers.Main).launch {
|
CoroutineScope(Dispatchers.Main).launch {
|
||||||
val intent = SupportUtils.createAuthCustomTabIntent(context, authUrl)
|
val intent = SupportUtils.createAuthCustomTabIntent(context, authUrl)
|
||||||
context.startActivity(intent)
|
context.startActivity(intent)
|
||||||
|
|
Loading…
Reference in New Issue