From dd432073bed5ee5ca1a8f91f31b0981fcec95fa5 Mon Sep 17 00:00:00 2001 From: dr-vortex Date: Fri, 17 Nov 2023 14:26:46 -0600 Subject: [PATCH] Added unique keys Updated getAccount to allow access constraints --- src/account.ts | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/account.ts b/src/account.ts index 51c5763..e5da927 100644 --- a/src/account.ts +++ b/src/account.ts @@ -2,7 +2,9 @@ import { Access } from './auth.js'; import { request } from './request.js'; import type { KeyValue } from './utils.js'; -export const accountAttributes = ['id', 'username', 'email', 'type', 'lastchange', 'created', 'is_disabled', 'token', 'session']; +export const uniqueAccountAttributes = ['id', 'username', 'email', 'token', 'session']; + +export const accountAttributes = [...uniqueAccountAttributes, 'type', 'lastchange', 'created', 'is_disabled']; /** * The account's level of access and status @@ -129,6 +131,8 @@ export interface FullAccount extends Account { password?: string; } +export type UniqueAccountKey = 'id' | 'email' | 'username' | 'token' | 'session'; + /** * Parses the account result of a response * @param result the response result @@ -329,16 +333,21 @@ export async function deleteAccount(id: string, reason?: string): Promise * @param id the account's id * @param key the key to identify the account with (e.g. id) * @param value the value of the key (e.g. the account's id) + * @param access which level of access * @returns The account's data */ -export async function getAccount(id: string): Promise; -export async function getAccount(key: keyof Account, value?: string): Promise; -export async function getAccount(key: string, value?: string): Promise { +export async function getAccount(id: string, access?: Access): Promise; +export async function getAccount(key: UniqueAccountKey, value?: string, access?: Access): Promise; +export async function getAccount(key: string, value?: string | Access, access?: Access): Promise { if (!accountAttributes.includes(key)) { + if(typeof value == 'number') { + access = value; + } [key, value] = ['id', key]; } - checkAccountAttribute(key as keyof FullAccount, value); - const result = await request('POST', 'account/info', { key, value, multiple: false }); + + checkAccountAttribute(key as UniqueAccountKey, value as string); + const result = await request('POST', 'account/info', { key, value, access, multiple: false }); return parseAccount(result); }