melib/imap: Base64 when building XOAUTH command

Moving the encoding later will allow us to have more uniform handling
over authentication methods in the future.

contrib/oauth2.py

@@ -55,8 +55,8 @@ option.
   oauth2 --generate_oauth2_string --user=xxx@gmail.com \
     --access_token=ya29.AGy[...]ezLg
 
-The output of this mode will be a base64-encoded string. To use it, connect to a
-IMAPFE and pass it as the second argument to the AUTHENTICATE command.
+To use the output of this mode, connect to a IMAPFE and pass the base64
+encoding of this string as the second argument to the AUTHENTICATE command.
 
   a AUTHENTICATE XOAUTH2 a9sha9sfs[...]9dfja929dk==
 """
@@ -240,7 +240,7 @@ def RefreshToken(client_id, client_secret, refresh_token):
   return json.loads(response)
 
 
-def GenerateOAuth2String(username, access_token, base64_encode=True):
+def GenerateOAuth2String(username, access_token):
   """Generates an IMAP OAuth2 authentication string.
 
   See https://developers.google.com/google-apps/gmail/oauth2_overview
@@ -248,14 +248,11 @@ def GenerateOAuth2String(username, access_token, base64_encode=True):
   Args:
     username: the username (email address) of the account to authenticate
     access_token: An OAuth2 access token.
-    base64_encode: Whether to base64-encode the output.
 
   Returns:
     The SASL argument for the OAuth2 mechanism.
   """
   auth_string = 'user=%s\1auth=Bearer %s\1\1' % (username, access_token)
-  if base64_encode:
-    auth_string = base64.b64encode(bytes(auth_string, 'utf-8'))
   return auth_string
 
 
@@ -331,13 +328,11 @@ def main(argv):
   elif options.test_imap_authentication:
     RequireOptions(options, 'user', 'access_token')
     TestImapAuthentication(options.user,
-        GenerateOAuth2String(options.user, options.access_token,
-                             base64_encode=False))
+        GenerateOAuth2String(options.user, options.access_token))
   elif options.test_smtp_authentication:
     RequireOptions(options, 'user', 'access_token')
     TestSmtpAuthentication(options.user,
-        GenerateOAuth2String(options.user, options.access_token,
-                             base64_encode=False))
+        GenerateOAuth2String(options.user, options.access_token))
   else:
     options_parser.print_help()
     print('Nothing to do, exiting.')

melib/src/backends/imap/connection.rs

@@ -36,6 +36,8 @@ use std::pin::Pin;
 use std::sync::Arc;
 use std::time::{Duration, Instant, SystemTime};
 
+use data_encoding::BASE64;
+
 const IMAP_PROTOCOL_TIMEOUT: Duration = Duration::from_secs(60 * 28);
 
 use super::protocol_parser;
@@ -268,7 +270,6 @@ impl ImapStream {
             timeout: server_conf.timeout,
         };
         if let ImapProtocol::ManageSieve = server_conf.protocol {
-            use data_encoding::BASE64;
             ret.read_response(&mut res).await?;
             ret.send_command(
                 format!(
@@ -357,7 +358,11 @@ impl ImapStream {
                     )));
                 }
                 ret.send_command(
-                    format!("AUTHENTICATE XOAUTH2 {}", &server_conf.server_password).as_bytes(),
+                    format!(
+                        "AUTHENTICATE XOAUTH2 {}",
+                        BASE64.encode(server_conf.server_password.as_bytes())
+                    )
+                    .as_bytes(),
                 )
                 .await?;
             }