@payloadcms/figma 0.1.0-alpha.6 → 0.1.0-internal.10c3b07

package/dist/db-content-api/utilities/auth.d.ts

@@ -12,7 +12,10 @@ type TokenStoreAuth = {
 type DevJwtAuth = {
     mode: 'devJwt';
 };
-export type AuthMode = ApiKeyAuth | DevJwtAuth | TokenStoreAuth;
+type EgressProxyAuth = {
+    mode: 'egressProxy';
+};
+export type AuthMode = ApiKeyAuth | DevJwtAuth | EgressProxyAuth | TokenStoreAuth;
 export declare function fetchDevJwt(url: string, contentSystemId: string): Promise<string>;
 export declare function createAuthMiddleware(opts: {
     auth: AuthMode;

package/dist/db-content-api/utilities/auth.js

@@ -33,7 +33,7 @@ export function createAuthMiddleware(opts) {
                     throw new Error('Authentication required. Run `npx @payloadcms/figma login` to authenticate.');
                 }
                 request.headers.set('Authorization', `Bearer ${token}`);
-            } else {
+            } else if (opts.auth.mode === 'devJwt') {
                 let token = devJwtCache.get(opts.contentSystemId);
                 if (!token) {
                     token = await fetchDevJwt(opts.url, opts.contentSystemId);

package/dist/plugin/build-config.js

@@ -171,7 +171,14 @@ function messageOf(error) {
 /**
  * Creates storage configuration for upload collections
  */ function createStorageConfig(url, contentSystemId) {
-    const storageConfig = process.env.FIGMA_CONTENT_API_ACCESS_KEY ? {
+    const usesEgressProxy = process.env.FIGMA_CONTENT_API_AUTH_MODE === 'egress-proxy';
+    const storageConfig = usesEgressProxy ? {
+        auth: {
+            mode: 'egressProxy'
+        },
+        baseUrl: url,
+        contentSystemId
+    } : process.env.FIGMA_CONTENT_API_ACCESS_KEY ? {
         baseUrl: url,
         contentApiKey: process.env.FIGMA_CONTENT_API_ACCESS_KEY
     } : process.env.FIGMA_DEV_JWT === 'true' ? {
@@ -272,11 +279,12 @@ export async function buildFigmaConfig(config) {
     }
     const url = process.env.FIGMA_CONTENT_API_URL || envConfig.contentApiUrl;
     const isProduction = process.env.NODE_ENV === 'production';
+    const usesEgressProxy = process.env.FIGMA_CONTENT_API_AUTH_MODE === 'egress-proxy';
     // The deployed Lambda runs all queued jobs; locally there is no runner, so the db adapter logs
     // a heads-up whenever a job is queued. Deployed environments set DISABLE_LOCAL_JOB_QUEUE_NOTIFICATIONS=true
     // (injected by the control plane); end-users can also set it locally to silence the notice.
     const notifyLocalJobQueue = process.env.DISABLE_LOCAL_JOB_QUEUE_NOTIFICATIONS !== 'true';
-    const usesTokenStoreAuth = !process.env.FIGMA_CONTENT_API_ACCESS_KEY && process.env.FIGMA_DEV_JWT !== 'true';
+    const usesTokenStoreAuth = !usesEgressProxy && !process.env.FIGMA_CONTENT_API_ACCESS_KEY && process.env.FIGMA_DEV_JWT !== 'true';
     if (usesTokenStoreAuth) {
         logMissingCliAuth(getTokenStore());
     }
@@ -285,6 +293,16 @@ export async function buildFigmaConfig(config) {
     const usesContentSystem = config.figma.useContentSystem !== false;
     if (!usesContentSystem) {
         db = config.db;
+    } else if (usesEgressProxy) {
+        db = contentAPIAdapter({
+            auth: {
+                mode: 'egressProxy'
+            },
+            contentSystemId,
+            environmentName: process.env.FIGMA_ENVIRONMENT_NAME,
+            notifyLocalJobQueue,
+            url
+        });
     } else if (process.env.FIGMA_CONTENT_API_ACCESS_KEY) {
         db = contentAPIAdapter({
             auth: {

package/dist/storage-content-api/client.d.ts

@@ -1,5 +1,7 @@
+import type { Middleware } from 'openapi-fetch';
 import createClient from 'openapi-fetch';
 import type { UploadPaths } from './api-types.js';
 import type { StorageClientConfig } from './types.js';
 export type StorageClient = ReturnType<typeof createClient<UploadPaths>>;
 export declare function createStorageClient(config: StorageClientConfig): StorageClient;
+export declare function createStorageAuthMiddleware(config: StorageClientConfig): Middleware;

package/dist/storage-content-api/client.js

@@ -8,7 +8,7 @@ export function createStorageClient(config) {
     client.use(createStorageAuthMiddleware(config));
     return client;
 }
-function createStorageAuthMiddleware(config) {
+export function createStorageAuthMiddleware(config) {
     return {
         async onRequest ({ request }) {
             if ('contentApiKey' in config) {
@@ -26,7 +26,7 @@ function createStorageAuthMiddleware(config) {
                         throw new Error('Authentication required. Run `npx @payloadcms/figma login` to authenticate.');
                     }
                     request.headers.set('Authorization', `Bearer ${token}`);
-                } else {
+                } else if (auth.mode === 'devJwt') {
                     const token = await fetchDevJwt(config.baseUrl, contentSystemId);
                     request.headers.set('Authorization', `Bearer ${token}`);
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/figma",
-  "version": "0.1.0-alpha.6",
+  "version": "0.1.0-internal.10c3b07",
   "license": "SEE LICENSE IN LICENSE.md",
   "type": "module",
   "exports": {