@frogbotai/plugin-api-keys 0.28.0 → 0.30.0

package/dist/index.js

@@ -1,24 +1,22 @@
 import { createApiKeysCollection } from './collection.js';
-import { createApiKeyStrategy } from './strategy.js';
+import { apiKeyMeHook, apiKeyStrategyName, createApiKeyStrategy } from './strategy.js';
 export { ApiKeyServiceError, mintApiKey, revokeApiKey, rotateApiKey } from './server/services.js';
-export { createApiKeyToken, extractApiKeyToken, getApiKeyPrefix, hashApiKeyToken, } from './server/token.js';
+export { createApiKeyToken, extractApiKeyToken, getApiKeyPrefix, hashApiKeyToken } from './server/token.js';
 export { isApiKeyStrategy } from './strategy.js';
 export function apiKeysPlugin(options = {}) {
-    return (config) => {
+    return (config)=>{
         const authCollection = options.authCollection ?? 'users';
         const collectionSlug = options.collectionSlug ?? 'api-keys';
-        const auth = config.collections.find((collection) => collection.slug === authCollection);
+        const auth = config.collections.find((collection)=>collection.slug === authCollection);
         if (!auth || auth.auth === undefined || auth.auth === false) {
             throw new Error(`[plugin-api-keys] Auth collection '${authCollection}' must exist and have auth enabled.`);
         }
-        const existing = config.collections.find((collection) => collection.slug === collectionSlug);
-        const usageLog = config.ai
-            ? (config.collections.find((item) => item.usageLog === true) ?? {
-                slug: 'usage-logs',
-                usageLog: true,
-                fields: [],
-            })
-            : undefined;
+        const existing = config.collections.find((collection)=>collection.slug === collectionSlug);
+        const usageLog = config.ai ? config.collections.find((item)=>item.usageLog === true) ?? {
+            slug: 'usage-logs',
+            usageLog: true,
+            fields: []
+        } : undefined;
         const collection = createApiKeysCollection({
             authCollection,
             collectionSlug,
@@ -26,73 +24,88 @@ export function apiKeysPlugin(options = {}) {
             usageCollection: usageLog?.slug,
             canRevokeAnyKey: options.canRevokeAnyKey,
             collection: options.collection,
-            existing,
+            existing
         });
         const strategy = createApiKeyStrategy({
             authCollection,
             collectionSlug,
             headerNames: options.headerNames,
-            tokenPrefix: options.tokenPrefix ?? 'fb',
+            tokenPrefix: options.tokenPrefix ?? 'fb'
         });
         const usageField = {
             name: 'apiKey',
             type: 'relationship',
             relationTo: collectionSlug,
-            index: true,
+            index: true
         };
-        const collections = config.collections.map((item) => {
+        const collections = config.collections.map((item)=>{
             let next = item;
-            if (item.slug === collectionSlug)
-                next = collection;
+            if (item.slug === collectionSlug) next = collection;
             if (item.slug === authCollection) {
                 const authConfig = typeof next.auth === 'object' ? next.auth : {};
                 next = {
                     ...next,
-                    auth: { ...authConfig, strategies: [...(authConfig.strategies ?? []), strategy] },
+                    auth: {
+                        ...authConfig,
+                        strategies: [
+                            ...authConfig.strategies ?? [],
+                            strategy
+                        ]
+                    },
+                    hooks: {
+                        ...next.hooks,
+                        me: [
+                            ...next.hooks?.me ?? [],
+                            apiKeyMeHook
+                        ]
+                    }
                 };
             }
-            if (item === usageLog)
-                next = { ...next, fields: [...next.fields, usageField] };
+            if (item === usageLog) next = {
+                ...next,
+                fields: [
+                    ...next.fields,
+                    usageField
+                ]
+            };
             return next;
         });
         return {
             ...config,
-            settings: [
-                ...(config.settings ?? []),
-                {
-                    label: 'API Keys',
-                    path: 'api-keys',
-                    Component: {
-                        path: '@frogbotai/next/views#CollectionSettingsRedirect',
-                        serverProps: { collectionSlug },
-                    },
-                    access: collection.access?.read,
-                },
-            ],
             collections: [
                 ...collections,
-                ...(existing ? [] : [collection]),
-                ...(usageLog && !config.collections.includes(usageLog)
-                    ? [{ ...usageLog, fields: [usageField] }]
-                    : []),
+                ...existing ? [] : [
+                    collection
+                ],
+                ...usageLog && !config.collections.includes(usageLog) ? [
+                    {
+                        ...usageLog,
+                        fields: [
+                            usageField
+                        ]
+                    }
+                ] : []
             ],
-            ...(config.ai && {
+            ...config.ai && {
                 ai: {
                     ...config.ai,
                     hooks: {
                         ...config.ai.hooks,
                         beforeOperation: [
-                            ...(config.ai.hooks?.beforeOperation ?? []),
-                            ({ req, context }) => {
-                                if (req?.user && 'apiKeyId' in req.user && typeof req.user.apiKeyId === 'string') {
-                                    context.usageFields = { apiKey: req.user.apiKeyId };
-                                }
-                            },
-                        ],
-                    },
-                },
-            }),
+                            ...config.ai.hooks?.beforeOperation ?? [],
+                            ({ req, context })=>{
+                                const user = req?.user;
+                                const apiKeyId = user?._strategy === apiKeyStrategyName && (typeof user.apiKeyId === 'string' || typeof user.apiKeyId === 'number') ? user.apiKeyId : undefined;
+                                if (apiKeyId !== undefined) context.usageFields = {
+                                    apiKey: apiKeyId
+                                };
+                            }
+                        ]
+                    }
+                }
+            }
         };
     };
 }
+
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"sources":["../src/index.ts"],"names":["createApiKeysCollection","apiKeyMeHook","apiKeyStrategyName","createApiKeyStrategy","ApiKeyServiceError","mintApiKey","revokeApiKey","rotateApiKey","createApiKeyToken","extractApiKeyToken","getApiKeyPrefix","hashApiKeyToken","isApiKeyStrategy","apiKeysPlugin","options","config","authCollection","collectionSlug","auth","collections","find","collection","slug","undefined","Error","existing","usageLog","ai","item","fields","tokenPrefix","usageCollection","canRevokeAnyKey","strategy","headerNames","usageField","name","type","relationTo","index","map","next","authConfig","strategies","hooks","me","includes","beforeOperation","req","context","user","apiKeyId","_strategy","usageFields","apiKey"],"mappings":"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","file":"index.js"}

package/dist/server/services.js

@@ -1,73 +1,108 @@
 import { createApiKeyToken, getApiKeyPrefix, hashApiKeyToken } from './token.js';
 export class ApiKeyServiceError extends Error {
     code;
-    constructor(code) {
-        super(code);
-        this.code = code;
+    constructor(code){
+        super(code), this.code = code;
     }
 }
-async function mintForOwner({ req, collectionSlug, tokenPrefix, name, owner, }) {
-    const token = createApiKeyToken({ tokenPrefix });
+async function mintForOwner({ req, collectionSlug, tokenPrefix, name, owner }) {
+    const token = createApiKeyToken({
+        tokenPrefix
+    });
     const prefix = getApiKeyPrefix(token);
-    const doc = (await req.frogbot.create({
+    const doc = await req.frogbot.create({
         collection: collectionSlug,
-        data: { name, owner, prefix, tokenHash: hashApiKeyToken(token) },
+        data: {
+            name,
+            owner,
+            prefix,
+            tokenHash: hashApiKeyToken(token)
+        },
         overrideAccess: true,
-        req,
-    }));
-    return { id: doc.id, name, prefix, token, createdAt: doc.createdAt };
+        req
+    });
+    return {
+        id: doc.id,
+        name,
+        prefix,
+        token,
+        createdAt: doc.createdAt
+    };
 }
 export async function mintApiKey(options) {
     const owner = options.req.user?.id;
-    if (owner === undefined)
-        throw new ApiKeyServiceError('authentication_required');
+    if (owner === undefined) throw new ApiKeyServiceError('authentication_required');
     return mintForOwner({
         req: options.req,
         collectionSlug: options.collectionSlug,
         tokenPrefix: options.tokenPrefix,
         name: options.name,
-        owner,
+        owner
     });
 }
-export async function rotateApiKey({ req, collectionSlug, id, tokenPrefix, anyOwner, }) {
-    const revoked = await revokeApiKey({ req, collectionSlug, id, anyOwner });
+export async function rotateApiKey({ req, collectionSlug, id, tokenPrefix, anyOwner }) {
+    const revoked = await revokeApiKey({
+        req,
+        collectionSlug,
+        id,
+        anyOwner
+    });
     return mintForOwner({
         req,
         collectionSlug,
         tokenPrefix,
         name: revoked.name,
-        owner: revoked.owner,
+        owner: revoked.owner
     });
 }
 export async function revokeApiKey({ req, collectionSlug, id, anyOwner }) {
     const owner = req.user?.id;
-    if (owner === undefined)
-        throw new ApiKeyServiceError('authentication_required');
+    if (owner === undefined) throw new ApiKeyServiceError('authentication_required');
     const result = await req.frogbot.find({
         collection: collectionSlug,
         depth: 0,
         limit: 1,
         overrideAccess: true,
         req,
-        where: anyOwner
-            ? { id: { equals: id } }
-            : { and: [{ id: { equals: id } }, { owner: { equals: owner } }] },
+        where: anyOwner ? {
+            id: {
+                equals: id
+            }
+        } : {
+            and: [
+                {
+                    id: {
+                        equals: id
+                    }
+                },
+                {
+                    owner: {
+                        equals: owner
+                    }
+                }
+            ]
+        }
     });
     const key = result.docs[0];
-    if (!key ||
-        (typeof key.id !== 'string' && typeof key.id !== 'number') ||
-        typeof key.name !== 'string' ||
-        (typeof key.owner !== 'string' && typeof key.owner !== 'number')) {
+    if (!key || typeof key.id !== 'string' && typeof key.id !== 'number' || typeof key.name !== 'string' || typeof key.owner !== 'string' && typeof key.owner !== 'number') {
         throw new ApiKeyServiceError('not_found');
     }
     const revokedAt = typeof key.revokedAt === 'string' ? key.revokedAt : new Date().toISOString();
     await req.frogbot.update({
         collection: collectionSlug,
         id: key.id,
-        data: { revokedAt },
+        data: {
+            revokedAt
+        },
         overrideAccess: true,
-        req,
+        req
     });
-    return { id: key.id, name: key.name, owner: key.owner, revokedAt };
+    return {
+        id: key.id,
+        name: key.name,
+        owner: key.owner,
+        revokedAt
+    };
 }
+
 //# sourceMappingURL=services.js.map

package/dist/server/services.js.map

@@ -1 +1 @@
-{"version":3,"file":"services.js","sourceRoot":"","sources":["../../src/server/services.ts"],"names":[],"mappings":"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"}
+{"version":3,"sources":["../../src/server/services.ts"],"names":["createApiKeyToken","getApiKeyPrefix","hashApiKeyToken","ApiKeyServiceError","Error","code","mintForOwner","req","collectionSlug","tokenPrefix","name","owner","token","prefix","doc","frogbot","create","collection","data","tokenHash","overrideAccess","id","createdAt","mintApiKey","options","user","undefined","rotateApiKey","anyOwner","revoked","revokeApiKey","result","find","depth","limit","where","equals","and","key","docs","revokedAt","Date","toISOString","update"],"mappings":"AAEA,SAASA,iBAAiB,EAAEC,eAAe,EAAEC,eAAe,QAAQ,aAAa;AAgBjF,OAAO,MAAMC,2BAA2BC;;IACtC,YAAY,AAAgBC,IAA6C,CAAE;QACzE,KAAK,CAACA,YADoBA,OAAAA;IAE5B;AACF;AAIA,eAAeC,aAAa,EAC1BC,GAAG,EACHC,cAAc,EACdC,WAAW,EACXC,IAAI,EACJC,KAAK,EACe;IACpB,MAAMC,QAAQZ,kBAAkB;QAAES;IAAY;IAC9C,MAAMI,SAASZ,gBAAgBW;IAC/B,MAAME,MAAO,MAAMP,IAAIQ,OAAO,CAACC,MAAM,CAAC;QACpCC,YAAYT;QACZU,MAAM;YAAER;YAAMC;YAAOE;YAAQM,WAAWjB,gBAAgBU;QAAO;QAC/DQ,gBAAgB;QAChBb;IACF;IACA,OAAO;QAAEc,IAAIP,IAAIO,EAAE;QAAEX;QAAMG;QAAQD;QAAOU,WAAWR,IAAIQ,SAAS;IAAC;AACrE;AAEA,OAAO,eAAeC,WAAWC,OAA0B;IACzD,MAAMb,QAAQa,QAAQjB,GAAG,CAACkB,IAAI,EAAEJ;IAChC,IAAIV,UAAUe,WAAW,MAAM,IAAIvB,mBAAmB;IACtD,OAAOG,aAAa;QAClBC,KAAKiB,QAAQjB,GAAG;QAChBC,gBAAgBgB,QAAQhB,cAAc;QACtCC,aAAae,QAAQf,WAAW;QAChCC,MAAMc,QAAQd,IAAI;QAClBC;IACF;AACF;AAIA,OAAO,eAAegB,aAAa,EACjCpB,GAAG,EACHC,cAAc,EACda,EAAE,EACFZ,WAAW,EACXmB,QAAQ,EACY;IACpB,MAAMC,UAAU,MAAMC,aAAa;QAAEvB;QAAKC;QAAgBa;QAAIO;IAAS;IACvE,OAAOtB,aAAa;QAClBC;QACAC;QACAC;QACAC,MAAMmB,QAAQnB,IAAI;QAClBC,OAAOkB,QAAQlB,KAAK;IACtB;AACF;AAEA,OAAO,eAAemB,aAAa,EAAEvB,GAAG,EAAEC,cAAc,EAAEa,EAAE,EAAEO,QAAQ,EAAuB;IAC3F,MAAMjB,QAAQJ,IAAIkB,IAAI,EAAEJ;IACxB,IAAIV,UAAUe,WAAW,MAAM,IAAIvB,mBAAmB;IACtD,MAAM4B,SAAS,MAAMxB,IAAIQ,OAAO,CAACiB,IAAI,CAAC;QACpCf,YAAYT;QACZyB,OAAO;QACPC,OAAO;QACPd,gBAAgB;QAChBb;QACA4B,OAAOP,WACH;YAAEP,IAAI;gBAAEe,QAAQf;YAAG;QAAE,IACrB;YAAEgB,KAAK;gBAAC;oBAAEhB,IAAI;wBAAEe,QAAQf;oBAAG;gBAAE;gBAAG;oBAAEV,OAAO;wBAAEyB,QAAQzB;oBAAM;gBAAE;aAAE;QAAC;IACpE;IACA,MAAM2B,MAAMP,OAAOQ,IAAI,CAAC,EAAE;IAC1B,IACE,CAACD,OACA,OAAOA,IAAIjB,EAAE,KAAK,YAAY,OAAOiB,IAAIjB,EAAE,KAAK,YACjD,OAAOiB,IAAI5B,IAAI,KAAK,YACnB,OAAO4B,IAAI3B,KAAK,KAAK,YAAY,OAAO2B,IAAI3B,KAAK,KAAK,UACvD;QACA,MAAM,IAAIR,mBAAmB;IAC/B;IACA,MAAMqC,YAAY,OAAOF,IAAIE,SAAS,KAAK,WAAWF,IAAIE,SAAS,GAAG,IAAIC,OAAOC,WAAW;IAC5F,MAAMnC,IAAIQ,OAAO,CAAC4B,MAAM,CAAC;QACvB1B,YAAYT;QACZa,IAAIiB,IAAIjB,EAAE;QACVH,MAAM;YAAEsB;QAAU;QAClBpB,gBAAgB;QAChBb;IACF;IACA,OAAO;QAAEc,IAAIiB,IAAIjB,EAAE;QAAEX,MAAM4B,IAAI5B,IAAI;QAAEC,OAAO2B,IAAI3B,KAAK;QAAE6B;IAAU;AACnE","file":"services.js"}

package/dist/server/token.d.ts

@@ -7,5 +7,5 @@ export type ApiKeyHeaderOptions = {
 export declare function createApiKeyToken({ tokenPrefix }?: ApiKeyTokenOptions): string;
 export declare function hashApiKeyToken(token: string): string;
 export declare function getApiKeyPrefix(token: string): string;
-export declare function extractApiKeyToken(headers: Headers, { headerNames }?: ApiKeyHeaderOptions): string | null;
+export declare function extractApiKeyToken(headers: Headers, { headerNames, tokenPrefix }?: ApiKeyHeaderOptions & ApiKeyTokenOptions): string | null;
 //# sourceMappingURL=token.d.ts.map

package/dist/server/token.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../src/server/token.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,kBAAkB,GAAG;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,EAAE,WAAkB,EAAE,GAAE,kBAAuB,GAAG,MAAM,CAEzF;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,OAAO,EAChB,EAAE,WAA2B,EAAE,GAAE,mBAAwB,GACxD,MAAM,GAAG,IAAI,CAWf"}
+{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../src/server/token.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,kBAAkB,GAAG;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,EAAE,WAAkB,EAAE,GAAE,kBAAuB,GAAG,MAAM,CAEzF;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAErD;AAQD,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,OAAO,EAChB,EAAE,WAA2B,EAAE,WAAW,EAAE,GAAE,mBAAmB,GAAG,kBAAuB,GAC1F,MAAM,GAAG,IAAI,CAKf"}

package/dist/server/token.js

@@ -8,16 +8,21 @@ export function hashApiKeyToken(token) {
 export function getApiKeyPrefix(token) {
     return token.slice(0, 12);
 }
-export function extractApiKeyToken(headers, { headerNames = ['x-api-key'] } = {}) {
-    const authorization = headers.get('authorization');
-    const bearer = authorization?.match(/^Bearer ([^\s]+)$/i)?.[1];
-    if (bearer)
-        return bearer;
-    for (const headerName of headerNames) {
-        const value = headers.get(headerName)?.trim();
-        if (value && !/\s/.test(value))
-            return value;
-    }
-    return null;
+function isApiKeyToken(value, { tokenPrefix = 'fb' } = {}) {
+    const prefix = tokenPrefix.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    return new RegExp(`^${prefix}_[A-Za-z0-9_-]{43}$`).test(value);
 }
+export function extractApiKeyToken(headers, { headerNames = [
+    'x-api-key'
+], tokenPrefix } = {}) {
+    const bearer = headers.get('authorization')?.match(/^Bearer ([^\s]+)$/i)?.[1];
+    const candidates = [
+        bearer,
+        ...headerNames.map((headerName)=>headers.get(headerName)?.trim())
+    ];
+    return candidates.find((value)=>value && isApiKeyToken(value, {
+            tokenPrefix
+        })) ?? null;
+}
+
 //# sourceMappingURL=token.js.map

package/dist/server/token.js.map

@@ -1 +1 @@
-{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/server/token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAUtD,MAAM,UAAU,iBAAiB,CAAC,EAAE,WAAW,GAAG,IAAI,KAAyB,EAAE;IAC/E,OAAO,GAAG,WAAW,IAAI,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;AACnE,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,KAAa;IAC3C,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,KAAa;IAC3C,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,OAAgB,EAChB,EAAE,WAAW,GAAG,CAAC,WAAW,CAAC,KAA0B,EAAE;IAEzD,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IACnD,MAAM,MAAM,GAAG,aAAa,EAAE,KAAK,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC/D,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC;IAE1B,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACrC,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,CAAC;QAC9C,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;IAC/C,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"sources":["../../src/server/token.ts"],"names":["createHash","randomBytes","createApiKeyToken","tokenPrefix","toString","hashApiKeyToken","token","update","digest","getApiKeyPrefix","slice","isApiKeyToken","value","prefix","replace","RegExp","test","extractApiKeyToken","headers","headerNames","bearer","get","match","candidates","map","headerName","trim","find"],"mappings":"AAAA,SAASA,UAAU,EAAEC,WAAW,QAAQ,cAAc;AAUtD,OAAO,SAASC,kBAAkB,EAAEC,cAAc,IAAI,EAAsB,GAAG,CAAC,CAAC;IAC/E,OAAO,GAAGA,YAAY,CAAC,EAAEF,YAAY,IAAIG,QAAQ,CAAC,cAAc;AAClE;AAEA,OAAO,SAASC,gBAAgBC,KAAa;IAC3C,OAAON,WAAW,UAAUO,MAAM,CAACD,OAAOE,MAAM,CAAC;AACnD;AAEA,OAAO,SAASC,gBAAgBH,KAAa;IAC3C,OAAOA,MAAMI,KAAK,CAAC,GAAG;AACxB;AAEA,SAASC,cAAcC,KAAa,EAAE,EAAET,cAAc,IAAI,EAAsB,GAAG,CAAC,CAAC;IACnF,MAAMU,SAASV,YAAYW,OAAO,CAAC,uBAAuB;IAE1D,OAAO,IAAIC,OAAO,CAAC,CAAC,EAAEF,OAAO,mBAAmB,CAAC,EAAEG,IAAI,CAACJ;AAC1D;AAEA,OAAO,SAASK,mBACdC,OAAgB,EAChB,EAAEC,cAAc;IAAC;CAAY,EAAEhB,WAAW,EAA4C,GAAG,CAAC,CAAC;IAE3F,MAAMiB,SAASF,QAAQG,GAAG,CAAC,kBAAkBC,MAAM,uBAAuB,CAAC,EAAE;IAC7E,MAAMC,aAAa;QAACH;WAAWD,YAAYK,GAAG,CAAC,CAACC,aAAeP,QAAQG,GAAG,CAACI,aAAaC;KAAQ;IAEhG,OAAOH,WAAWI,IAAI,CAAC,CAACf,QAAUA,SAASD,cAAcC,OAAO;YAAET;QAAY,OAAO;AACvF","file":"token.js"}

package/dist/strategy.d.ts

@@ -1,12 +1,13 @@
-import type { AuthConfig } from 'frogbot';
-export type ApiKeyStrategy = NonNullable<AuthConfig['strategies']>[number];
+import type { AuthStrategy, CollectionMeHook } from 'frogbot';
+export declare const apiKeyStrategyName = "api-key";
 type StrategyOptions = {
     authCollection: string;
     collectionSlug: string;
     headerNames?: string[];
     tokenPrefix: string;
 };
-export declare function createApiKeyStrategy(options: StrategyOptions): ApiKeyStrategy;
-export declare function isApiKeyStrategy(strategy: ApiKeyStrategy): boolean;
+export declare function createApiKeyStrategy(options: StrategyOptions): AuthStrategy;
+export declare function isApiKeyStrategy(strategy: AuthStrategy): boolean;
+export declare const apiKeyMeHook: CollectionMeHook;
 export {};
 //# sourceMappingURL=strategy.d.ts.map

package/dist/strategy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"strategy.d.ts","sourceRoot":"","sources":["../src/strategy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAI1C,MAAM,MAAM,cAAc,GAAG,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AAI3E,KAAK,eAAe,GAAG;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,eAAe,GAAG,cAAc,CAiE7E;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,cAAc,GAAG,OAAO,CAElE"}
+{"version":3,"file":"strategy.d.ts","sourceRoot":"","sources":["../src/strategy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAI9D,eAAO,MAAM,kBAAkB,YAAY,CAAC;AAI5C,KAAK,eAAe,GAAG;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,eAAe,GAAG,YAAY,CA8D3E;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAEhE;AAED,eAAO,MAAM,YAAY,EAAE,gBAI1B,CAAC"}

package/dist/strategy.js

@@ -1,54 +1,76 @@
 import { extractApiKeyToken, hashApiKeyToken } from './server/token.js';
+export const apiKeyStrategyName = 'api-key';
 const apiKeyStrategies = new WeakSet();
 export function createApiKeyStrategy(options) {
     const { authCollection, collectionSlug, headerNames, tokenPrefix } = options;
     const strategy = {
-        name: 'api-key',
-        authenticate: async ({ headers, payload }) => {
-            const token = extractApiKeyToken(headers, { headerNames });
-            if (!token ||
-                !new RegExp(`^${tokenPrefix.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}_[A-Za-z0-9_-]{43}$`).test(token)) {
-                return { user: null };
-            }
-            const keys = await payload.find({
+        name: apiKeyStrategyName,
+        authenticate: async ({ frogbot, headers })=>{
+            const token = extractApiKeyToken(headers, {
+                headerNames,
+                tokenPrefix
+            });
+            if (!token) return {
+                user: null
+            };
+            const keys = await frogbot.find({
                 collection: collectionSlug,
                 depth: 0,
                 limit: 1,
                 overrideAccess: true,
                 where: {
                     and: [
-                        { tokenHash: { equals: hashApiKeyToken(token) } },
-                        { revokedAt: { exists: false } },
-                    ],
-                },
+                        {
+                            tokenHash: {
+                                equals: hashApiKeyToken(token)
+                            }
+                        },
+                        {
+                            revokedAt: {
+                                exists: false
+                            }
+                        }
+                    ]
+                }
             });
             const key = keys.docs[0];
-            if (!key?.owner)
-                return { user: null };
-            const user = await payload
-                .findByID({ collection: authCollection, id: key.owner, depth: 0, overrideAccess: true })
-                .catch(() => null);
-            if (!user)
-                return { user: null };
-            await payload.update({
+            if (!key || typeof key.id !== 'string' && typeof key.id !== 'number' || typeof key.owner !== 'string' && typeof key.owner !== 'number') {
+                return {
+                    user: null
+                };
+            }
+            const user = await frogbot.findByID({
+                collection: authCollection,
+                id: key.owner,
+                depth: 0,
+                overrideAccess: true
+            }).catch(()=>null);
+            if (!user) return {
+                user: null
+            };
+            await frogbot.update({
                 collection: collectionSlug,
                 id: key.id,
-                data: { lastUsedAt: new Date().toISOString() },
-                overrideAccess: true,
+                data: {
+                    lastUsedAt: new Date().toISOString()
+                },
+                overrideAccess: true
             });
             return {
                 user: {
                     ...user,
                     collection: authCollection,
-                    _strategy: 'api-key',
+                    _strategy: apiKeyStrategyName,
                     apiKeyId: key.id,
-                    ...(key.capture !== undefined ? { capture: key.capture } : {}),
-                    ...(typeof key.captureSampleRate === 'number'
-                        ? { captureSampleRate: key.captureSampleRate }
-                        : {}),
-                },
+                    ...key.capture !== undefined ? {
+                        capture: key.capture
+                    } : {},
+                    ...typeof key.captureSampleRate === 'number' ? {
+                        captureSampleRate: key.captureSampleRate
+                    } : {}
+                }
             };
-        },
+        }
     };
     apiKeyStrategies.add(strategy);
     return strategy;
@@ -56,4 +78,11 @@ export function createApiKeyStrategy(options) {
 export function isApiKeyStrategy(strategy) {
     return apiKeyStrategies.has(strategy);
 }
+export const apiKeyMeHook = ({ user })=>{
+    if (user?._strategy !== apiKeyStrategyName) return;
+    return {
+        user
+    };
+};
+
 //# sourceMappingURL=strategy.js.map

package/dist/strategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"strategy.js","sourceRoot":"","sources":["../src/strategy.ts"],"names":[],"mappings":"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"}
+{"version":3,"sources":["../src/strategy.ts"],"names":["extractApiKeyToken","hashApiKeyToken","apiKeyStrategyName","apiKeyStrategies","WeakSet","createApiKeyStrategy","options","authCollection","collectionSlug","headerNames","tokenPrefix","strategy","name","authenticate","frogbot","headers","token","user","keys","find","collection","depth","limit","overrideAccess","where","and","tokenHash","equals","revokedAt","exists","key","docs","id","owner","findByID","catch","update","data","lastUsedAt","Date","toISOString","_strategy","apiKeyId","capture","undefined","captureSampleRate","add","isApiKeyStrategy","has","apiKeyMeHook"],"mappings":"AAEA,SAASA,kBAAkB,EAAEC,eAAe,QAAQ,oBAAoB;AAExE,OAAO,MAAMC,qBAAqB,UAAU;AAE5C,MAAMC,mBAAmB,IAAIC;AAS7B,OAAO,SAASC,qBAAqBC,OAAwB;IAC3D,MAAM,EAAEC,cAAc,EAAEC,cAAc,EAAEC,WAAW,EAAEC,WAAW,EAAE,GAAGJ;IACrE,MAAMK,WAAyB;QAC7BC,MAAMV;QACNW,cAAc,OAAO,EAAEC,OAAO,EAAEC,OAAO,EAAE;YACvC,MAAMC,QAAQhB,mBAAmBe,SAAS;gBAAEN;gBAAaC;YAAY;YAErE,IAAI,CAACM,OAAO,OAAO;gBAAEC,MAAM;YAAK;YAEhC,MAAMC,OAAO,MAAMJ,QAAQK,IAAI,CAAC;gBAC9BC,YAAYZ;gBACZa,OAAO;gBACPC,OAAO;gBACPC,gBAAgB;gBAChBC,OAAO;oBACLC,KAAK;wBACH;4BAAEC,WAAW;gCAAEC,QAAQ1B,gBAAgBe;4BAAO;wBAAE;wBAChD;4BAAEY,WAAW;gCAAEC,QAAQ;4BAAM;wBAAE;qBAChC;gBACH;YACF;YACA,MAAMC,MAAMZ,KAAKa,IAAI,CAAC,EAAE;YAExB,IACE,CAACD,OACA,OAAOA,IAAIE,EAAE,KAAK,YAAY,OAAOF,IAAIE,EAAE,KAAK,YAChD,OAAOF,IAAIG,KAAK,KAAK,YAAY,OAAOH,IAAIG,KAAK,KAAK,UACvD;gBACA,OAAO;oBAAEhB,MAAM;gBAAK;YACtB;YAEA,MAAMA,OAAO,MAAMH,QAChBoB,QAAQ,CAAC;gBAAEd,YAAYb;gBAAgByB,IAAIF,IAAIG,KAAK;gBAAEZ,OAAO;gBAAGE,gBAAgB;YAAK,GACrFY,KAAK,CAAC,IAAM;YAEf,IAAI,CAAClB,MAAM,OAAO;gBAAEA,MAAM;YAAK;YAE/B,MAAMH,QAAQsB,MAAM,CAAC;gBACnBhB,YAAYZ;gBACZwB,IAAIF,IAAIE,EAAE;gBACVK,MAAM;oBAAEC,YAAY,IAAIC,OAAOC,WAAW;gBAAG;gBAC7CjB,gBAAgB;YAClB;YAEA,OAAO;gBACLN,MAAM;oBACJ,GAAGA,IAAI;oBACPG,YAAYb;oBACZkC,WAAWvC;oBACXwC,UAAUZ,IAAIE,EAAE;oBAChB,GAAIF,IAAIa,OAAO,KAAKC,YAAY;wBAAED,SAASb,IAAIa,OAAO;oBAAC,IAAI,CAAC,CAAC;oBAC7D,GAAI,OAAOb,IAAIe,iBAAiB,KAAK,WACjC;wBAAEA,mBAAmBf,IAAIe,iBAAiB;oBAAC,IAC3C,CAAC,CAAC;gBACR;YACF;QACF;IACF;IAEA1C,iBAAiB2C,GAAG,CAACnC;IAErB,OAAOA;AACT;AAEA,OAAO,SAASoC,iBAAiBpC,QAAsB;IACrD,OAAOR,iBAAiB6C,GAAG,CAACrC;AAC9B;AAEA,OAAO,MAAMsC,eAAiC,CAAC,EAAEhC,IAAI,EAAE;IACrD,IAAIA,MAAMwB,cAAcvC,oBAAoB;IAE5C,OAAO;QAAEe;IAAK;AAChB,EAAE","file":"strategy.js"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frogbotai/plugin-api-keys",
-  "version": "0.28.0",
+  "version": "0.30.0",
   "description": "Multiple named API keys for FrogBot.",
   "license": "MIT",
   "author": "Colby Gilbert",
@@ -38,8 +38,8 @@
     "@payloadcms/ui": "3.90.1",
     "react": "^19.0.1 || ^19.1.2 || ^19.2.1",
     "react-dom": "^19.0.1 || ^19.1.2 || ^19.2.1",
-    "@frogbotai/gateway": "0.28.0",
-    "frogbot": "0.28.0"
+    "@frogbotai/gateway": "0.30.0",
+    "frogbot": "0.30.0"
   },
   "devDependencies": {
     "@payloadcms/ui": "3.90.1",
@@ -48,15 +48,15 @@
     "react": "19.2.6",
     "react-dom": "19.2.6",
     "typescript": "5.6.2",
-    "@frogbotai/gateway": "0.28.0",
-    "frogbot": "0.28.0",
-    "@frogbotai/plugin-roles": "0.28.0"
+    "@frogbotai/plugin-roles": "0.30.0",
+    "@frogbotai/gateway": "0.30.0",
+    "frogbot": "0.30.0"
   },
   "publishConfig": {
     "access": "public"
   },
   "scripts": {
-    "build": "rm -rf dist && tsc -p tsconfig.json && cp src/client/styles.css dist/client/styles.css",
+    "build": "node ../../../scripts/build-package.mjs --assets css",
     "clean": "rm -rf dist",
     "typecheck": "tsc --noEmit"
   }