V3 S6 : confiance (révocation, quota, appareils, conflits) + import + onboarding
Backend : token_version (000022, claim tv, 401 si révoqué, bump au password — fin limite V1), quota (000023 idempotente, colonne héritée de 000001, 413 QUOTA_EXCEEDED, GET /users/me/usage), devices (GET + DELETE révocation, EnforceDeviceExists en prod), renames concurrents transparents (baseUpdatedAt + conflicts[] non-fataux, tolérance 2 s). Tests service + handlers + migrations + auth. Mobile : pipeline conflits (DTO + SyncConflictStore + worker + dialogue), baseUpdatedAt prêt, liens 7j par défaut, écran Appareils (+ quota), import classeur unifié (scan/note/dossier), onboarding cercle Famille. Contrat docs/api-v1.md, V3.md (S6 livré).
This commit is contained in:
@@ -52,3 +52,61 @@ func (d *Devices) MarkUser(deviceID, userID string) error {
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// DeviceRow is one registered device of an account (A1 — voir / révoquer).
|
||||
type DeviceRow struct {
|
||||
DeviceID string
|
||||
LastSeenAt *int64 // ms epoch, NULL si jamais vu depuis l'enregistrement
|
||||
}
|
||||
|
||||
// ListByUser returns the devices whose last login was this account
|
||||
// (devices.user_id informatif, jamais autorisant).
|
||||
func (d *Devices) ListByUser(userID string) ([]DeviceRow, error) {
|
||||
rows, err := d.DB.Query(
|
||||
`SELECT device_id, (EXTRACT(EPOCH FROM last_seen_at) * 1000)::bigint
|
||||
FROM devices WHERE user_id = $1 ORDER BY last_seen_at DESC NULLS LAST`,
|
||||
userID,
|
||||
)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
out := []DeviceRow{}
|
||||
for rows.Next() {
|
||||
var row DeviceRow
|
||||
if err := rows.Scan(&row.DeviceID, &row.LastSeenAt); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
out = append(out, row)
|
||||
}
|
||||
return out, rows.Err()
|
||||
}
|
||||
|
||||
// Revoke deletes a device registration of this account (A1 — téléphone
|
||||
// perdu). Avec EnforceDeviceExists, les tokens du device deviennent 401 et
|
||||
// le login refuse le device (ré-enregistrement explicite requis).
|
||||
// Ligne absente ou d'un autre compte → ErrNotFound (pas d'énumération).
|
||||
// Les hints de présence (`storage_locations`) suivent.
|
||||
func (d *Devices) Revoke(userID, deviceID string) error {
|
||||
result, err := d.DB.Exec(
|
||||
`DELETE FROM devices WHERE device_id = $1 AND user_id = $2`,
|
||||
deviceID, userID,
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
affected, err := result.RowsAffected()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if affected == 0 {
|
||||
return ErrNotFound
|
||||
}
|
||||
if _, err := d.DB.Exec(
|
||||
`DELETE FROM storage_locations WHERE device_id = $1 AND user_id = $2`,
|
||||
deviceID, userID,
|
||||
); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -124,6 +124,39 @@ func (r *Resources) ListMissingHashes(limit int) ([]MissingHash, error) {
|
||||
return out, rows.Err()
|
||||
}
|
||||
|
||||
// StorageUsage aggregates a user's footprint (V3 S6 A2 — calculé, jamais
|
||||
// stocké). Les trashés sont exclus (octets récupérables à la purge).
|
||||
type StorageUsage struct {
|
||||
UsedBytes int64
|
||||
FileCount int
|
||||
TrashCount int
|
||||
TrashedBytes int64
|
||||
}
|
||||
|
||||
// StorageUsage sums live file bytes + counts (live + trashed) for a user.
|
||||
func (r *Resources) StorageUsage(ownerID string) (StorageUsage, error) {
|
||||
var u StorageUsage
|
||||
err := r.DB.QueryRow(
|
||||
`SELECT COALESCE(SUM(size_bytes), 0), COUNT(*)
|
||||
FROM resources
|
||||
WHERE user_id = $1 AND type = 'file' AND deleted_at IS NULL`,
|
||||
ownerID,
|
||||
).Scan(&u.UsedBytes, &u.FileCount)
|
||||
if err != nil {
|
||||
return StorageUsage{}, err
|
||||
}
|
||||
err = r.DB.QueryRow(
|
||||
`SELECT COUNT(*), COALESCE(SUM(size_bytes), 0)
|
||||
FROM resources
|
||||
WHERE user_id = $1 AND deleted_at IS NOT NULL`,
|
||||
ownerID,
|
||||
).Scan(&u.TrashCount, &u.TrashedBytes)
|
||||
if err != nil {
|
||||
return StorageUsage{}, err
|
||||
}
|
||||
return u, nil
|
||||
}
|
||||
|
||||
type FileRow struct {
|
||||
ID string
|
||||
Name string
|
||||
@@ -700,6 +733,24 @@ func (r *Resources) TouchResource(resourceID string) error {
|
||||
return err
|
||||
}
|
||||
|
||||
// LiveNameAndUpdatedAt returns the current name and updated_at (ms epoch) of
|
||||
// a live resource, any type, unscoped — the caller (sync) has already
|
||||
// verified effective access. Absent/trashed → ErrNotFound. Sert à la
|
||||
// détection de conflits de rename (S6 A4 : baseUpdatedAt périmé).
|
||||
func (r *Resources) LiveNameAndUpdatedAt(resourceID string) (string, int64, error) {
|
||||
var name string
|
||||
var ms int64
|
||||
err := r.DB.QueryRow(
|
||||
`SELECT name, (EXTRACT(EPOCH FROM updated_at) * 1000)::bigint
|
||||
FROM resources WHERE resource_id = $1 AND deleted_at IS NULL`,
|
||||
resourceID,
|
||||
).Scan(&name, &ms)
|
||||
if err == sql.ErrNoRows {
|
||||
return "", 0, ErrNotFound
|
||||
}
|
||||
return name, ms, err
|
||||
}
|
||||
|
||||
// OwnedRow is a snapshot row: resource identity + freshness.
|
||||
type OwnedRow struct {
|
||||
ID string
|
||||
|
||||
@@ -13,6 +13,10 @@ type UserRow struct {
|
||||
PasswordHash string
|
||||
IsAdmin bool
|
||||
CreatedAt time.Time
|
||||
// V3 S6 : révocation des tokens (bump au changement de password) et
|
||||
// quota de stockage (garde-fou upload).
|
||||
TokenVersion int
|
||||
QuotaBytes int64
|
||||
}
|
||||
|
||||
// Users persiste les comptes utilisateurs (auth par login, cf. tranche identité).
|
||||
@@ -33,7 +37,8 @@ func (u *Users) Count() (int, error) {
|
||||
// (lowercase, unique). Absent → ErrNotFound.
|
||||
func (u *Users) GetByUsernameNormalized(normalized string) (*UserRow, error) {
|
||||
row := u.DB.QueryRow(
|
||||
`SELECT id, username, username_normalized, password_hash, is_admin, created_at
|
||||
`SELECT id, username, username_normalized, password_hash, is_admin, created_at,
|
||||
token_version, storage_quota_bytes
|
||||
FROM users
|
||||
WHERE username_normalized = $1 AND deleted_at IS NULL`,
|
||||
normalized,
|
||||
@@ -48,7 +53,8 @@ func (u *Users) GetByUsernameNormalized(normalized string) (*UserRow, error) {
|
||||
// GetByID charge un compte actif par id. Absent → ErrNotFound.
|
||||
func (u *Users) GetByID(id string) (*UserRow, error) {
|
||||
row := u.DB.QueryRow(
|
||||
`SELECT id, username, username_normalized, password_hash, is_admin, created_at
|
||||
`SELECT id, username, username_normalized, password_hash, is_admin, created_at,
|
||||
token_version, storage_quota_bytes
|
||||
FROM users
|
||||
WHERE id = $1 AND deleted_at IS NULL`,
|
||||
id,
|
||||
@@ -131,6 +137,27 @@ func (u *Users) MarkDeleted(id string) error {
|
||||
|
||||
func scanUser(scan func(...any) error) (*UserRow, error) {
|
||||
var user UserRow
|
||||
err := scan(&user.ID, &user.Username, &user.UsernameNormalized, &user.PasswordHash, &user.IsAdmin, &user.CreatedAt)
|
||||
err := scan(&user.ID, &user.Username, &user.UsernameNormalized, &user.PasswordHash, &user.IsAdmin, &user.CreatedAt, &user.TokenVersion, &user.QuotaBytes)
|
||||
return &user, err
|
||||
}
|
||||
|
||||
// BumpTokenVersion invalide tous les tokens émis (V3 S6) : le middleware
|
||||
// rejette les tokens dont le claim `tv` diffère. Compte absent → ErrNotFound.
|
||||
func (u *Users) BumpTokenVersion(id string) error {
|
||||
result, err := u.DB.Exec(
|
||||
`UPDATE users SET token_version = token_version + 1, updated_at = NOW()
|
||||
WHERE id = $1 AND deleted_at IS NULL`,
|
||||
id,
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
affected, err := result.RowsAffected()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if affected == 0 {
|
||||
return ErrNotFound
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user