t/tetratto
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions

add: service edit date + browser session ids

Browse source
This commit is contained in:
trisua 2025-07-11 18:56:49 -04:00
parent 9aee80493f
commit cfcc2358f4
17 changed files with 148 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/core/src/database/auth.rs
View file

@ -116,12 +116,14 @@ impl DataManager {
achievements: serde_json::from_str(&get!(x->23(String)).to_string()).unwrap(),
awaiting_purchase: get!(x->24(i32)) as i8 == 1,
was_purchased: get!(x->25(i32)) as i8 == 1,
browser_session: get!(x->26(String)),
}
}
auto_method!(get_user_by_id(usize as i64)@get_user_from_row -> "SELECT * FROM users WHERE id = $1" --name="user" --returns=User --cache-key-tmpl="atto.user:{}");
auto_method!(get_user_by_username(&str)@get_user_from_row -> "SELECT * FROM users WHERE username = $1" --name="user" --returns=User --cache-key-tmpl="atto.user:{}");
auto_method!(get_user_by_username_no_cache(&str)@get_user_from_row -> "SELECT * FROM users WHERE username = $1" --name="user" --returns=User);
auto_method!(get_user_by_browser_session(&str)@get_user_from_row -> "SELECT * FROM users WHERE browser_session = $1" --name="user" --returns=User);
/// Get a user given just their ID. Returns the void user if the user doesn't exist.
///
@ -271,7 +273,7 @@ impl DataManager {
let res = execute!(
&conn,
"INSERT INTO users VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26)",
"INSERT INTO users VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26, $27)",
params![
&(data.id as i64),
&(data.created as i64),
@ -299,6 +301,7 @@ impl DataManager {
&serde_json::to_string(&data.achievements).unwrap(),
&if data.awaiting_purchase { 1_i32 } else { 0_i32 },
&if data.was_purchased { 1_i32 } else { 0_i32 },
&data.browser_session,
]
);
@ -993,6 +996,7 @@ impl DataManager {
auto_method!(update_user_associated(Vec<usize>)@get_user_by_id -> "UPDATE users SET associated = $1 WHERE id = $2" --serde --cache-key-tmpl=cache_clear_user);
auto_method!(update_user_achievements(Vec<Achievement>)@get_user_by_id -> "UPDATE users SET achievements = $1 WHERE id = $2" --serde --cache-key-tmpl=cache_clear_user);
auto_method!(update_user_invite_code(i64)@get_user_by_id -> "UPDATE users SET invite_code = $1 WHERE id = $2" --cache-key-tmpl=cache_clear_user);
auto_method!(update_user_browser_session(&str)@get_user_by_id -> "UPDATE users SET browser_session = $1 WHERE id = $2" --cache-key-tmpl=cache_clear_user);
auto_method!(get_user_by_stripe_id(&str)@get_user_from_row -> "SELECT * FROM users WHERE stripe_id = $1" --name="user" --returns=User);
auto_method!(update_user_stripe_id(&str)@get_user_by_id -> "UPDATE users SET stripe_id = $1 WHERE id = $2" --cache-key-tmpl=cache_clear_user);

3
crates/core/src/database/drivers/sql/create_services.sql
View file

@ -3,5 +3,6 @@ CREATE TABLE IF NOT EXISTS services (
created BIGINT NOT NULL,
owner BIGINT NOT NULL,
name TEXT NOT NULL,
files TEXT NOT NULL
files TEXT NOT NULL,
revision BIGINT NOT NULL
)

3
crates/core/src/database/drivers/sql/create_users.sql
View file

@ -23,5 +23,6 @@ CREATE TABLE IF NOT EXISTS users (
secondary_permissions INT NOT NULL,
achievements TEXT NOT NULL,
awaiting_purchase INT NOT NULL,
was_purchased INT NOT NULL
was_purchased INT NOT NULL,
browser_session TEXT NOT NULL
)

5
crates/core/src/database/services.rs
View file

@ -16,6 +16,7 @@ impl DataManager {
owner: get!(x->2(i64)) as usize,
name: get!(x->3(String)),
files: serde_json::from_str(&get!(x->4(String))).unwrap(),
revision: get!(x->5(i64)) as usize,
}
}
@ -80,13 +81,14 @@ impl DataManager {
let res = execute!(
&conn,
"INSERT INTO services VALUES ($1, $2, $3, $4, $5)",
"INSERT INTO services VALUES ($1, $2, $3, $4, $5, $6)",
params![
&(data.id as i64),
&(data.created as i64),
&(data.owner as i64),
&data.name,
&serde_json::to_string(&data.files).unwrap(),
&(data.created as i64)
]
);
@ -128,4 +130,5 @@ impl DataManager {
auto_method!(update_service_name(&str)@get_service_by_id:FinePermission::MANAGE_USERS; -> "UPDATE services SET name = $1 WHERE id = $2" --cache-key-tmpl="atto.service:{}");
auto_method!(update_service_files(Vec<ServiceFsEntry>)@get_service_by_id:FinePermission::MANAGE_USERS; -> "UPDATE services SET files = $1 WHERE id = $2" --serde --cache-key-tmpl="atto.service:{}");
auto_method!(update_service_revision(i64) -> "UPDATE services SET revision = $1 WHERE id = $2" --cache-key-tmpl="atto.service:{}");
}

11
crates/core/src/model/auth.rs
View file

@ -70,6 +70,16 @@ pub struct User {
/// used an invite code.
#[serde(default)]
pub was_purchased: bool,
/// This value is updated for every **new** littleweb browser session.
///
/// This means the user can only have one of these sessions open at once
/// (unless this token is stored somewhere with a way to say we already have one,
/// but this does not happen yet).
///
/// Without this token, the user can still use the browser, they just cannot
/// view pages which require authentication (all `$` routes).
#[serde(default)]
pub browser_session: String,
}
pub type UserConnections =
@ -357,6 +367,7 @@ impl User {
achievements: Vec::new(),
awaiting_purchase: false,
was_purchased: false,
browser_session: String::new(),
}
}

2
crates/core/src/model/littleweb.rs
View file

@ -11,6 +11,7 @@ pub struct Service {
pub owner: usize,
pub name: String,
pub files: Vec<ServiceFsEntry>,
pub revision: usize,
}
impl Service {
@ -22,6 +23,7 @@ impl Service {
owner,
name,
files: Vec::new(),
revision: unix_epoch_timestamp(),
}
}