Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-22 16:06:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor: move more methods onto the sql struct

Browse Source
This commit is contained in:
dignifiedquire
2019-07-15 00:33:02 +02:00
parent 668c647fdd
commit cdfc8c6fa7
24 changed files with 562 additions and 584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/oauth2.rs
View File

@@ -5,7 +5,6 @@ use serde::Deserialize;
use crate::context::Context;
use crate::dc_tools::*;
use crate::sql;
const OAUTH2_GMAIL: Oauth2 = Oauth2 {
client_id: "959970109878-4mvtgf6feshskf7695nfln6002mom908.apps.googleusercontent.com",
@@ -49,9 +48,8 @@ pub fn dc_get_oauth2_url(
redirect_uri: impl AsRef<str>,
) -> Option<String> {
if let Some(oauth2) = Oauth2::from_address(addr) {
sql::set_config(
context.sql.set_config(
context,
&context.sql,
"oauth2_pending_redirect_uri",
Some(redirect_uri.as_ref()),
);
@@ -78,17 +76,20 @@ pub fn dc_get_oauth2_access_token(
// read generated token
if 0 == flags & 0x1 && !is_expired(context) {
let access_token = sql::get_config(context, &context.sql, "oauth2_access_token", None);
let access_token = context.sql.get_config(context, "oauth2_access_token", None);
if access_token.is_some() {
// success
return access_token;
}
}
let refresh_token = sql::get_config(context, &context.sql, "oauth2_refresh_token", None);
let refresh_token_for =
sql::get_config(context, &context.sql, "oauth2_refresh_token_for", None)
.unwrap_or_else(|| "unset".into());
let refresh_token = context
.sql
.get_config(context, "oauth2_refresh_token", None);
let refresh_token_for = context
.sql
.get_config(context, "oauth2_refresh_token_for", None)
.unwrap_or_else(|| "unset".into());
let (redirect_uri, token_url, update_redirect_uri_on_success) =
if refresh_token.is_none() || refresh_token_for != code.as_ref() {
@@ -97,7 +98,9 @@ pub fn dc_get_oauth2_access_token(
0, "Generate OAuth2 refresh_token and access_token...",
);
(
sql::get_config(context, &context.sql, "oauth2_pending_redirect_uri", None)
context
.sql
.get_config(context, "oauth2_pending_redirect_uri", None)
.unwrap_or_else(|| "unset".into()),
oauth2.init_token,
true,
@@ -108,7 +111,9 @@ pub fn dc_get_oauth2_access_token(
0, "Regenerate OAuth2 access_token by refresh_token...",
);
(
sql::get_config(context, &context.sql, "oauth2_redirect_uri", None)
context
.sql
.get_config(context, "oauth2_redirect_uri", None)
.unwrap_or_else(|| "unset".into()),
oauth2.refresh_token,
false,
@@ -152,38 +157,33 @@ pub fn dc_get_oauth2_access_token(
println!("response: {:?}", &parsed);
let response = parsed.unwrap();
if let Some(ref token) = response.refresh_token {
sql::set_config(context, &context.sql, "oauth2_refresh_token", Some(token));
sql::set_config(
context,
&context.sql,
"oauth2_refresh_token_for",
Some(code.as_ref()),
);
context
.sql
.set_config(context, "oauth2_refresh_token", Some(token));
context
.sql
.set_config(context, "oauth2_refresh_token_for", Some(code.as_ref()));
}
// after that, save the access token.
// if it's unset, we may get it in the next round as we have the refresh_token now.
if let Some(ref token) = response.access_token {
sql::set_config(context, &context.sql, "oauth2_access_token", Some(token));
context
.sql
.set_config(context, "oauth2_access_token", Some(token));
let expires_in = response
.expires_in
// refresh a bet before
.map(|t| time() + t as i64 - 5)
.unwrap_or_else(|| 0);
sql::set_config_int64(
context,
&context.sql,
"oauth2_timestamp_expires",
expires_in,
);
context
.sql
.set_config_int64(context, "oauth2_timestamp_expires", expires_in);
if update_redirect_uri_on_success {
sql::set_config(
context,
&context.sql,
"oauth2_redirect_uri",
Some(redirect_uri.as_ref()),
);
context
.sql
.set_config(context, "oauth2_redirect_uri", Some(redirect_uri.as_ref()));
}
} else {
warn!(context, 0, "Failed to find OAuth2 access token");
@@ -297,7 +297,9 @@ impl Oauth2 {
fn is_expired(context: &Context) -> bool {
let expire_timestamp =
sql::get_config_int64(context, &context.sql, "oauth2_timestamp_expires", Some(0));
context
.sql
.get_config_int64(context, "oauth2_timestamp_expires", Some(0));
if expire_timestamp <= 0 {
return false;