fix: Invalid refresh token (#3879)

* chore: update client api

* chore: update client api

* chore: update client api

* chore: fix clippy

* chore: fix clippy

* ci: fix

* chore: update client api
This commit is contained in:
Nathan.fooo
2023-11-08 21:48:17 +08:00
committed by GitHub
parent afc6473582
commit 73f1c211c2
23 changed files with 332 additions and 124 deletions

View File

@ -7,7 +7,7 @@ use serde::de::DeserializeOwned;
use serde::Serialize;
use crate::kv::schema::{kv_table, kv_table::dsl, KV_SQL};
use crate::sqlite::{Database, PoolConfig};
use crate::sqlite_impl::{Database, PoolConfig};
const DB_NAME: &str = "cache.db";

View File

@ -10,11 +10,11 @@ use std::{fmt::Debug, io, path::Path};
pub use diesel::*;
pub use diesel_derives::*;
use crate::sqlite::PoolConfig;
pub use crate::sqlite::{ConnectionPool, DBConnection, Database};
use crate::sqlite_impl::PoolConfig;
pub use crate::sqlite_impl::{ConnectionPool, DBConnection, Database};
pub mod kv;
mod sqlite;
mod sqlite_impl;
pub mod schema;
@ -46,7 +46,7 @@ pub fn init<P: AsRef<Path>>(storage_path: P) -> Result<Database, io::Error> {
fn as_io_error<E>(e: E) -> io::Error
where
E: Into<crate::sqlite::Error> + Debug,
E: Into<crate::sqlite_impl::Error> + Debug,
{
let msg = format!("{:?}", e);
io::Error::new(io::ErrorKind::NotConnected, msg)

View File

@ -1,8 +1,9 @@
use crate::sqlite::errors::*;
use diesel::{
dsl::sql, expression::SqlLiteral, query_dsl::LoadQuery, Connection, RunQueryDsl, SqliteConnection,
};
use crate::sqlite_impl::errors::*;
pub trait ConnectionExtension: Connection {
fn query<ST, T>(&self, query: &str) -> Result<T>
where

View File

@ -1,9 +1,11 @@
use crate::sqlite::{
use std::sync::Arc;
use r2d2::PooledConnection;
use crate::sqlite_impl::{
errors::*,
pool::{ConnectionManager, ConnectionPool, PoolConfig},
};
use r2d2::PooledConnection;
use std::sync::Arc;
pub struct Database {
uri: String,

View File

@ -4,7 +4,7 @@ use diesel::{connection::Connection, SqliteConnection};
use r2d2::{CustomizeConnection, ManageConnection, Pool};
use scheduled_thread_pool::ScheduledThreadPool;
use crate::sqlite::{errors::*, pragma::*};
use crate::sqlite_impl::{errors::*, pragma::*};
pub struct ConnectionPool {
pub(crate) inner: Pool<ConnectionManager>,
@ -87,7 +87,7 @@ pub struct ConnectionManager {
impl ManageConnection for ConnectionManager {
type Connection = SqliteConnection;
type Error = crate::sqlite::Error;
type Error = crate::sqlite_impl::Error;
fn connect(&self) -> Result<Self::Connection> {
Ok(SqliteConnection::establish(&self.db_uri)?)
@ -142,7 +142,7 @@ impl DatabaseCustomizer {
}
}
impl CustomizeConnection<SqliteConnection, crate::sqlite::Error> for DatabaseCustomizer {
impl CustomizeConnection<SqliteConnection, crate::sqlite_impl::Error> for DatabaseCustomizer {
fn on_acquire(&self, conn: &mut SqliteConnection) -> Result<()> {
conn.pragma_set_busy_timeout(self.config.busy_timeout)?;
if self.config.journal_mode != SQLiteJournalMode::WAL {

View File

@ -1,5 +1,11 @@
#![allow(clippy::upper_case_acronyms)]
use crate::sqlite::errors::{Error, Result};
use std::{
convert::{TryFrom, TryInto},
fmt,
str::FromStr,
};
use diesel::{
expression::SqlLiteral,
query_dsl::load_dsl::LoadQuery,
@ -7,12 +13,8 @@ use diesel::{
SqliteConnection,
};
use crate::sqlite::conn_ext::ConnectionExtension;
use std::{
convert::{TryFrom, TryInto},
fmt,
str::FromStr,
};
use crate::sqlite_impl::conn_ext::ConnectionExtension;
use crate::sqlite_impl::errors::{Error, Result};
pub trait PragmaExtension: ConnectionExtension {
fn pragma<D: std::fmt::Display>(&self, key: &str, val: D, schema: Option<&str>) -> Result<()> {