diff --git a/server/.sqlx/query-590bd11fc994d0d22bb238ff7c140b1c48c4e31c34c18505c1d2a6aad01ddcdd.json b/server/.sqlx/query-030c776c90d2b5d0ea83cae5adf2b66b8636bbfcb73ef8201fafebaea5623f89.json similarity index 88% rename from server/.sqlx/query-590bd11fc994d0d22bb238ff7c140b1c48c4e31c34c18505c1d2a6aad01ddcdd.json rename to server/.sqlx/query-030c776c90d2b5d0ea83cae5adf2b66b8636bbfcb73ef8201fafebaea5623f89.json index 7688f26..7bfafd0 100644 --- a/server/.sqlx/query-590bd11fc994d0d22bb238ff7c140b1c48c4e31c34c18505c1d2a6aad01ddcdd.json +++ b/server/.sqlx/query-030c776c90d2b5d0ea83cae5adf2b66b8636bbfcb73ef8201fafebaea5623f89.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n DELETE FROM recurring_transactions\n WHERE account_id IN (SELECT id FROM accessible_accounts($1))\n AND id = $2\n RETURNING\n id,\n name,\n account_id,\n amount_cents,\n direction,\n starts_at,\n ends_at,\n recurrence_every,\n recurrence_unit,\n weekend_adjustment\n ", + "query": "\n DELETE FROM recurring_transactions\n WHERE account_id IN (SELECT id FROM accessible_accounts($1))\n AND id = $2\n RETURNING\n id,\n name,\n account_id,\n amount_cents,\n direction,\n starts_at,\n ends_at,\n recurrence_every,\n recurrence_unit,\n weekend_adjustment\n ", "describe": { "columns": [ { @@ -133,5 +133,5 @@ true ] }, - "hash": "590bd11fc994d0d22bb238ff7c140b1c48c4e31c34c18505c1d2a6aad01ddcdd" + "hash": "030c776c90d2b5d0ea83cae5adf2b66b8636bbfcb73ef8201fafebaea5623f89" } diff --git a/server/.sqlx/query-ef7cd037118a0ce24b225d60fa156d552323461169feb86fd6a532524897f144.json b/server/.sqlx/query-1726695ea4d8786d8e489a763cd615644f66ad541bbad08d38f4a67c86c57a37.json similarity index 76% rename from server/.sqlx/query-ef7cd037118a0ce24b225d60fa156d552323461169feb86fd6a532524897f144.json rename to server/.sqlx/query-1726695ea4d8786d8e489a763cd615644f66ad541bbad08d38f4a67c86c57a37.json index ba08cd6..a7a296e 100644 --- a/server/.sqlx/query-ef7cd037118a0ce24b225d60fa156d552323461169feb86fd6a532524897f144.json +++ b/server/.sqlx/query-1726695ea4d8786d8e489a763cd615644f66ad541bbad08d38f4a67c86c57a37.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "DELETE FROM user_apps WHERE user_id = $1 AND id = $2 RETURNING id, user_id", + "query": "\n SELECT id, user_id\n FROM user_apps\n WHERE user_id = $1 AND id = $2\n ", "describe": { "columns": [ { @@ -37,5 +37,5 @@ false ] }, - "hash": "ef7cd037118a0ce24b225d60fa156d552323461169feb86fd6a532524897f144" + "hash": "1726695ea4d8786d8e489a763cd615644f66ad541bbad08d38f4a67c86c57a37" } diff --git a/server/.sqlx/query-cec05471697838fb2aaaa36cb1876daa07c34c8f59d06da1d92a8adea3a8f03b.json b/server/.sqlx/query-24ea9eccfee1ede416155c7d0fe8db417d9d3e3e8ed37b8906dcd7306fa9e241.json similarity index 88% rename from server/.sqlx/query-cec05471697838fb2aaaa36cb1876daa07c34c8f59d06da1d92a8adea3a8f03b.json rename to server/.sqlx/query-24ea9eccfee1ede416155c7d0fe8db417d9d3e3e8ed37b8906dcd7306fa9e241.json index b3f23ec..664fcf3 100644 --- a/server/.sqlx/query-cec05471697838fb2aaaa36cb1876daa07c34c8f59d06da1d92a8adea3a8f03b.json +++ b/server/.sqlx/query-24ea9eccfee1ede416155c7d0fe8db417d9d3e3e8ed37b8906dcd7306fa9e241.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n SELECT id, app_id, secret_hash, expires_at, created_at\n FROM user_app_secrets\n WHERE app_id IN (SELECT id FROM user_apps WHERE user_id = $1)\n AND app_id = $2\n AND id = $3\n ", + "query": "\n SELECT id, app_id, secret_hash, expires_at, created_at\n FROM user_app_secrets\n WHERE app_id IN (SELECT id FROM user_apps WHERE user_id = $1)\n AND app_id = $2\n AND id = $3\n ", "describe": { "columns": [ { @@ -74,5 +74,5 @@ false ] }, - "hash": "cec05471697838fb2aaaa36cb1876daa07c34c8f59d06da1d92a8adea3a8f03b" + "hash": "24ea9eccfee1ede416155c7d0fe8db417d9d3e3e8ed37b8906dcd7306fa9e241" } diff --git a/server/.sqlx/query-cbb576c1e4d8404059a4ea5972027c2845a7de913052d076744ffde8383fdf86.json b/server/.sqlx/query-43bf8e81f68ec7b0e3276114f1395220f005f9e422066a62343daf9603dd921e.json similarity index 91% rename from server/.sqlx/query-cbb576c1e4d8404059a4ea5972027c2845a7de913052d076744ffde8383fdf86.json rename to server/.sqlx/query-43bf8e81f68ec7b0e3276114f1395220f005f9e422066a62343daf9603dd921e.json index 67d29bb..e600bb7 100644 --- a/server/.sqlx/query-cbb576c1e4d8404059a4ea5972027c2845a7de913052d076744ffde8383fdf86.json +++ b/server/.sqlx/query-43bf8e81f68ec7b0e3276114f1395220f005f9e422066a62343daf9603dd921e.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n SELECT id, account_id, amount_cents, direction, date, description\n\t\tFROM transactions\n\t\tWHERE account_id IN (SELECT id FROM accessible_accounts($1))\n\t\tAND id = $2\n\t\t", + "query": "\n SELECT id, account_id, amount_cents, direction, date, description\n\t\tFROM transactions\n\t\tWHERE account_id IN (SELECT id FROM accessible_accounts($1))\n\t\t AND id = $2\n\t\t", "describe": { "columns": [ { @@ -85,5 +85,5 @@ false ] }, - "hash": "cbb576c1e4d8404059a4ea5972027c2845a7de913052d076744ffde8383fdf86" + "hash": "43bf8e81f68ec7b0e3276114f1395220f005f9e422066a62343daf9603dd921e" } diff --git a/server/.sqlx/query-445ce23e4d76c2311b18c2a44d8d7199c5b4e865d60b0e39f5cd5101fbf60b57.json b/server/.sqlx/query-4d348877f9b1058c5f22c64379476276bc40da2f1fda506e3de1bfac51947cde.json similarity index 87% rename from server/.sqlx/query-445ce23e4d76c2311b18c2a44d8d7199c5b4e865d60b0e39f5cd5101fbf60b57.json rename to server/.sqlx/query-4d348877f9b1058c5f22c64379476276bc40da2f1fda506e3de1bfac51947cde.json index 87a8da5..04a1e15 100644 --- a/server/.sqlx/query-445ce23e4d76c2311b18c2a44d8d7199c5b4e865d60b0e39f5cd5101fbf60b57.json +++ b/server/.sqlx/query-4d348877f9b1058c5f22c64379476276bc40da2f1fda506e3de1bfac51947cde.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n DELETE FROM transactions\n WHERE account_id IN (SELECT id FROM accessible_accounts($1))\n AND id = $2\n RETURNING id, account_id, amount_cents, direction, date, description\n ", + "query": "\n DELETE FROM transactions\n WHERE account_id IN (SELECT id FROM accessible_accounts($1))\n AND id = $2\n RETURNING id, account_id, amount_cents, direction, date, description\n ", "describe": { "columns": [ { @@ -85,5 +85,5 @@ false ] }, - "hash": "445ce23e4d76c2311b18c2a44d8d7199c5b4e865d60b0e39f5cd5101fbf60b57" + "hash": "4d348877f9b1058c5f22c64379476276bc40da2f1fda506e3de1bfac51947cde" } diff --git a/server/.sqlx/query-890fe7a4664375bbe9095f5ecf1d629e87fb8c84450fae7ba1fd3b145ffbcf0a.json b/server/.sqlx/query-627f0b5cca9c9a70441454f5ba0cd45d2c6e306737febc7f3a0c2e73148ade76.json similarity index 85% rename from server/.sqlx/query-890fe7a4664375bbe9095f5ecf1d629e87fb8c84450fae7ba1fd3b145ffbcf0a.json rename to server/.sqlx/query-627f0b5cca9c9a70441454f5ba0cd45d2c6e306737febc7f3a0c2e73148ade76.json index f7b22e3..8b8df90 100644 --- a/server/.sqlx/query-890fe7a4664375bbe9095f5ecf1d629e87fb8c84450fae7ba1fd3b145ffbcf0a.json +++ b/server/.sqlx/query-627f0b5cca9c9a70441454f5ba0cd45d2c6e306737febc7f3a0c2e73148ade76.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n DELETE FROM account_members\n WHERE account_id IN (SELECT id FROM accessible_accounts($1))\n AND account_id = $2\n AND id = $3\n RETURNING id, account_id, user_id\n ", + "query": "\n DELETE FROM account_members\n WHERE account_id IN (SELECT id FROM accessible_accounts($1))\n AND account_id = $2\n AND id = $3\n RETURNING id, account_id, user_id\n ", "describe": { "columns": [ { @@ -50,5 +50,5 @@ false ] }, - "hash": "890fe7a4664375bbe9095f5ecf1d629e87fb8c84450fae7ba1fd3b145ffbcf0a" + "hash": "627f0b5cca9c9a70441454f5ba0cd45d2c6e306737febc7f3a0c2e73148ade76" } diff --git a/server/.sqlx/query-f20997bae03ef093e34de765f0ee766aaf00426de6b978ee6957f9b8a00daeae.json b/server/.sqlx/query-635bccdb4faf5dede694bb6ad51e7894a1641ea6c37f2abe230de264715e2390.json similarity index 75% rename from server/.sqlx/query-f20997bae03ef093e34de765f0ee766aaf00426de6b978ee6957f9b8a00daeae.json rename to server/.sqlx/query-635bccdb4faf5dede694bb6ad51e7894a1641ea6c37f2abe230de264715e2390.json index 44507bb..839bc77 100644 --- a/server/.sqlx/query-f20997bae03ef093e34de765f0ee766aaf00426de6b978ee6957f9b8a00daeae.json +++ b/server/.sqlx/query-635bccdb4faf5dede694bb6ad51e7894a1641ea6c37f2abe230de264715e2390.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "SELECT id, user_id FROM user_apps WHERE user_id = $1 AND id = $2", + "query": "\n DELETE FROM user_apps\n WHERE user_id = $1 AND id = $2\n RETURNING id, user_id\n ", "describe": { "columns": [ { @@ -37,5 +37,5 @@ false ] }, - "hash": "f20997bae03ef093e34de765f0ee766aaf00426de6b978ee6957f9b8a00daeae" + "hash": "635bccdb4faf5dede694bb6ad51e7894a1641ea6c37f2abe230de264715e2390" } diff --git a/server/.sqlx/query-768ccffe4387ae725e2e2ab1f5544f7536d0b7c0c657aa87dc7539dcdbbc5014.json b/server/.sqlx/query-768ccffe4387ae725e2e2ab1f5544f7536d0b7c0c657aa87dc7539dcdbbc5014.json new file mode 100644 index 0000000..2612a28 --- /dev/null +++ b/server/.sqlx/query-768ccffe4387ae725e2e2ab1f5544f7536d0b7c0c657aa87dc7539dcdbbc5014.json @@ -0,0 +1,23 @@ +{ + "db_name": "PostgreSQL", + "query": "\n INSERT INTO tokens (\n id,\n user_id,\n user_app_id,\n access_token_hash,\n refresh_token_hash,\n access_expires_at,\n refresh_expires_at,\n refreshed_at,\n revoked_at,\n created_at\n )\n VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid", + "Uuid", + "Uuid", + "Bytea", + "Bytea", + "Timestamptz", + "Timestamptz", + "Timestamptz", + "Timestamptz", + "Timestamptz" + ] + }, + "nullable": [] + }, + "hash": "768ccffe4387ae725e2e2ab1f5544f7536d0b7c0c657aa87dc7539dcdbbc5014" +} diff --git a/server/.sqlx/query-1ad543cbedd620af3577784a64af86ce591b4e1cc695b286baff424d8032e3fb.json b/server/.sqlx/query-9427a4738d4658bb38141bdd6d6a0140ff8585b90ac6cb85e27401f87d572f2d.json similarity index 86% rename from server/.sqlx/query-1ad543cbedd620af3577784a64af86ce591b4e1cc695b286baff424d8032e3fb.json rename to server/.sqlx/query-9427a4738d4658bb38141bdd6d6a0140ff8585b90ac6cb85e27401f87d572f2d.json index 7322dee..af2fac6 100644 --- a/server/.sqlx/query-1ad543cbedd620af3577784a64af86ce591b4e1cc695b286baff424d8032e3fb.json +++ b/server/.sqlx/query-9427a4738d4658bb38141bdd6d6a0140ff8585b90ac6cb85e27401f87d572f2d.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n SELECT id, app_id, secret_hash, expires_at, created_at\n FROM user_app_secrets\n WHERE app_id IN (SELECT id FROM user_apps WHERE user_id = $1)\n AND app_id = $2\n ORDER BY created_at DESC, id DESC\n LIMIT $3\n OFFSET $4\n ", + "query": "\n SELECT id, app_id, secret_hash, expires_at, created_at\n FROM user_app_secrets\n WHERE app_id IN (SELECT id FROM user_apps WHERE user_id = $1)\n AND app_id = $2\n ORDER BY created_at DESC, id DESC\n LIMIT $3\n OFFSET $4\n ", "describe": { "columns": [ { @@ -75,5 +75,5 @@ false ] }, - "hash": "1ad543cbedd620af3577784a64af86ce591b4e1cc695b286baff424d8032e3fb" + "hash": "9427a4738d4658bb38141bdd6d6a0140ff8585b90ac6cb85e27401f87d572f2d" } diff --git a/server/.sqlx/query-58327aa90726e98d2f31a5178c611b22b3177ea71f812c9f53e4164f22cd1f8a.json b/server/.sqlx/query-979e0f8da81ddcc7a89b270f927504defeee5490f63061270b5deee3254c842e.json similarity index 68% rename from server/.sqlx/query-58327aa90726e98d2f31a5178c611b22b3177ea71f812c9f53e4164f22cd1f8a.json rename to server/.sqlx/query-979e0f8da81ddcc7a89b270f927504defeee5490f63061270b5deee3254c842e.json index 46cfe31..ae93361 100644 --- a/server/.sqlx/query-58327aa90726e98d2f31a5178c611b22b3177ea71f812c9f53e4164f22cd1f8a.json +++ b/server/.sqlx/query-979e0f8da81ddcc7a89b270f927504defeee5490f63061270b5deee3254c842e.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "DELETE FROM users WHERE id = $1 RETURNING id", + "query": "\n DELETE FROM users\n WHERE id = $1\n RETURNING id\n ", "describe": { "columns": [ { @@ -24,5 +24,5 @@ false ] }, - "hash": "58327aa90726e98d2f31a5178c611b22b3177ea71f812c9f53e4164f22cd1f8a" + "hash": "979e0f8da81ddcc7a89b270f927504defeee5490f63061270b5deee3254c842e" } diff --git a/server/.sqlx/query-ccf33164a136215b0ef86da0ed5221088a3fc976be89c502abb63570e0c2380c.json b/server/.sqlx/query-a4f47fa48d44b0239289b75d1f5adac86afc0498ca2e27562557f505cd96b2bf.json similarity index 79% rename from server/.sqlx/query-ccf33164a136215b0ef86da0ed5221088a3fc976be89c502abb63570e0c2380c.json rename to server/.sqlx/query-a4f47fa48d44b0239289b75d1f5adac86afc0498ca2e27562557f505cd96b2bf.json index f400b09..61a4e1a 100644 --- a/server/.sqlx/query-ccf33164a136215b0ef86da0ed5221088a3fc976be89c502abb63570e0c2380c.json +++ b/server/.sqlx/query-a4f47fa48d44b0239289b75d1f5adac86afc0498ca2e27562557f505cd96b2bf.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n\t\tSELECT id, name\n\t\tFROM accounts\n\t\tWHERE id = $2\n\t\tAND id IN (SELECT id FROM accessible_accounts($1))\n\t\tFOR NO KEY UPDATE\n\t\t", + "query": "\n\t\tSELECT id, name\n\t\tFROM accounts\n\t\tWHERE id IN (SELECT id FROM accessible_accounts($1))\n AND id = $2\n\t\tFOR NO KEY UPDATE\n\t\t", "describe": { "columns": [ { @@ -37,5 +37,5 @@ false ] }, - "hash": "ccf33164a136215b0ef86da0ed5221088a3fc976be89c502abb63570e0c2380c" + "hash": "a4f47fa48d44b0239289b75d1f5adac86afc0498ca2e27562557f505cd96b2bf" } diff --git a/server/.sqlx/query-d1774b1ccd955a93433e1149be03fad7ab09afd5eaa67a87e042b26d0a52e450.json b/server/.sqlx/query-a8df8db87ec64af8ce5767483095f3fbfc34ed1551e0bc722629335609299cd6.json similarity index 81% rename from server/.sqlx/query-d1774b1ccd955a93433e1149be03fad7ab09afd5eaa67a87e042b26d0a52e450.json rename to server/.sqlx/query-a8df8db87ec64af8ce5767483095f3fbfc34ed1551e0bc722629335609299cd6.json index 64caeec..d86ec59 100644 --- a/server/.sqlx/query-d1774b1ccd955a93433e1149be03fad7ab09afd5eaa67a87e042b26d0a52e450.json +++ b/server/.sqlx/query-a8df8db87ec64af8ce5767483095f3fbfc34ed1551e0bc722629335609299cd6.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n\t\tDELETE FROM accounts\n\t\tWHERE id IN (SELECT id FROM accessible_accounts($1))\n\t\tAND id = $2\n\t\tRETURNING id, name\n\t\t", + "query": "\n\t\tDELETE FROM accounts\n\t\tWHERE id IN (SELECT id FROM accessible_accounts($1))\n\t\t AND id = $2\n\t\tRETURNING id, name\n\t\t", "describe": { "columns": [ { @@ -37,5 +37,5 @@ false ] }, - "hash": "d1774b1ccd955a93433e1149be03fad7ab09afd5eaa67a87e042b26d0a52e450" + "hash": "a8df8db87ec64af8ce5767483095f3fbfc34ed1551e0bc722629335609299cd6" } diff --git a/server/.sqlx/query-d5a336eff7f8927f93074d8b8524e7232fed59f715420b864b11938c05f65560.json b/server/.sqlx/query-bda4a0c1d3a770cb99f5d08970b56fc0b492aac6b909a9ae4577f401b53abc98.json similarity index 85% rename from server/.sqlx/query-d5a336eff7f8927f93074d8b8524e7232fed59f715420b864b11938c05f65560.json rename to server/.sqlx/query-bda4a0c1d3a770cb99f5d08970b56fc0b492aac6b909a9ae4577f401b53abc98.json index 1719a32..815601d 100644 --- a/server/.sqlx/query-d5a336eff7f8927f93074d8b8524e7232fed59f715420b864b11938c05f65560.json +++ b/server/.sqlx/query-bda4a0c1d3a770cb99f5d08970b56fc0b492aac6b909a9ae4577f401b53abc98.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n SELECT id, account_id, user_id\n FROM account_members\n WHERE account_id IN (SELECT id FROM accessible_accounts($1))\n AND account_id = $2\n AND id = $3\n ", + "query": "\n SELECT id, account_id, user_id\n FROM account_members\n WHERE account_id IN (SELECT id FROM accessible_accounts($1))\n AND account_id = $2\n AND id = $3\n ", "describe": { "columns": [ { @@ -50,5 +50,5 @@ false ] }, - "hash": "d5a336eff7f8927f93074d8b8524e7232fed59f715420b864b11938c05f65560" + "hash": "bda4a0c1d3a770cb99f5d08970b56fc0b492aac6b909a9ae4577f401b53abc98" } diff --git a/server/.sqlx/query-9f08c5205c1efd98080544b60a13c9452ff9082d851bc29de182a5871ebcbabd.json b/server/.sqlx/query-c63f403f24c69c83483086a382840714b4361d017a3b7d18be094609cba65074.json similarity index 88% rename from server/.sqlx/query-9f08c5205c1efd98080544b60a13c9452ff9082d851bc29de182a5871ebcbabd.json rename to server/.sqlx/query-c63f403f24c69c83483086a382840714b4361d017a3b7d18be094609cba65074.json index eb2649e..b8c6a8b 100644 --- a/server/.sqlx/query-9f08c5205c1efd98080544b60a13c9452ff9082d851bc29de182a5871ebcbabd.json +++ b/server/.sqlx/query-c63f403f24c69c83483086a382840714b4361d017a3b7d18be094609cba65074.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n DELETE FROM user_app_secrets\n WHERE app_id IN (SELECT id FROM user_apps WHERE user_id = $1)\n AND app_id = $2\n AND id = $3\n RETURNING id, app_id, secret_hash, expires_at, created_at\n ", + "query": "\n DELETE FROM user_app_secrets\n WHERE app_id IN (SELECT id FROM user_apps WHERE user_id = $1)\n AND app_id = $2\n AND id = $3\n RETURNING id, app_id, secret_hash, expires_at, created_at\n ", "describe": { "columns": [ { @@ -74,5 +74,5 @@ false ] }, - "hash": "9f08c5205c1efd98080544b60a13c9452ff9082d851bc29de182a5871ebcbabd" + "hash": "c63f403f24c69c83483086a382840714b4361d017a3b7d18be094609cba65074" } diff --git a/server/.sqlx/query-88aa0cea999dcc4ddb0217535b7b3aa13e5d64a0914b2eab27a71c12c37043e9.json b/server/.sqlx/query-ebbb7257f06c34e3cc9bbb1c65e4e8f57a2a00c894285531f6449a47934d2f18.json similarity index 83% rename from server/.sqlx/query-88aa0cea999dcc4ddb0217535b7b3aa13e5d64a0914b2eab27a71c12c37043e9.json rename to server/.sqlx/query-ebbb7257f06c34e3cc9bbb1c65e4e8f57a2a00c894285531f6449a47934d2f18.json index 53f4d67..627ae6d 100644 --- a/server/.sqlx/query-88aa0cea999dcc4ddb0217535b7b3aa13e5d64a0914b2eab27a71c12c37043e9.json +++ b/server/.sqlx/query-ebbb7257f06c34e3cc9bbb1c65e4e8f57a2a00c894285531f6449a47934d2f18.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n SELECT id, account_id, user_id\n FROM account_members\n WHERE account_id IN (SELECT id FROM accessible_accounts($1))\n AND account_id = $2\n ORDER BY id\n LIMIT $3\n OFFSET $4\n ", + "query": "\n SELECT id, account_id, user_id\n FROM account_members\n WHERE account_id IN (SELECT id FROM accessible_accounts($1))\n AND account_id = $2\n ORDER BY id\n LIMIT $3\n OFFSET $4\n ", "describe": { "columns": [ { @@ -51,5 +51,5 @@ false ] }, - "hash": "88aa0cea999dcc4ddb0217535b7b3aa13e5d64a0914b2eab27a71c12c37043e9" + "hash": "ebbb7257f06c34e3cc9bbb1c65e4e8f57a2a00c894285531f6449a47934d2f18" } diff --git a/server/.sqlx/query-f448274b39bb13ec500a7634fab177916a194192f3ea14f8439bd42c467844a0.json b/server/.sqlx/query-f448274b39bb13ec500a7634fab177916a194192f3ea14f8439bd42c467844a0.json deleted file mode 100644 index 6c77589..0000000 --- a/server/.sqlx/query-f448274b39bb13ec500a7634fab177916a194192f3ea14f8439bd42c467844a0.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "\n INSERT INTO tokens (\n id, user_id, user_app_id, access_token_hash, refresh_token_hash,\n access_expires_at, refresh_expires_at, refreshed_at, revoked_at, created_at\n )\n VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)\n ", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Uuid", - "Uuid", - "Uuid", - "Bytea", - "Bytea", - "Timestamptz", - "Timestamptz", - "Timestamptz", - "Timestamptz", - "Timestamptz" - ] - }, - "nullable": [] - }, - "hash": "f448274b39bb13ec500a7634fab177916a194192f3ea14f8439bd42c467844a0" -} diff --git a/server/.sqlx/query-cb4d0185f7464e4c7e6f4e0cb6bc40be6a56076c88d8356bf034838f1e22f2e3.json b/server/.sqlx/query-f9df44bb80677e69ed45d496b6d5f164afa3e8932a1102eb1b0a8e8b545f3f07.json similarity index 96% rename from server/.sqlx/query-cb4d0185f7464e4c7e6f4e0cb6bc40be6a56076c88d8356bf034838f1e22f2e3.json rename to server/.sqlx/query-f9df44bb80677e69ed45d496b6d5f164afa3e8932a1102eb1b0a8e8b545f3f07.json index 2129127..7f0d2f4 100644 --- a/server/.sqlx/query-cb4d0185f7464e4c7e6f4e0cb6bc40be6a56076c88d8356bf034838f1e22f2e3.json +++ b/server/.sqlx/query-f9df44bb80677e69ed45d496b6d5f164afa3e8932a1102eb1b0a8e8b545f3f07.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n SELECT\n id,\n name,\n account_id,\n amount_cents,\n direction,\n starts_at,\n ends_at,\n recurrence_every,\n recurrence_unit,\n weekend_adjustment\n FROM recurring_transactions\n WHERE account_id IN (SELECT id FROM accessible_accounts($1))\n AND id = $2\n ", + "query": "\n SELECT\n id,\n name,\n account_id,\n amount_cents,\n direction,\n starts_at,\n ends_at,\n recurrence_every,\n recurrence_unit,\n weekend_adjustment\n FROM recurring_transactions\n WHERE account_id IN (SELECT id FROM accessible_accounts($1))\n AND id = $2\n ", "describe": { "columns": [ { @@ -133,5 +133,5 @@ true ] }, - "hash": "cb4d0185f7464e4c7e6f4e0cb6bc40be6a56076c88d8356bf034838f1e22f2e3" + "hash": "f9df44bb80677e69ed45d496b6d5f164afa3e8932a1102eb1b0a8e8b545f3f07" } diff --git a/server/.sqlx/query-ee6d6a2b689fc47af3d9702fd51c8c3cb30f1b496d03b748d24eb3bd854f4622.json b/server/.sqlx/query-fb40ed4132cb8ea06d1b0460b1be658cb1e920acbdd728f6cb12940f2cd8edef.json similarity index 77% rename from server/.sqlx/query-ee6d6a2b689fc47af3d9702fd51c8c3cb30f1b496d03b748d24eb3bd854f4622.json rename to server/.sqlx/query-fb40ed4132cb8ea06d1b0460b1be658cb1e920acbdd728f6cb12940f2cd8edef.json index a86c354..9307815 100644 --- a/server/.sqlx/query-ee6d6a2b689fc47af3d9702fd51c8c3cb30f1b496d03b748d24eb3bd854f4622.json +++ b/server/.sqlx/query-fb40ed4132cb8ea06d1b0460b1be658cb1e920acbdd728f6cb12940f2cd8edef.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "SELECT id, user_id FROM user_apps WHERE id = $1", + "query": "\n SELECT id, user_id\n FROM user_apps\n WHERE id = $1\n ", "describe": { "columns": [ { @@ -36,5 +36,5 @@ false ] }, - "hash": "ee6d6a2b689fc47af3d9702fd51c8c3cb30f1b496d03b748d24eb3bd854f4622" + "hash": "fb40ed4132cb8ea06d1b0460b1be658cb1e920acbdd728f6cb12940f2cd8edef" } diff --git a/server/src/database/account_members.rs b/server/src/database/account_members.rs index fc3b01c..ca34537 100644 --- a/server/src/database/account_members.rs +++ b/server/src/database/account_members.rs @@ -25,7 +25,7 @@ where SELECT id, account_id, user_id FROM account_members WHERE account_id IN (SELECT id FROM accessible_accounts($1)) - AND account_id = $2 + AND account_id = $2 ORDER BY id LIMIT $3 OFFSET $4 @@ -55,8 +55,8 @@ where SELECT id, account_id, user_id FROM account_members WHERE account_id IN (SELECT id FROM accessible_accounts($1)) - AND account_id = $2 - AND id = $3 + AND account_id = $2 + AND id = $3 "#, user_id, account_id, @@ -164,8 +164,8 @@ where r#" DELETE FROM account_members WHERE account_id IN (SELECT id FROM accessible_accounts($1)) - AND account_id = $2 - AND id = $3 + AND account_id = $2 + AND id = $3 RETURNING id, account_id, user_id "#, user_id, diff --git a/server/src/database/accounts.rs b/server/src/database/accounts.rs index efc58b6..fc68d44 100644 --- a/server/src/database/accounts.rs +++ b/server/src/database/accounts.rs @@ -78,8 +78,8 @@ where r#" SELECT id, name FROM accounts - WHERE id = $2 - AND id IN (SELECT id FROM accessible_accounts($1)) + WHERE id IN (SELECT id FROM accessible_accounts($1)) + AND id = $2 FOR NO KEY UPDATE "#, user_id, @@ -178,7 +178,7 @@ where r#" DELETE FROM accounts WHERE id IN (SELECT id FROM accessible_accounts($1)) - AND id = $2 + AND id = $2 RETURNING id, name "#, user_id, diff --git a/server/src/database/recurring_transactions.rs b/server/src/database/recurring_transactions.rs index fcd1e70..a871492 100644 --- a/server/src/database/recurring_transactions.rs +++ b/server/src/database/recurring_transactions.rs @@ -70,7 +70,7 @@ where weekend_adjustment FROM recurring_transactions WHERE account_id IN (SELECT id FROM accessible_accounts($1)) - AND id = $2 + AND id = $2 "#, user_id, id, @@ -207,7 +207,7 @@ where r#" DELETE FROM recurring_transactions WHERE account_id IN (SELECT id FROM accessible_accounts($1)) - AND id = $2 + AND id = $2 RETURNING id, name, diff --git a/server/src/database/tokens.rs b/server/src/database/tokens.rs index b178e0c..ec90e9c 100644 --- a/server/src/database/tokens.rs +++ b/server/src/database/tokens.rs @@ -44,8 +44,16 @@ where sqlx::query!( r#" INSERT INTO tokens ( - id, user_id, user_app_id, access_token_hash, refresh_token_hash, - access_expires_at, refresh_expires_at, refreshed_at, revoked_at, created_at + id, + user_id, + user_app_id, + access_token_hash, + refresh_token_hash, + access_expires_at, + refresh_expires_at, + refreshed_at, + revoked_at, + created_at ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) "#, diff --git a/server/src/database/transactions.rs b/server/src/database/transactions.rs index 8cd23f7..eb5aa30 100644 --- a/server/src/database/transactions.rs +++ b/server/src/database/transactions.rs @@ -51,7 +51,7 @@ where SELECT id, account_id, amount_cents, direction, date, description FROM transactions WHERE account_id IN (SELECT id FROM accessible_accounts($1)) - AND id = $2 + AND id = $2 "#, user_id, id, @@ -152,7 +152,7 @@ where r#" DELETE FROM transactions WHERE account_id IN (SELECT id FROM accessible_accounts($1)) - AND id = $2 + AND id = $2 RETURNING id, account_id, amount_cents, direction, date, description "#, user_id, diff --git a/server/src/database/user_app_secrets.rs b/server/src/database/user_app_secrets.rs index a65dc47..d96bceb 100644 --- a/server/src/database/user_app_secrets.rs +++ b/server/src/database/user_app_secrets.rs @@ -25,7 +25,7 @@ where SELECT id, app_id, secret_hash, expires_at, created_at FROM user_app_secrets WHERE app_id IN (SELECT id FROM user_apps WHERE user_id = $1) - AND app_id = $2 + AND app_id = $2 ORDER BY created_at DESC, id DESC LIMIT $3 OFFSET $4 @@ -55,8 +55,8 @@ where SELECT id, app_id, secret_hash, expires_at, created_at FROM user_app_secrets WHERE app_id IN (SELECT id FROM user_apps WHERE user_id = $1) - AND app_id = $2 - AND id = $3 + AND app_id = $2 + AND id = $3 "#, user_id, app_id, @@ -143,7 +143,7 @@ pub async fn verify<'e, E>( where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { - sqlx::query_scalar!( + let is_valid = sqlx::query_scalar!( r#" SELECT EXISTS ( SELECT 1 @@ -156,7 +156,9 @@ where ) .fetch_one(executor) .await - .map_err(DatabaseError::from) + .map_err(DatabaseError::from)?; + + Ok(is_valid) } pub async fn delete_by_id<'e, E>( @@ -173,8 +175,8 @@ where r#" DELETE FROM user_app_secrets WHERE app_id IN (SELECT id FROM user_apps WHERE user_id = $1) - AND app_id = $2 - AND id = $3 + AND app_id = $2 + AND id = $3 RETURNING id, app_id, secret_hash, expires_at, created_at "#, user_id, diff --git a/server/src/database/user_apps.rs b/server/src/database/user_apps.rs index 575dde2..91fbb1c 100644 --- a/server/src/database/user_apps.rs +++ b/server/src/database/user_apps.rs @@ -47,7 +47,11 @@ where { sqlx::query_as!( UserAppRow, - "SELECT id, user_id FROM user_apps WHERE user_id = $1 AND id = $2", + r#" + SELECT id, user_id + FROM user_apps + WHERE user_id = $1 AND id = $2 + "#, user_id, id, ) @@ -65,7 +69,11 @@ where { sqlx::query_as!( UserAppRow, - "SELECT id, user_id FROM user_apps WHERE id = $1", + r#" + SELECT id, user_id + FROM user_apps + WHERE id = $1 + "#, id, ) .fetch_optional(executor) @@ -132,7 +140,11 @@ where { sqlx::query_as!( UserAppRow, - "DELETE FROM user_apps WHERE user_id = $1 AND id = $2 RETURNING id, user_id", + r#" + DELETE FROM user_apps + WHERE user_id = $1 AND id = $2 + RETURNING id, user_id + "#, user_id, id, ) diff --git a/server/src/database/users.rs b/server/src/database/users.rs index 92db687..084b25e 100644 --- a/server/src/database/users.rs +++ b/server/src/database/users.rs @@ -79,8 +79,16 @@ pub async fn delete_by_id<'e, E>(executor: E, id: Uuid) -> Result, { - sqlx::query_as!(UserRow, "DELETE FROM users WHERE id = $1 RETURNING id", id) - .fetch_optional(executor) - .await - .map_err(DatabaseError::from) + sqlx::query_as!( + UserRow, + r#" + DELETE FROM users + WHERE id = $1 + RETURNING id + "#, + id + ) + .fetch_optional(executor) + .await + .map_err(DatabaseError::from) } diff --git a/server/src/repository/tokens.rs b/server/src/repository/tokens.rs index af5ad67..bc5958c 100644 --- a/server/src/repository/tokens.rs +++ b/server/src/repository/tokens.rs @@ -25,7 +25,9 @@ pub async fn issue<'e, E>(executor: E, token: Token) -> Result<(), RepositoryErr where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { - Ok(db::issue(executor, encode(token)).await?) + db::issue(executor, encode(token)).await?; + + Ok(()) } pub async fn rotate_refresh_token<'e, E>( @@ -39,7 +41,7 @@ pub async fn rotate_refresh_token<'e, E>( where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { - Ok(db::rotate_refresh_token( + let rotated = db::rotate_refresh_token( executor, old_refresh_hash, access_token_hash, @@ -47,14 +49,18 @@ where access_expires_at, refresh_expires_at, ) - .await?) + .await?; + + Ok(rotated) } pub async fn revoke<'e, E>(executor: E, token_hash: &[u8]) -> Result<(), RepositoryError> where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { - Ok(db::revoke(executor, token_hash).await?) + db::revoke(executor, token_hash).await?; + + Ok(()) } fn decode(token: TokenRow) -> Result { diff --git a/server/src/repository/user_app_secrets.rs b/server/src/repository/user_app_secrets.rs index 5e6ecbf..79b474a 100644 --- a/server/src/repository/user_app_secrets.rs +++ b/server/src/repository/user_app_secrets.rs @@ -100,9 +100,9 @@ pub async fn verify<'e, E>( where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { - let result = db::verify(executor, app_id, secret_hash).await?; + let is_valid = db::verify(executor, app_id, secret_hash).await?; - Ok(result) + Ok(is_valid) } pub async fn delete_by_id<'e, E>( diff --git a/server/src/routes/auth_token.rs b/server/src/routes/auth_token.rs index c0451d1..46f9063 100644 --- a/server/src/routes/auth_token.rs +++ b/server/src/routes/auth_token.rs @@ -37,28 +37,15 @@ async fn issue_token( let secret_hash = hash_secret(&client_secret); let generated = generate_token_pair()?; - let mut tx = pool - .begin() - .await - .map_err(repository::RepositoryError::from)?; - - if !repository::user_app_secrets::verify(&mut *tx, client_id, &secret_hash).await? { + if !repository::user_app_secrets::verify(&pool, client_id, &secret_hash).await? { return Err(AppError::InvalidClientCredentials); } - let user_app = repository::user_apps::get_by_id_unscoped(&mut *tx, client_id) + let app = repository::user_apps::get_by_id_unscoped(&pool, client_id) .await? .ok_or(AppError::InvalidClientCredentials)?; - repository::tokens::issue( - &mut *tx, - token(user_app.user_id, Some(user_app.id), &generated), - ) - .await?; - - tx.commit() - .await - .map_err(repository::RepositoryError::from)?; + repository::tokens::issue(&pool, token(app.user_id, Some(app.id), &generated)).await?; Ok(Json(token_response( generated.access_token, @@ -66,27 +53,21 @@ async fn issue_token( ))) } TokenRequest::RefreshToken { refresh_token } => { - let generated = generate_token_pair()?; let old_refresh_hash = hash_secret(&refresh_token); - let mut tx = pool - .begin() - .await - .map_err(repository::RepositoryError::from)?; - let rotated = repository::tokens::rotate_refresh_token( - &mut *tx, + let generated = generate_token_pair()?; + + if !repository::tokens::rotate_refresh_token( + &pool, &old_refresh_hash, &generated.access_token_hash, &generated.refresh_token_hash, generated.access_expires_at, generated.refresh_expires_at, ) - .await?; - if !rotated { + .await? + { return Err(AppError::InvalidRefreshToken); } - tx.commit() - .await - .map_err(repository::RepositoryError::from)?; Ok(Json(token_response( generated.access_token, @@ -102,7 +83,11 @@ async fn revoke_token( State(pool): State, Form(request): Form, ) -> Result<(), AppError> { - Ok(repository::tokens::revoke(&pool, &hash_secret(&request.token)).await?) + let token_hash = hash_secret(&request.token); + + repository::tokens::revoke(&pool, &token_hash).await?; + + Ok(()) } struct TokenPair {