diff --git a/server/.sqlx/query-b01b27f9cdf2ec1c9aa28be0e760d66d01c6083166bd6a6f53784ddcdc92f12c.json b/server/.sqlx/query-594090231079a7874dbe6d8b9696c92e30ca688f496cc02c79f265f870540153.json
similarity index 74%
rename from server/.sqlx/query-b01b27f9cdf2ec1c9aa28be0e760d66d01c6083166bd6a6f53784ddcdc92f12c.json
rename to server/.sqlx/query-594090231079a7874dbe6d8b9696c92e30ca688f496cc02c79f265f870540153.json
index 4578eae..0b55c09 100644
--- a/server/.sqlx/query-b01b27f9cdf2ec1c9aa28be0e760d66d01c6083166bd6a6f53784ddcdc92f12c.json
+++ b/server/.sqlx/query-594090231079a7874dbe6d8b9696c92e30ca688f496cc02c79f265f870540153.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "\n INSERT INTO user_app_secrets (id, app_id, secret_hash, expires_at)\n VALUES ($1, $2, $3, $4)\n ON CONFLICT (id) DO UPDATE SET\n secret_hash = EXCLUDED.secret_hash,\n expires_at = EXCLUDED.expires_at\n WHERE user_app_secrets.app_id = EXCLUDED.app_id\n RETURNING WITH (OLD AS old_row, NEW AS new_row)\n old_row.id AS \"old_id?\",\n new_row.id AS \"id!\",\n new_row.app_id AS \"app_id!\",\n new_row.secret_hash AS \"secret_hash!\",\n new_row.expires_at AS \"expires_at!\",\n new_row.created_at AS \"created_at!\"\n ",
+ "query": "\n INSERT INTO user_app_secrets (id, app_id, secret_hash, expires_at)\n VALUES ($1, $2, $3, $4)\n ON CONFLICT (id, app_id) DO UPDATE SET\n secret_hash = EXCLUDED.secret_hash,\n expires_at = EXCLUDED.expires_at\n RETURNING WITH (OLD AS old_row, NEW AS new_row)\n old_row.id AS \"old_id?\",\n new_row.id AS \"id!\",\n new_row.app_id AS \"app_id!\",\n new_row.secret_hash AS \"secret_hash!\",\n new_row.expires_at AS \"expires_at!\",\n new_row.created_at AS \"created_at!\"\n ",
"describe": {
"columns": [
{
@@ -87,5 +87,5 @@
false
]
},
- "hash": "b01b27f9cdf2ec1c9aa28be0e760d66d01c6083166bd6a6f53784ddcdc92f12c"
+ "hash": "594090231079a7874dbe6d8b9696c92e30ca688f496cc02c79f265f870540153"
}
diff --git a/server/.sqlx/query-f9a9d0e201e0f1c912d940fb6d0e4c27664bf4a0dbc2e71b2ade48df2e8dcd6e.json b/server/.sqlx/query-f9a9d0e201e0f1c912d940fb6d0e4c27664bf4a0dbc2e71b2ade48df2e8dcd6e.json
new file mode 100644
index 0000000..b0608e5
--- /dev/null
+++ b/server/.sqlx/query-f9a9d0e201e0f1c912d940fb6d0e4c27664bf4a0dbc2e71b2ade48df2e8dcd6e.json
@@ -0,0 +1,28 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "SELECT user_id FROM user_apps WHERE id = $1 FOR SHARE",
+ "describe": {
+ "columns": [
+ {
+ "ordinal": 0,
+ "name": "user_id",
+ "type_info": "Uuid",
+ "origin": {
+ "Table": {
+ "table": "user_apps",
+ "name": "user_id"
+ }
+ }
+ }
+ ],
+ "parameters": {
+ "Left": [
+ "Uuid"
+ ]
+ },
+ "nullable": [
+ false
+ ]
+ },
+ "hash": "f9a9d0e201e0f1c912d940fb6d0e4c27664bf4a0dbc2e71b2ade48df2e8dcd6e"
+}
diff --git a/server/migrations/20261007000001_create_user_app_secrets.sql b/server/migrations/20261007000001_create_user_app_secrets.sql
index c910c95..ba5cc06 100644
--- a/server/migrations/20261007000001_create_user_app_secrets.sql
+++ b/server/migrations/20261007000001_create_user_app_secrets.sql
@@ -1,11 +1,12 @@
CREATE TABLE user_app_secrets (
- id UUID PRIMARY KEY DEFAULT gen_random_uuid (),
+ id UUID DEFAULT gen_random_uuid (),
app_id UUID NOT NULL CONSTRAINT fk_user_app_secrets_app REFERENCES user_apps (id) ON DELETE CASCADE,
secret_hash BYTEA NOT NULL CHECK (
octet_length(secret_hash) = 32
),
expires_at TIMESTAMPTZ NOT NULL,
- created_at TIMESTAMPTZ NOT NULL DEFAULT now()
+ created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+ PRIMARY KEY (id, app_id)
);
CREATE INDEX ix_user_app_secrets_app_id ON user_app_secrets (app_id);
\ No newline at end of file
diff --git a/server/src/database/user_app_secrets.rs b/server/src/database/user_app_secrets.rs
index af9c526..29f8712 100644
--- a/server/src/database/user_app_secrets.rs
+++ b/server/src/database/user_app_secrets.rs
@@ -68,10 +68,9 @@ where
r#"
INSERT INTO user_app_secrets (id, app_id, secret_hash, expires_at)
VALUES ($1, $2, $3, $4)
- ON CONFLICT (id) DO UPDATE SET
+ ON CONFLICT (id, app_id) DO UPDATE SET
secret_hash = EXCLUDED.secret_hash,
expires_at = EXCLUDED.expires_at
- WHERE user_app_secrets.app_id = EXCLUDED.app_id
RETURNING WITH (OLD AS old_row, NEW AS new_row)
old_row.id AS "old_id?",
new_row.id AS "id!",
diff --git a/server/src/database/user_apps.rs b/server/src/database/user_apps.rs
index a6a08eb..80286d5 100644
--- a/server/src/database/user_apps.rs
+++ b/server/src/database/user_apps.rs
@@ -57,6 +57,22 @@ where
.map_err(DatabaseError::from)
}
+pub async fn find_owner_by_id<'e, E>(
+ executor: E,
+ app_id: Uuid,
+) -> Result