From cf6bef0eaafd51e9687b41462099151eb099ea70 Mon Sep 17 00:00:00 2001 From: John Brooks Date: Fri, 7 Dec 2012 11:16:46 -0700 Subject: [PATCH] Prefer password authentication over oauth2 for now We'll need signon UI issues worked out before oauth2 support is a feasible option. --- NOTES | 4 ++++ src/empathy-sasl-mechanisms.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/NOTES b/NOTES index 46a6391..d85b812 100644 --- a/NOTES +++ b/NOTES @@ -4,3 +4,7 @@ wish to be able to store credentials provided to telepathy and unrelated to any libaccounts account in libsignon, which isn't relevant for the use case here. +TLS channels are disabled and certificate validation is left to CMs. + +OAUTH2 mechanisms are disabled right now to force the use of password +authentication; that's expected to change. diff --git a/src/empathy-sasl-mechanisms.c b/src/empathy-sasl-mechanisms.c index c47a702..61111dc 100644 --- a/src/empathy-sasl-mechanisms.c +++ b/src/empathy-sasl-mechanisms.c @@ -37,6 +37,10 @@ typedef struct } SupportedMech; static SupportedMech supported_mechanisms[] = { + /* XXX: Prefer password authentication over OAUTH for now, + * pending infrastructure support for oauth accounts. */ + { EMPATHY_SASL_MECHANISM_PASSWORD, MECH_PASSWORD }, + { EMPATHY_SASL_MECHANISM_FACEBOOK, MECH_FACEBOOK }, { EMPATHY_SASL_MECHANISM_WLM, MECH_WLM }, { EMPATHY_SASL_MECHANISM_GOOGLE, MECH_GOOGLE },