Prefer password authentication over oauth2 for now

We'll need signon UI issues worked out before oauth2 support is a feasible option.
sailfishos · Dec 7, 2012 · cf6bef0 · cf6bef0
1 parent 922006f
commit cf6bef0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git 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
@@ -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 },