diff --git a/apps/csbie-server/src/security/api-keys.ts b/apps/csbie-server/src/security/api-keys.ts index 8829a9b..46e16ef 100644 --- a/apps/csbie-server/src/security/api-keys.ts +++ b/apps/csbie-server/src/security/api-keys.ts @@ -49,6 +49,7 @@ export const listApiKeys = async (db: Db) => revokedAt: apiKeys.revokedAt, }) .from(apiKeys) + .where(isNull(apiKeys.revokedAt)) .orderBy(apiKeys.createdAt) export const createApiKey = async (db: Db, label: string, settings: ApiKeySettings = {}) => { diff --git a/apps/csbie-ui/src/features/auth/useAuthAdmin.ts b/apps/csbie-ui/src/features/auth/useAuthAdmin.ts index 859c031..57db9e0 100644 --- a/apps/csbie-ui/src/features/auth/useAuthAdmin.ts +++ b/apps/csbie-ui/src/features/auth/useAuthAdmin.ts @@ -36,7 +36,7 @@ export const useAuthAdmin = () => { const refresh = async (options?: { autoConnect?: boolean; connect?: () => void }) => { status.value = await getStatus() if (status.value.authenticated) { - apiKeys.value = (await listApiKeys()).apiKeys + apiKeys.value = (await listApiKeys()).apiKeys.filter((key) => !key.revokedAt) sbiPasskeys.value = (await listSbiPasskeys()).passkeys selectedPasskeyId.value ||= sbiPasskeys.value[0]?.id ?? '' if (options?.autoConnect && selectedPasskeyId.value) options.connect?.()