More verbose, but also more consistent.
This commit is contained in:
@@ -1,5 +1,3 @@
|
||||
use chrono::{DateTime, Utc};
|
||||
|
||||
use super::{ReferenceRelation, ReferenceViolationKind, RepositoryError};
|
||||
use crate::{
|
||||
database::{
|
||||
@@ -7,6 +5,7 @@ use crate::{
|
||||
dtos::{AccessTokenRow, RefreshTokenRow},
|
||||
},
|
||||
domain::{HashedAccessToken, HashedRefreshToken, HashedSecret},
|
||||
repository::dtos::Upsert,
|
||||
};
|
||||
|
||||
#[tracing::instrument(skip(executor, secret_hash))]
|
||||
@@ -19,7 +18,8 @@ where
|
||||
{
|
||||
let token = database::tokens::get_access_token_by_hash(executor, secret_hash.hash())
|
||||
.await?
|
||||
.map(decode_access_token);
|
||||
.map(decode_access_token)
|
||||
.transpose()?;
|
||||
|
||||
Ok(token)
|
||||
}
|
||||
@@ -35,46 +35,26 @@ where
|
||||
let token =
|
||||
database::tokens::get_access_token_by_refresh_secret_hash(executor, secret_hash.hash())
|
||||
.await?
|
||||
.map(decode_access_token);
|
||||
.map(decode_access_token)
|
||||
.transpose()?;
|
||||
|
||||
Ok(token)
|
||||
}
|
||||
|
||||
#[tracing::instrument(skip(executor, access_token))]
|
||||
pub async fn insert_access_token<'e, E>(
|
||||
pub async fn upsert_access_token<'e, E>(
|
||||
executor: E,
|
||||
access_token: HashedAccessToken,
|
||||
) -> Result<HashedAccessToken, RepositoryError>
|
||||
) -> Result<Option<Upsert<HashedAccessToken>>, RepositoryError>
|
||||
where
|
||||
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
||||
{
|
||||
let token = database::tokens::insert_access_token(executor, encode_access_token(access_token))
|
||||
let token = database::tokens::upsert_access_token(executor, encode_access_token(access_token))
|
||||
.await
|
||||
.map_err(classify_insert_error)?;
|
||||
|
||||
Ok(decode_access_token(token))
|
||||
}
|
||||
|
||||
#[tracing::instrument(skip(executor, secret_hash, new_secret_hash))]
|
||||
pub async fn update_access_token_by_hash<'e, E>(
|
||||
executor: E,
|
||||
secret_hash: &HashedSecret,
|
||||
new_secret_hash: &HashedSecret,
|
||||
new_expires_at: DateTime<Utc>,
|
||||
new_issued_at: DateTime<Utc>,
|
||||
) -> Result<Option<HashedAccessToken>, RepositoryError>
|
||||
where
|
||||
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
||||
{
|
||||
let token = database::tokens::update_access_token_by_hash(
|
||||
executor,
|
||||
secret_hash.hash(),
|
||||
new_secret_hash.hash(),
|
||||
new_expires_at,
|
||||
new_issued_at,
|
||||
)
|
||||
.await?
|
||||
.map(decode_access_token);
|
||||
.map_err(classify_upsert_error)?
|
||||
.map(|upserted| upserted.try_map(decode_access_token))
|
||||
.transpose()?
|
||||
.map(Into::into);
|
||||
|
||||
Ok(token)
|
||||
}
|
||||
@@ -89,7 +69,8 @@ where
|
||||
{
|
||||
let token = database::tokens::delete_access_token_by_hash(executor, secret_hash.hash())
|
||||
.await?
|
||||
.map(decode_access_token);
|
||||
.map(decode_access_token)
|
||||
.transpose()?;
|
||||
|
||||
Ok(token)
|
||||
}
|
||||
@@ -104,46 +85,27 @@ where
|
||||
{
|
||||
let token = database::tokens::get_refresh_token_by_hash(executor, secret_hash.hash())
|
||||
.await?
|
||||
.map(decode_refresh_token);
|
||||
.map(decode_refresh_token)
|
||||
.transpose()?;
|
||||
|
||||
Ok(token)
|
||||
}
|
||||
|
||||
// pub async fn insert_refresh_token<'e, E>(
|
||||
// executor: E,
|
||||
// refresh_token: HashedRefreshToken,
|
||||
// ) -> Result<HashedRefreshToken, RepositoryError>
|
||||
// where
|
||||
// E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
||||
// {
|
||||
// let token =
|
||||
// database::tokens::insert_refresh_token(executor, encode_refresh_token(refresh_token))
|
||||
// .await
|
||||
// .map_err(classify_insert_error)?;
|
||||
|
||||
// Ok(decode_refresh_token(token))
|
||||
// }
|
||||
|
||||
#[tracing::instrument(skip(executor, secret_hash, new_secret_hash))]
|
||||
pub async fn update_refresh_token_by_hash<'e, E>(
|
||||
#[tracing::instrument(skip(executor, refresh_token))]
|
||||
pub async fn upsert_refresh_token<'e, E>(
|
||||
executor: E,
|
||||
secret_hash: &HashedSecret,
|
||||
new_secret_hash: &HashedSecret,
|
||||
new_expires_at: DateTime<Utc>,
|
||||
new_issued_at: DateTime<Utc>,
|
||||
) -> Result<Option<HashedRefreshToken>, RepositoryError>
|
||||
refresh_token: HashedRefreshToken,
|
||||
) -> Result<Option<Upsert<HashedRefreshToken>>, RepositoryError>
|
||||
where
|
||||
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
||||
{
|
||||
let token = database::tokens::update_refresh_token_by_hash(
|
||||
executor,
|
||||
secret_hash.hash(),
|
||||
new_secret_hash.hash(),
|
||||
new_expires_at,
|
||||
new_issued_at,
|
||||
)
|
||||
.await?
|
||||
.map(decode_refresh_token);
|
||||
let token =
|
||||
database::tokens::upsert_refresh_token(executor, encode_refresh_token(refresh_token))
|
||||
.await
|
||||
.map_err(classify_upsert_error)?
|
||||
.map(|upserted| upserted.try_map(decode_refresh_token))
|
||||
.transpose()?
|
||||
.map(Into::into);
|
||||
|
||||
Ok(token)
|
||||
}
|
||||
@@ -158,12 +120,13 @@ where
|
||||
{
|
||||
let token = database::tokens::delete_refresh_token_by_hash(executor, secret_hash.hash())
|
||||
.await?
|
||||
.map(decode_refresh_token);
|
||||
.map(decode_refresh_token)
|
||||
.transpose()?;
|
||||
|
||||
Ok(token)
|
||||
}
|
||||
|
||||
fn classify_insert_error(error: DatabaseError) -> RepositoryError {
|
||||
fn classify_upsert_error(error: DatabaseError) -> RepositoryError {
|
||||
let relation = match &error {
|
||||
DatabaseError::ForeignKeyViolation {
|
||||
constraint: Constraint::AccessTokenUser,
|
||||
@@ -187,15 +150,15 @@ fn classify_insert_error(error: DatabaseError) -> RepositoryError {
|
||||
}
|
||||
}
|
||||
|
||||
fn decode_access_token(row: AccessTokenRow) -> HashedAccessToken {
|
||||
HashedAccessToken {
|
||||
fn decode_access_token(row: AccessTokenRow) -> Result<HashedAccessToken, RepositoryError> {
|
||||
Ok(HashedAccessToken {
|
||||
id: row.id,
|
||||
user_id: row.user_id,
|
||||
user_app_id: row.user_app_id,
|
||||
secret_hash: HashedSecret::from(row.secret_hash),
|
||||
expires_at: row.expires_at,
|
||||
issued_at: row.issued_at,
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
fn encode_access_token(token: HashedAccessToken) -> AccessTokenRow {
|
||||
@@ -209,22 +172,22 @@ fn encode_access_token(token: HashedAccessToken) -> AccessTokenRow {
|
||||
}
|
||||
}
|
||||
|
||||
fn decode_refresh_token(row: RefreshTokenRow) -> HashedRefreshToken {
|
||||
HashedRefreshToken {
|
||||
fn decode_refresh_token(row: RefreshTokenRow) -> Result<HashedRefreshToken, RepositoryError> {
|
||||
Ok(HashedRefreshToken {
|
||||
id: row.id,
|
||||
token_id: row.access_token_id,
|
||||
secret_hash: HashedSecret::from(row.secret_hash),
|
||||
expires_at: row.expires_at,
|
||||
issued_at: row.issued_at,
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// fn encode_refresh_token(token: HashedRefreshToken) -> RefreshTokenRow {
|
||||
// RefreshTokenRow {
|
||||
// id: token.id,
|
||||
// access_token_id: token.token_id,
|
||||
// secret_hash: token.secret_hash.hash().to_vec(),
|
||||
// expires_at: token.expires_at,
|
||||
// issued_at: token.issued_at,
|
||||
// }
|
||||
// }
|
||||
fn encode_refresh_token(token: HashedRefreshToken) -> RefreshTokenRow {
|
||||
RefreshTokenRow {
|
||||
id: token.id,
|
||||
access_token_id: token.token_id,
|
||||
secret_hash: token.secret_hash.hash().to_vec(),
|
||||
expires_at: token.expires_at,
|
||||
issued_at: token.issued_at,
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user