From 6f69695758e06a9960b10ed64db0fa7dcf550205 Mon Sep 17 00:00:00 2001 From: Andy Burke Date: Tue, 24 Jun 2025 16:17:00 -0700 Subject: [PATCH] refactor: little light renaming --- models/password_entry.ts | 2 +- models/totp_entry.ts | 2 +- models/user.ts | 2 +- models/user_permissions.ts | 2 +- public/api/auth/index.ts | 14 +++++++------- public/api/users/:id/index.ts | 24 ++++++++++++------------ public/api/users/index.ts | 16 ++++++++-------- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/models/password_entry.ts b/models/password_entry.ts index 18d2bbb..873cd10 100644 --- a/models/password_entry.ts +++ b/models/password_entry.ts @@ -10,7 +10,7 @@ export type PASSWORD_ENTRY = { }; }; -export const PASSWORD_ENTRY_STORE = new FSDB_COLLECTION({ +export const PASSWORD_ENTRIES = new FSDB_COLLECTION({ name: 'password_entries', id_field: 'user_id' }); diff --git a/models/totp_entry.ts b/models/totp_entry.ts index e8dd6ff..63a94b6 100644 --- a/models/totp_entry.ts +++ b/models/totp_entry.ts @@ -9,7 +9,7 @@ export type TOTP_ENTRY = { }; }; -export const TOTP_ENTRY_STORE = new FSDB_COLLECTION({ +export const TOTP_ENTRIES = new FSDB_COLLECTION({ name: 'totp_entries', id_field: 'user_id' }); diff --git a/models/user.ts b/models/user.ts index d2de256..a909927 100644 --- a/models/user.ts +++ b/models/user.ts @@ -11,7 +11,7 @@ export type USER = { }; }; -export const USER_STORE = new FSDB_COLLECTION({ +export const USERS = new FSDB_COLLECTION({ name: 'users', indexers: { // email: new FSDB_INDEXER_SYMLINKS({ diff --git a/models/user_permissions.ts b/models/user_permissions.ts index f939c66..7e0044e 100644 --- a/models/user_permissions.ts +++ b/models/user_permissions.ts @@ -9,7 +9,7 @@ export type USER_PERMISSIONS = { }; }; -export const USER_PERMISSIONS_STORE = new FSDB_COLLECTION({ +export const PERMISSIONS_STORE = new FSDB_COLLECTION({ name: 'user_permissions', id_field: 'user_id' }); diff --git a/public/api/auth/index.ts b/public/api/auth/index.ts index d5e6fce..aa749dc 100644 --- a/public/api/auth/index.ts +++ b/public/api/auth/index.ts @@ -1,11 +1,11 @@ -import { PASSWORD_ENTRY_STORE } from '../../../models/password_entry.ts'; -import { USER, USER_STORE } from '../../../models/user.ts'; +import { PASSWORD_ENTRIES } from '../../../models/password_entry.ts'; +import { USER, USERS } from '../../../models/user.ts'; import { generateSecret } from 'jsr:@stdext/crypto/utils'; import { encodeBase32 } from 'jsr:@std/encoding'; import { verify } from 'jsr:@stdext/crypto/hash'; import lurid from 'jsr:@andyburke/lurid'; import { SESSION, SESSIONS } from '../../../models/session.ts'; -import { TOTP_ENTRY_STORE } from '../../../models/totp_entry.ts'; +import { TOTP_ENTRIES } from '../../../models/totp_entry.ts'; import { verifyTotp } from 'jsr:@stdext/crypto/totp'; import { encodeBase64 } from 'jsr:@std/encoding/base64'; import parse_body from '../../../utils/bodyparser.ts'; @@ -52,11 +52,11 @@ export async function POST(req: Request, meta: Record): Promise): Promise): Promise) => Promise> = {}; @@ -16,7 +16,7 @@ PERMISSIONS.GET = (_req: Request, meta: Record): Promise = }; export async function GET(_req: Request, meta: Record): Promise { const user_id: string = meta.params?.id?.toLowerCase().trim() ?? ''; - const user: USER | null = user_id.length === 49 ? await USER_STORE.get(user_id) : null; // lurid is 49 chars as we use them, eg: "also-play-flow-want-form-wide-thus-work-burn-same" + const user: USER | null = user_id.length === 49 ? await USERS.get(user_id) : null; // lurid is 49 chars as we use them, eg: "also-play-flow-want-form-wide-thus-work-burn-same" if (!user) { return Response.json({ @@ -60,7 +60,7 @@ PERMISSIONS.PUT = (_req: Request, meta: Record): Promise = export async function PUT(req: Request, meta: { params: Record }): Promise { const now = new Date().toISOString(); const id: string = meta.params.id ?? ''; - const existing = await USER_STORE.get(id); + const existing = await USERS.get(id); if (!existing) { return Response.json({ @@ -84,7 +84,7 @@ export async function PUT(req: Request, meta: { params: Record }): } }; - await USER_STORE.update(updated); + await USERS.update(updated); return Response.json(updated, { status: 200 }); @@ -111,7 +111,7 @@ PERMISSIONS.DELETE = (_req: Request, meta: Record): Promise }): Promise { const user_id: string = meta.params.id ?? ''; - const user: USER | null = await USER_STORE.get(user_id); + const user: USER | null = await USERS.get(user_id); if (!user) { return Response.json({ error: { @@ -123,13 +123,13 @@ export async function DELETE(_req: Request, meta: { params: Record }); } - const password_entry: PASSWORD_ENTRY | null = await PASSWORD_ENTRY_STORE.get(user_id); + const password_entry: PASSWORD_ENTRY | null = await PASSWORD_ENTRIES.get(user_id); if (password_entry) { - await PASSWORD_ENTRY_STORE.delete(password_entry); + await PASSWORD_ENTRIES.delete(password_entry); } - const user_permissions: USER_PERMISSIONS | null = await USER_PERMISSIONS_STORE.get(user_id); + const user_permissions: USER_PERMISSIONS | null = await PERMISSIONS_STORE.get(user_id); if (user_permissions) { - await USER_PERMISSIONS_STORE.delete(user_permissions); + await PERMISSIONS_STORE.delete(user_permissions); } const sessions = await SESSIONS.find({ @@ -139,7 +139,7 @@ export async function DELETE(_req: Request, meta: { params: Record await SESSIONS.delete(session); } - await USER_STORE.delete(user); + await USERS.delete(user); return Response.json({ deleted: true diff --git a/public/api/users/index.ts b/public/api/users/index.ts index f23d1e7..68e4705 100644 --- a/public/api/users/index.ts +++ b/public/api/users/index.ts @@ -1,6 +1,6 @@ -import { PASSWORD_ENTRY, PASSWORD_ENTRY_STORE } from '../../../models/password_entry.ts'; -import { USER, USER_STORE } from '../../../models/user.ts'; -import { USER_PERMISSIONS, USER_PERMISSIONS_STORE } from '../../../models/user_permissions.ts'; +import { PASSWORD_ENTRIES, PASSWORD_ENTRY } from '../../../models/password_entry.ts'; +import { USER, USERS } from '../../../models/user.ts'; +import { PERMISSIONS_STORE, USER_PERMISSIONS } from '../../../models/user_permissions.ts'; import { generateSecret } from 'jsr:@stdext/crypto/utils'; import { hash } from 'jsr:@stdext/crypto/hash'; import lurid from 'jsr:@andyburke/lurid'; @@ -45,7 +45,7 @@ export async function GET(_req: Request, meta: Record): Promise): Promise): Promise): Promise): Promise