calvin.erfmann/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-08-14 00:09:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow remote header overrides and fix display issues with log

Browse Source
This commit is contained in:
Owen
2026-08-12 15:54:22 -04:00
parent 47ae017f94
commit 653dd920ad
10 changed files with 213 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/lib/virtualApiKey.ts
+10 -9
View File
@@ -5,6 +5,7 @@ import {
import {
db,
resources,
User,
virtualApiKeyResources,
virtualApiKeys,
type Transaction,
@@ -148,12 +149,12 @@ async function selectUserVirtualApiKey(
export async function getOrCreateUserVirtualApiKey(params: {
orgId: string;
userId: string;
user: User;
createdByUserId?: string | null;
}): Promise<{ key: VirtualApiKey; secret: string }> {
const { orgId, userId, createdByUserId } = params;
const { orgId, user, createdByUserId } = params;
const existing = await selectUserVirtualApiKey(orgId, userId);
const existing = await selectUserVirtualApiKey(orgId, user.userId);
if (existing) {
return {
key: existing,
@@ -171,8 +172,8 @@ export async function getOrCreateUserVirtualApiKey(params: {
virtualApiKeyId: minted.virtualApiKeyId,
orgId,
kind: "user",
userId,
name: null,
userId: user.userId,
name: `${user.name ?? user.username}'s API Key`,
description: null,
token: encryptVirtualApiKeyToken(minted.secret),
lastChars: minted.lastChars,
@@ -186,7 +187,7 @@ export async function getOrCreateUserVirtualApiKey(params: {
return { key: created, secret: minted.secret };
} catch {
const raced = await selectUserVirtualApiKey(orgId, userId);
const raced = await selectUserVirtualApiKey(orgId, user.userId);
if (raced) {
return {
key: raced,
@@ -199,11 +200,11 @@ export async function getOrCreateUserVirtualApiKey(params: {
export async function rotateUserVirtualApiKey(params: {
orgId: string;
userId: string;
user: User;
createdByUserId?: string | null;
}): Promise<{ key: VirtualApiKey; secret: string }> {
const { orgId, userId, createdByUserId } = params;
const existing = await selectUserVirtualApiKey(orgId, userId);
const { orgId, user, createdByUserId } = params;
const existing = await selectUserVirtualApiKey(orgId, user.userId);
if (!existing) {
return getOrCreateUserVirtualApiKey(params);