Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-02 04:46:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Refine signature of dc_get_oauth2_access_token()

Browse Source 
Previously, `dc_get_oauth2_access_token` accepted "flags" argument,
that actually had only one possible field: 0x1 == DC_REGENERATE.

This change replaces "flags" argument with single boolean argument
"regenerate".
This commit is contained in:
Dmitry Bogatov
2019-09-18 14:19:57 +00:00
committed by holger krekel
parent 8667de994e
commit 95d8665dbe
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/imap.rs
View File

@@ -20,7 +20,6 @@ use crate::oauth2::dc_get_oauth2_access_token;
use crate::param::Params; use crate::param::Params;
const DC_IMAP_SEEN: usize = 0x0001; const DC_IMAP_SEEN: usize = 0x0001;
const DC_REGENERATE: usize = 0x01;
const DC_SUCCESS: usize = 3; const DC_SUCCESS: usize = 3;
const DC_ALREADY_DONE: usize = 2; const DC_ALREADY_DONE: usize = 2;
@@ -418,9 +417,7 @@ impl Imap {
if (server_flags & DC_LP_AUTH_OAUTH2) != 0 { if (server_flags & DC_LP_AUTH_OAUTH2) != 0 {
let addr: &str = config.addr.as_ref(); let addr: &str = config.addr.as_ref();
if let Some(token) = if let Some(token) = dc_get_oauth2_access_token(context, addr, imap_pw, true) {
dc_get_oauth2_access_token(context, addr, imap_pw, DC_REGENERATE as usize)
{
let auth = OAuth2 { let auth = OAuth2 {
user: imap_user.into(), user: imap_user.into(),
access_token: token, access_token: token,

9
src/oauth2.rs
View File

@@ -74,14 +74,14 @@ pub fn dc_get_oauth2_access_token(
context: &Context, context: &Context,
addr: impl AsRef<str>, addr: impl AsRef<str>,
code: impl AsRef<str>, code: impl AsRef<str>,
flags: usize, regenerate: bool,
) -> Option<String> { ) -> Option<String> {
if let Some(oauth2) = Oauth2::from_address(addr) { if let Some(oauth2) = Oauth2::from_address(addr) {
let lock = context.oauth2_critical.clone(); let lock = context.oauth2_critical.clone();
let _l = lock.lock().unwrap(); let _l = lock.lock().unwrap();
// read generated token // read generated token
if 0 == flags & 0x1 && !is_expired(context) { if !regenerate && !is_expired(context) {
let access_token = context.sql.get_config(context, "oauth2_access_token"); let access_token = context.sql.get_config(context, "oauth2_access_token");
if access_token.is_some() { if access_token.is_some() {
// success // success
@@ -216,12 +216,13 @@ pub fn dc_get_oauth2_addr(
return None; return None;
} }
if let Some(access_token) = dc_get_oauth2_access_token(context, addr.as_ref(), code.as_ref(), 0) if let Some(access_token) =
dc_get_oauth2_access_token(context, addr.as_ref(), code.as_ref(), false)
{ {
let addr_out = oauth2.get_addr(context, access_token); let addr_out = oauth2.get_addr(context, access_token);
if addr_out.is_none() { if addr_out.is_none() {
// regenerate // regenerate
if let Some(access_token) = dc_get_oauth2_access_token(context, addr, code, 0x1) { if let Some(access_token) = dc_get_oauth2_access_token(context, addr, code, true) {
oauth2.get_addr(context, access_token) oauth2.get_addr(context, access_token)
} else { } else {
None None

2
src/smtp.rs
View File

@@ -82,7 +82,7 @@ impl Smtp {
// oauth2 // oauth2
let addr = &lp.addr; let addr = &lp.addr;
let send_pw = &lp.send_pw; let send_pw = &lp.send_pw;
let access_token = dc_get_oauth2_access_token(context, addr, send_pw, 0); let access_token = dc_get_oauth2_access_token(context, addr, send_pw, false);
if access_token.is_none() { if access_token.is_none() {
return false; return false;
} }

2
tests/stress.rs
View File

@@ -573,7 +573,7 @@ fn test_dc_get_oauth2_token() {
let ctx = create_test_context(); let ctx = create_test_context();
let addr = "dignifiedquire@gmail.com"; let addr = "dignifiedquire@gmail.com";
let code = "fail"; let code = "fail";
let res = dc_get_oauth2_access_token(&ctx.ctx, addr, code, 0); let res = dc_get_oauth2_access_token(&ctx.ctx, addr, code, false);
// this should fail as it is an invalid password // this should fail as it is an invalid password
assert_eq!(res, None); assert_eq!(res, None);
} }