[server] Use username instead of userid and email

This commit is contained in:
Abhishek Shroff
2024-09-17 11:42:14 +05:30
parent 32a013e053
commit e913999aa7
22 changed files with 144 additions and 229 deletions
+3 -3
View File
@@ -1,9 +1,9 @@
-- name: AccessTokenById :one
SELECT * FROM access_tokens t JOIN users u ON t.user_id = u.id WHERE t.id = $1;
SELECT * FROM access_tokens t JOIN users u ON t.username = u.username WHERE t.id = $1;
-- name: InsertAccessToken :one
INSERT INTO access_tokens(
id, created, expires, user_id
id, expires, username
) VALUES(
@id::text, NOW(), NOW() + @validity::interval, @user_id::int
@id::text, NOW() + @validity::interval, @username::text
) RETURNING *;
+2 -2
View File
@@ -47,10 +47,10 @@ WITH RECURSIVE nodes(resid, id, parent, inherited_permissions, found) AS (
JOIN nodes n
ON r.id = n.parent
)
SELECT resid AS id, r.permissions, n.inherited_permissions, COALESCE((jsonb_bitwise_or(r.permissions, n.inherited_permissions)->((@user_id::int)::text))::int, 0)::int AS user_permission, found, r.parent, name, dir, created, modified, deleted, size, sha256sum FROM nodes n
SELECT resid AS id, r.permissions, n.inherited_permissions, COALESCE((jsonb_bitwise_or(r.permissions, n.inherited_permissions)->(@username::text))::int, 0)::int AS user_permission, found, r.parent, name, dir, created, modified, deleted, size, sha256sum FROM nodes n
JOIN resources r
ON r.id = n.resid
WHERE n.parent IS NULL;
-- name: UpdatePermissionsForResource :exec
UPDATE resources SET permissions[@user_id::int] = to_json(@permission::int) WHERE id = @resource_id::uuid;
UPDATE resources SET permissions[@username::text] = to_json(@permission::int) WHERE id = @resource_id::uuid;
+3 -3
View File
@@ -1,8 +1,8 @@
-- name: CreateResource :one
INSERT INTO resources(
id, parent, name, dir, created, modified
id, parent, name, dir
) VALUES (
$1, $2, $3, $4, NOW(), NOW()
$1, $2, $3, $4
) RETURNING *;
-- name: UpdateResourceContents :exec
@@ -65,4 +65,4 @@ WHERE id in (SELECT id FROM nodes)
RETURNING id;
-- name: SharedResources :many
SELECT * FROM resources where permissions ? (@user_id::int)::text AND id <> @user_home::uuid AND deleted IS NULL;
SELECT * FROM resources where permissions ? @username::text AND id <> @user_home::uuid AND deleted IS NULL;
+8 -12
View File
@@ -1,15 +1,12 @@
-- name: CreateUser :one
INSERT INTO users(
email, created, modified, display_name, password_hash, root, home
username, display_name, password_hash, root, home
) VALUES (
$1, NOW(), NOW(), $2, $3, $4, $5
$1, $2, $3, $4, $5
) RETURNING *;
-- name: UserByEmail :one
SELECT * from users WHERE email = $1;
-- name: UserByID :one
SELECT * from users WHERE id = $1;
-- name: UserByUsername :one
SELECT * from users WHERE username = $1;
-- name: ListUsers :many
SELECT * from users WHERE deleted IS NULL;
@@ -19,26 +16,25 @@ UPDATE users
SET
display_name = $1,
modified = NOW()
WHERE id = $2;
WHERE username = $2;
-- name: UpdateUserPasswordHash :exec
UPDATE users
SET
password_hash = $1,
modified = NOW()
WHERE id = $2;
WHERE username = $2;
-- name: UpdateUserRoot :exec
UPDATE users
SET
root = $1,
modified = NOW()
WHERE id = $2;
WHERE username = $2;
-- name: UpdateUserHome :exec
UPDATE users
SET
home = $1,
modified = NOW()
WHERE id = $2;
WHERE username = $2;