Do not tie tokens to a user app.

This commit is contained in:
Rogier Reerink
2026-10-08 15:09:06 +02:00
parent d12fe3af7d
commit 15b229b0de
8 changed files with 24 additions and 31 deletions
@@ -1,21 +0,0 @@
{
"db_name": "PostgreSQL",
"query": "\n INSERT INTO tokens (\n id, app_id, access_token_hash, refresh_token_hash,\n access_expires_at, refresh_expires_at, revoked_at, created_at\n )\n VALUES ($1, $2, $3, $4, $5, $6, $7, $8)\n ",
"describe": {
"columns": [],
"parameters": {
"Left": [
"Uuid",
"Uuid",
"Bytea",
"Bytea",
"Timestamptz",
"Timestamptz",
"Timestamptz",
"Timestamptz"
]
},
"nullable": []
},
"hash": "3fcfa5b534e0ad39d2daecd9654ed22c38da844dbe7044cafc683bbcacb79d7a"
}
@@ -0,0 +1,20 @@
{
"db_name": "PostgreSQL",
"query": "\n INSERT INTO tokens (\n id, access_token_hash, refresh_token_hash,\n access_expires_at, refresh_expires_at, revoked_at, created_at\n )\n VALUES ($1, $2, $3, $4, $5, $6, $7)\n ",
"describe": {
"columns": [],
"parameters": {
"Left": [
"Uuid",
"Bytea",
"Bytea",
"Timestamptz",
"Timestamptz",
"Timestamptz",
"Timestamptz"
]
},
"nullable": []
},
"hash": "409368e6023d0e957be632a7d65879c75e1006af498c355a6ac8e5a6144a9dd0"
}
@@ -1,6 +1,5 @@
CREATE TABLE tokens ( CREATE TABLE tokens (
id UUID PRIMARY KEY DEFAULT gen_random_uuid (), id UUID PRIMARY KEY DEFAULT gen_random_uuid (),
app_id UUID NOT NULL CONSTRAINT fk_tokens_app REFERENCES user_apps (id) ON DELETE CASCADE,
access_token_hash BYTEA NOT NULL UNIQUE CHECK ( access_token_hash BYTEA NOT NULL UNIQUE CHECK (
octet_length(access_token_hash) = 32 octet_length(access_token_hash) = 32
), ),
-1
View File
@@ -3,7 +3,6 @@ use uuid::Uuid;
pub struct TokenRow { pub struct TokenRow {
pub id: Uuid, pub id: Uuid,
pub app_id: Uuid,
pub access_token_hash: Vec<u8>, pub access_token_hash: Vec<u8>,
pub refresh_token_hash: Vec<u8>, pub refresh_token_hash: Vec<u8>,
pub access_expires_at: DateTime<Utc>, pub access_expires_at: DateTime<Utc>,
+2 -3
View File
@@ -9,13 +9,12 @@ where
sqlx::query!( sqlx::query!(
r#" r#"
INSERT INTO tokens ( INSERT INTO tokens (
id, app_id, access_token_hash, refresh_token_hash, id, access_token_hash, refresh_token_hash,
access_expires_at, refresh_expires_at, revoked_at, created_at access_expires_at, refresh_expires_at, revoked_at, created_at
) )
VALUES ($1, $2, $3, $4, $5, $6, $7, $8) VALUES ($1, $2, $3, $4, $5, $6, $7)
"#, "#,
token.id, token.id,
token.app_id,
token.access_token_hash, token.access_token_hash,
token.refresh_token_hash, token.refresh_token_hash,
token.access_expires_at, token.access_expires_at,
-1
View File
@@ -4,7 +4,6 @@ use uuid::Uuid;
#[derive(Clone, PartialEq, Eq)] #[derive(Clone, PartialEq, Eq)]
pub struct Token { pub struct Token {
pub id: Uuid, pub id: Uuid,
pub app_id: Uuid,
pub access_token_hash: Vec<u8>, pub access_token_hash: Vec<u8>,
pub refresh_token_hash: Vec<u8>, pub refresh_token_hash: Vec<u8>,
pub access_expires_at: DateTime<Utc>, pub access_expires_at: DateTime<Utc>,
-1
View File
@@ -45,7 +45,6 @@ where
fn encode(token: Token) -> TokenRow { fn encode(token: Token) -> TokenRow {
TokenRow { TokenRow {
id: token.id, id: token.id,
app_id: token.app_id,
access_token_hash: token.access_token_hash, access_token_hash: token.access_token_hash,
refresh_token_hash: token.refresh_token_hash, refresh_token_hash: token.refresh_token_hash,
access_expires_at: token.access_expires_at, access_expires_at: token.access_expires_at,
+2 -3
View File
@@ -40,7 +40,7 @@ async fn issue_token(
} }
let generated = generate_token_pair()?; let generated = generate_token_pair()?;
repository::tokens::issue(&pool, token(client_id, &generated)).await?; repository::tokens::issue(&pool, token(&generated)).await?;
Ok(Json(token_response( Ok(Json(token_response(
generated.access_token, generated.access_token,
@@ -110,10 +110,9 @@ fn generate_token_pair() -> Result<GeneratedTokenPair, AppError> {
}) })
} }
fn token(app_id: Uuid, generated: &GeneratedTokenPair) -> Token { fn token(generated: &GeneratedTokenPair) -> Token {
Token { Token {
id: Uuid::new_v4(), id: Uuid::new_v4(),
app_id,
access_token_hash: generated.access_token_hash.clone(), access_token_hash: generated.access_token_hash.clone(),
refresh_token_hash: generated.refresh_token_hash.clone(), refresh_token_hash: generated.refresh_token_hash.clone(),
access_expires_at: generated.access_expires_at, access_expires_at: generated.access_expires_at,