npm - @payloadcms/payload-cloud - Versions diffs - 4.0.0-internal.435b2d6 → 4.0.0-internal.44ac9c8 - Mend

@payloadcms/payload-cloud 4.0.0-internal.435b2d6 → 4.0.0-internal.44ac9c8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/dist/plugin.d.ts.map +1 -1
package/dist/plugin.js +11 -7
package/dist/plugin.js.map +1 -1
package/dist/staticHandler.d.ts.map +1 -1
package/dist/staticHandler.js +11 -4
package/dist/staticHandler.js.map +1 -1
package/package.json +5 -5

package/dist/plugin.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAW,MAAM,SAAS,CAAA;AAE9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAW/C,eAAO,MAAM,oBAAoB,QAAO,MAGvC,CAAA;AAUD,eAAO,MAAM,kBAAkB,mBACZ,aAAa,sBACP,MAAM,KAAG,OAAO,CAAC,MAAM,~~CAqJ7C~~,CAAA"}
1	+ {"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAW,MAAM,SAAS,CAAA;AAE9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAW/C,eAAO,MAAM,oBAAoB,QAAO,MAGvC,CAAA;AAUD,eAAO,MAAM,kBAAkB,mBACZ,aAAa,sBACP,MAAM,KAAG,OAAO,CAAC,MAAM,CAyJ7C,CAAA"}

package/dist/plugin.js CHANGED Viewed

@@ -101,9 +101,15 @@ export const payloadCloudPlugin = (pluginOptions)=>async (incomingConfig)=>{
             ...config.globals || [],
             {
                 slug: 'payload-cloud-instance',
+                access: {
+                    read: ()=>false,
+                    readVersions: ()=>false,
+                    update: ()=>false
+                },
                 admin: {
                     hidden: true
                 },
+                authorship: false,
                 fields: [
                     {
                         name: 'instance',
@@ -121,13 +127,10 @@ export const payloadCloudPlugin = (pluginOptions)=>async (incomingConfig)=>{
         const newShouldAutoRun = async (payload)=>{
             if (process.env.PAYLOAD_CLOUD_JOBS_INSTANCE) {
                 const retrievedGlobal = await payload.findGlobal({
-                    slug: 'payload-cloud-instance'
+                    slug: 'payload-cloud-instance',
+                    overrideAccess: true
                 });
-                if (retrievedGlobal.instance === process.env.PAYLOAD_CLOUD_JOBS_INSTANCE) {
-                    return true;
-                } else {
-                    process.env.PAYLOAD_CLOUD_JOBS_INSTANCE = '';
-                }
+                return retrievedGlobal.instance === process.env.PAYLOAD_CLOUD_JOBS_INSTANCE;
             }
             return false;
         };
@@ -142,7 +145,8 @@ export const payloadCloudPlugin = (pluginOptions)=>async (incomingConfig)=>{
                 slug: 'payload-cloud-instance',
                 data: {
                     instance
-                }
+                },
+                overrideAccess: true
             });
             if (!hasExistingAutorun) {
                 return [

package/dist/plugin.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/plugin.ts"],"sourcesContent":["import type { Config, Payload } from 'payload'\n\nimport type { PluginOptions } from './types.js'\n\nimport { payloadCloudEmail } from './email.js'\nimport { getAfterDeleteHook } from './hooks/afterDelete.js'\nimport { getBeforeChangeHook } from './hooks/beforeChange.js'\nimport {\n getCacheUploadsAfterChangeHook,\n getCacheUploadsAfterDeleteHook,\n} from './hooks/uploadCache.js'\nimport { getStaticHandler } from './staticHandler.js'\n\nexport const generateRandomString = (): string => {\n const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'\n return Array.from({ length: 24 }, () => chars[Math.floor(Math.random() * chars.length)]).join('')\n}\n\nconst DEFAULT_CRON = '* * * * *'\nconst DEFAULT_LIMIT = 10\nconst DEFAULT_CRON_JOB = {\n cron: DEFAULT_CRON,\n limit: DEFAULT_LIMIT,\n queue: 'default',\n}\n\nexport const payloadCloudPlugin =\n (pluginOptions?: PluginOptions) =>\n async (incomingConfig: Config): Promise<Config> => {\n let config = { ...incomingConfig }\n\n if (process.env.PAYLOAD_CLOUD !== 'true') {\n return config\n }\n\n const cachingEnabled =\n pluginOptions?.uploadCaching !== false && !!process.env.PAYLOAD_CLOUD_CACHE_KEY\n\n const apiEndpoint = pluginOptions?.endpoint \|\| 'https://cloud-api.payloadcms.com'\n\n // Configure cloud storage\n if (pluginOptions?.storage !== false) {\n config = {\n ...config,\n collections: (config.collections \|\| []).map((collection) => {\n if (collection.upload) {\n return {\n ...collection,\n hooks: {\n ...(collection.hooks \|\| {}),\n afterChange: [\n ...(collection.hooks?.afterChange \|\| []),\n ...(cachingEnabled\n ? [getCacheUploadsAfterChangeHook({ endpoint: apiEndpoint })]\n : []),\n ],\n afterDelete: [\n ...(collection.hooks?.afterDelete \|\| []),\n getAfterDeleteHook({ collection }),\n ...(cachingEnabled\n ? [getCacheUploadsAfterDeleteHook({ endpoint: apiEndpoint })]\n : []),\n ],\n beforeChange: [\n ...(collection.hooks?.beforeChange \|\| []),\n getBeforeChangeHook({ collection }),\n ],\n },\n upload: {\n ...(typeof collection.upload === 'object' ? collection.upload : {}),\n disableLocalStorage: true,\n handlers: [\n ...(typeof collection.upload === 'object' &&\n Array.isArray(collection.upload.handlers)\n ? collection.upload.handlers\n : []),\n getStaticHandler({\n cachingOptions: pluginOptions?.uploadCaching,\n collection,\n debug: pluginOptions?.debug,\n }),\n ],\n },\n }\n }\n\n return collection\n }),\n upload: {\n ...(config.upload \|\| {}),\n useTempFiles: true,\n },\n }\n }\n\n // Configure cloud email\n const apiKey = process.env.PAYLOAD_CLOUD_EMAIL_API_KEY\n const defaultDomain = process.env.PAYLOAD_CLOUD_DEFAULT_DOMAIN\n if (pluginOptions?.email !== false && apiKey && defaultDomain) {\n config.email = await payloadCloudEmail({\n apiKey,\n config,\n defaultDomain,\n defaultFromAddress: pluginOptions?.email?.defaultFromAddress,\n defaultFromName: pluginOptions?.email?.defaultFromName,\n skipVerify: pluginOptions?.email?.skipVerify,\n })\n }\n\n // We make sure to only run cronjobs on one instance using a instance identifier stored in a global.\n config.globals = [\n ...(config.globals \|\| []),\n {\n slug: 'payload-cloud-instance',\n admin: {\n hidden: true,\n },\n fields: [\n {\n name: 'instance',\n type: 'text',\n required: true,\n },\n ],\n },\n ]\n\n if (pluginOptions?.enableAutoRun === false) {\n return config\n }\n\n const oldAutoRunCopy = config.jobs?.autoRun ?? []\n\n const hasExistingAutorun = Boolean(config.jobs?.autoRun)\n\n const newShouldAutoRun = async (payload: Payload) => {\n if (process.env.PAYLOAD_CLOUD_JOBS_INSTANCE) {\n const retrievedGlobal = await payload.findGlobal({\n slug: 'payload-cloud-instance',\n })\n\n if (retrievedGlobal.instance === process.env.PAYLOAD_CLOUD_JOBS_INSTANCE) {\n return true\n } else {\n process.env.PAYLOAD_CLOUD_JOBS_INSTANCE = ''\n }\n }\n\n return false\n }\n\n if (!config.jobs?.shouldAutoRun) {\n ;(config.jobs ??= {}).shouldAutoRun = newShouldAutoRun\n }\n\n const newAutoRun = async (payload: Payload) => {\n const instance = generateRandomString()\n\n process.env.PAYLOAD_CLOUD_JOBS_INSTANCE = instance\n\n await payload.updateGlobal({\n slug: 'payload-cloud-instance',\n data: {\n instance,\n },\n })\n\n if (!hasExistingAutorun) {\n return [DEFAULT_CRON_JOB]\n }\n\n return typeof oldAutoRunCopy === 'function' ? await oldAutoRunCopy(payload) : oldAutoRunCopy\n }\n\n config.jobs.autoRun = newAutoRun\n\n return config\n }\n"],"names":["payloadCloudEmail","getAfterDeleteHook","getBeforeChangeHook","getCacheUploadsAfterChangeHook","getCacheUploadsAfterDeleteHook","getStaticHandler","generateRandomString","chars","Array","from","length","Math","floor","random","join","DEFAULT_CRON","DEFAULT_LIMIT","DEFAULT_CRON_JOB","cron","limit","queue","payloadCloudPlugin","pluginOptions","incomingConfig","config","process","env","PAYLOAD_CLOUD","cachingEnabled","uploadCaching","PAYLOAD_CLOUD_CACHE_KEY","apiEndpoint","endpoint","storage","collections","map","collection","upload","hooks","afterChange","afterDelete","beforeChange","disableLocalStorage","handlers","isArray","cachingOptions","debug","useTempFiles","apiKey","PAYLOAD_CLOUD_EMAIL_API_KEY","defaultDomain","PAYLOAD_CLOUD_DEFAULT_DOMAIN","email","defaultFromAddress","defaultFromName","skipVerify","globals","slug","admin","hidden","fields","name","type","required","enableAutoRun","oldAutoRunCopy","jobs","autoRun","hasExistingAutorun","Boolean","newShouldAutoRun","payload","PAYLOAD_CLOUD_JOBS_INSTANCE","retrievedGlobal","findGlobal","instance","shouldAutoRun","newAutoRun","updateGlobal","data"],"mappings":"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"}
1	+ {"version":3,"sources":["../src/plugin.ts"],"sourcesContent":["import type { Config, Payload } from 'payload'\n\nimport type { PluginOptions } from './types.js'\n\nimport { payloadCloudEmail } from './email.js'\nimport { getAfterDeleteHook } from './hooks/afterDelete.js'\nimport { getBeforeChangeHook } from './hooks/beforeChange.js'\nimport {\n getCacheUploadsAfterChangeHook,\n getCacheUploadsAfterDeleteHook,\n} from './hooks/uploadCache.js'\nimport { getStaticHandler } from './staticHandler.js'\n\nexport const generateRandomString = (): string => {\n const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'\n return Array.from({ length: 24 }, () => chars[Math.floor(Math.random() * chars.length)]).join('')\n}\n\nconst DEFAULT_CRON = '* * * * *'\nconst DEFAULT_LIMIT = 10\nconst DEFAULT_CRON_JOB = {\n cron: DEFAULT_CRON,\n limit: DEFAULT_LIMIT,\n queue: 'default',\n}\n\nexport const payloadCloudPlugin =\n (pluginOptions?: PluginOptions) =>\n async (incomingConfig: Config): Promise<Config> => {\n let config = { ...incomingConfig }\n\n if (process.env.PAYLOAD_CLOUD !== 'true') {\n return config\n }\n\n const cachingEnabled =\n pluginOptions?.uploadCaching !== false && !!process.env.PAYLOAD_CLOUD_CACHE_KEY\n\n const apiEndpoint = pluginOptions?.endpoint \|\| 'https://cloud-api.payloadcms.com'\n\n // Configure cloud storage\n if (pluginOptions?.storage !== false) {\n config = {\n ...config,\n collections: (config.collections \|\| []).map((collection) => {\n if (collection.upload) {\n return {\n ...collection,\n hooks: {\n ...(collection.hooks \|\| {}),\n afterChange: [\n ...(collection.hooks?.afterChange \|\| []),\n ...(cachingEnabled\n ? [getCacheUploadsAfterChangeHook({ endpoint: apiEndpoint })]\n : []),\n ],\n afterDelete: [\n ...(collection.hooks?.afterDelete \|\| []),\n getAfterDeleteHook({ collection }),\n ...(cachingEnabled\n ? [getCacheUploadsAfterDeleteHook({ endpoint: apiEndpoint })]\n : []),\n ],\n beforeChange: [\n ...(collection.hooks?.beforeChange \|\| []),\n getBeforeChangeHook({ collection }),\n ],\n },\n upload: {\n ...(typeof collection.upload === 'object' ? collection.upload : {}),\n disableLocalStorage: true,\n handlers: [\n ...(typeof collection.upload === 'object' &&\n Array.isArray(collection.upload.handlers)\n ? collection.upload.handlers\n : []),\n getStaticHandler({\n cachingOptions: pluginOptions?.uploadCaching,\n collection,\n debug: pluginOptions?.debug,\n }),\n ],\n },\n }\n }\n\n return collection\n }),\n upload: {\n ...(config.upload \|\| {}),\n useTempFiles: true,\n },\n }\n }\n\n // Configure cloud email\n const apiKey = process.env.PAYLOAD_CLOUD_EMAIL_API_KEY\n const defaultDomain = process.env.PAYLOAD_CLOUD_DEFAULT_DOMAIN\n if (pluginOptions?.email !== false && apiKey && defaultDomain) {\n config.email = await payloadCloudEmail({\n apiKey,\n config,\n defaultDomain,\n defaultFromAddress: pluginOptions?.email?.defaultFromAddress,\n defaultFromName: pluginOptions?.email?.defaultFromName,\n skipVerify: pluginOptions?.email?.skipVerify,\n })\n }\n\n // We make sure to only run cronjobs on one instance using a instance identifier stored in a global.\n config.globals = [\n ...(config.globals \|\| []),\n {\n slug: 'payload-cloud-instance',\n access: {\n read: () => false,\n readVersions: () => false,\n update: () => false,\n },\n admin: {\n hidden: true,\n },\n authorship: false,\n fields: [\n {\n name: 'instance',\n type: 'text',\n required: true,\n },\n ],\n },\n ]\n\n if (pluginOptions?.enableAutoRun === false) {\n return config\n }\n\n const oldAutoRunCopy = config.jobs?.autoRun ?? []\n\n const hasExistingAutorun = Boolean(config.jobs?.autoRun)\n\n const newShouldAutoRun = async (payload: Payload) => {\n if (process.env.PAYLOAD_CLOUD_JOBS_INSTANCE) {\n const retrievedGlobal = await payload.findGlobal({\n slug: 'payload-cloud-instance',\n overrideAccess: true,\n })\n\n return retrievedGlobal.instance === process.env.PAYLOAD_CLOUD_JOBS_INSTANCE\n }\n\n return false\n }\n\n if (!config.jobs?.shouldAutoRun) {\n ;(config.jobs ??= {}).shouldAutoRun = newShouldAutoRun\n }\n\n const newAutoRun = async (payload: Payload) => {\n const instance = generateRandomString()\n\n process.env.PAYLOAD_CLOUD_JOBS_INSTANCE = instance\n\n await payload.updateGlobal({\n slug: 'payload-cloud-instance',\n data: {\n instance,\n },\n overrideAccess: true,\n })\n\n if (!hasExistingAutorun) {\n return [DEFAULT_CRON_JOB]\n }\n\n return typeof oldAutoRunCopy === 'function' ? await oldAutoRunCopy(payload) : oldAutoRunCopy\n }\n\n config.jobs.autoRun = newAutoRun\n\n return config\n }\n"],"names":["payloadCloudEmail","getAfterDeleteHook","getBeforeChangeHook","getCacheUploadsAfterChangeHook","getCacheUploadsAfterDeleteHook","getStaticHandler","generateRandomString","chars","Array","from","length","Math","floor","random","join","DEFAULT_CRON","DEFAULT_LIMIT","DEFAULT_CRON_JOB","cron","limit","queue","payloadCloudPlugin","pluginOptions","incomingConfig","config","process","env","PAYLOAD_CLOUD","cachingEnabled","uploadCaching","PAYLOAD_CLOUD_CACHE_KEY","apiEndpoint","endpoint","storage","collections","map","collection","upload","hooks","afterChange","afterDelete","beforeChange","disableLocalStorage","handlers","isArray","cachingOptions","debug","useTempFiles","apiKey","PAYLOAD_CLOUD_EMAIL_API_KEY","defaultDomain","PAYLOAD_CLOUD_DEFAULT_DOMAIN","email","defaultFromAddress","defaultFromName","skipVerify","globals","slug","access","read","readVersions","update","admin","hidden","authorship","fields","name","type","required","enableAutoRun","oldAutoRunCopy","jobs","autoRun","hasExistingAutorun","Boolean","newShouldAutoRun","payload","PAYLOAD_CLOUD_JOBS_INSTANCE","retrievedGlobal","findGlobal","overrideAccess","instance","shouldAutoRun","newAutoRun","updateGlobal","data"],"mappings":"AAIA,SAASA,iBAAiB,QAAQ,aAAY;AAC9C,SAASC,kBAAkB,QAAQ,yBAAwB;AAC3D,SAASC,mBAAmB,QAAQ,0BAAyB;AAC7D,SACEC,8BAA8B,EAC9BC,8BAA8B,QACzB,yBAAwB;AAC/B,SAASC,gBAAgB,QAAQ,qBAAoB;AAErD,OAAO,MAAMC,uBAAuB;IAClC,MAAMC,QAAQ;IACd,OAAOC,MAAMC,IAAI,CAAC;QAAEC,QAAQ;IAAG,GAAG,IAAMH,KAAK,CAACI,KAAKC,KAAK,CAACD,KAAKE,MAAM,KAAKN,MAAMG,MAAM,EAAE,EAAEI,IAAI,CAAC;AAChG,EAAC;AAED,MAAMC,eAAe;AACrB,MAAMC,gBAAgB;AACtB,MAAMC,mBAAmB;IACvBC,MAAMH;IACNI,OAAOH;IACPI,OAAO;AACT;AAEA,OAAO,MAAMC,qBACX,CAACC,gBACD,OAAOC;QACL,IAAIC,SAAS;YAAE,GAAGD,cAAc;QAAC;QAEjC,IAAIE,QAAQC,GAAG,CAACC,aAAa,KAAK,QAAQ;YACxC,OAAOH;QACT;QAEA,MAAMI,iBACJN,eAAeO,kBAAkB,SAAS,CAAC,CAACJ,QAAQC,GAAG,CAACI,uBAAuB;QAEjF,MAAMC,cAAcT,eAAeU,YAAY;QAE/C,0BAA0B;QAC1B,IAAIV,eAAeW,YAAY,OAAO;YACpCT,SAAS;gBACP,GAAGA,MAAM;gBACTU,aAAa,AAACV,CAAAA,OAAOU,WAAW,IAAI,EAAE,AAAD,EAAGC,GAAG,CAAC,CAACC;oBAC3C,IAAIA,WAAWC,MAAM,EAAE;wBACrB,OAAO;4BACL,GAAGD,UAAU;4BACbE,OAAO;gCACL,GAAIF,WAAWE,KAAK,IAAI,CAAC,CAAC;gCAC1BC,aAAa;uCACPH,WAAWE,KAAK,EAAEC,eAAe,EAAE;uCACnCX,iBACA;wCAACzB,+BAA+B;4CAAE6B,UAAUD;wCAAY;qCAAG,GAC3D,EAAE;iCACP;gCACDS,aAAa;uCACPJ,WAAWE,KAAK,EAAEE,eAAe,EAAE;oCACvCvC,mBAAmB;wCAAEmC;oCAAW;uCAC5BR,iBACA;wCAACxB,+BAA+B;4CAAE4B,UAAUD;wCAAY;qCAAG,GAC3D,EAAE;iCACP;gCACDU,cAAc;uCACRL,WAAWE,KAAK,EAAEG,gBAAgB,EAAE;oCACxCvC,oBAAoB;wCAAEkC;oCAAW;iCAClC;4BACH;4BACAC,QAAQ;gCACN,GAAI,OAAOD,WAAWC,MAAM,KAAK,WAAWD,WAAWC,MAAM,GAAG,CAAC,CAAC;gCAClEK,qBAAqB;gCACrBC,UAAU;uCACJ,OAAOP,WAAWC,MAAM,KAAK,YACjC7B,MAAMoC,OAAO,CAACR,WAAWC,MAAM,CAACM,QAAQ,IACpCP,WAAWC,MAAM,CAACM,QAAQ,GAC1B,EAAE;oCACNtC,iBAAiB;wCACfwC,gBAAgBvB,eAAeO;wCAC/BO;wCACAU,OAAOxB,eAAewB;oCACxB;iCACD;4BACH;wBACF;oBACF;oBAEA,OAAOV;gBACT;gBACAC,QAAQ;oBACN,GAAIb,OAAOa,MAAM,IAAI,CAAC,CAAC;oBACvBU,cAAc;gBAChB;YACF;QACF;QAEA,wBAAwB;QACxB,MAAMC,SAASvB,QAAQC,GAAG,CAACuB,2BAA2B;QACtD,MAAMC,gBAAgBzB,QAAQC,GAAG,CAACyB,4BAA4B;QAC9D,IAAI7B,eAAe8B,UAAU,SAASJ,UAAUE,eAAe;YAC7D1B,OAAO4B,KAAK,GAAG,MAAMpD,kBAAkB;gBACrCgD;gBACAxB;gBACA0B;gBACAG,oBAAoB/B,eAAe8B,OAAOC;gBAC1CC,iBAAiBhC,eAAe8B,OAAOE;gBACvCC,YAAYjC,eAAe8B,OAAOG;YACpC;QACF;QAEA,oGAAoG;QACpG/B,OAAOgC,OAAO,GAAG;eACXhC,OAAOgC,OAAO,IAAI,EAAE;YACxB;gBACEC,MAAM;gBACNC,QAAQ;oBACNC,MAAM,IAAM;oBACZC,cAAc,IAAM;oBACpBC,QAAQ,IAAM;gBAChB;gBACAC,OAAO;oBACLC,QAAQ;gBACV;gBACAC,YAAY;gBACZC,QAAQ;oBACN;wBACEC,MAAM;wBACNC,MAAM;wBACNC,UAAU;oBACZ;iBACD;YACH;SACD;QAED,IAAI9C,eAAe+C,kBAAkB,OAAO;YAC1C,OAAO7C;QACT;QAEA,MAAM8C,iBAAiB9C,OAAO+C,IAAI,EAAEC,WAAW,EAAE;QAEjD,MAAMC,qBAAqBC,QAAQlD,OAAO+C,IAAI,EAAEC;QAEhD,MAAMG,mBAAmB,OAAOC;YAC9B,IAAInD,QAAQC,GAAG,CAACmD,2BAA2B,EAAE;gBAC3C,MAAMC,kBAAkB,MAAMF,QAAQG,UAAU,CAAC;oBAC/CtB,MAAM;oBACNuB,gBAAgB;gBAClB;gBAEA,OAAOF,gBAAgBG,QAAQ,KAAKxD,QAAQC,GAAG,CAACmD,2BAA2B;YAC7E;YAEA,OAAO;QACT;QAEA,IAAI,CAACrD,OAAO+C,IAAI,EAAEW,eAAe;;YAC7B1D,CAAAA,OAAO+C,IAAI,KAAK,CAAC,CAAA,EAAGW,aAAa,GAAGP;QACxC;QAEA,MAAMQ,aAAa,OAAOP;YACxB,MAAMK,WAAW3E;YAEjBmB,QAAQC,GAAG,CAACmD,2BAA2B,GAAGI;YAE1C,MAAML,QAAQQ,YAAY,CAAC;gBACzB3B,MAAM;gBACN4B,MAAM;oBACJJ;gBACF;gBACAD,gBAAgB;YAClB;YAEA,IAAI,CAACP,oBAAoB;gBACvB,OAAO;oBAACxD;iBAAiB;YAC3B;YAEA,OAAO,OAAOqD,mBAAmB,aAAa,MAAMA,eAAeM,WAAWN;QAChF;QAEA9C,OAAO+C,IAAI,CAACC,OAAO,GAAGW;QAEtB,OAAO3D;IACT,EAAC"}

package/dist/staticHandler.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"staticHandler.d.ts","sourceRoot":"","sources":["../src/staticHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;~~AAG~~/C,OAAO,KAAK,EAA2B,aAAa,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAKvF,UAAU,IAAI;IACZ,cAAc,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,CAAA;IAC/C,UAAU,EAAE,gBAAgB,CAAA;IAC5B,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB;AAuBD,eAAO,MAAM,gBAAgB,0CAA2C,IAAI,KAAG,~~aA2G9E~~,CAAA"}
1	+ {"version":3,"file":"staticHandler.d.ts","sourceRoot":"","sources":["../src/staticHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAK/C,OAAO,KAAK,EAA2B,aAAa,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAKvF,UAAU,IAAI;IACZ,cAAc,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,CAAA;IAC/C,UAAU,EAAE,gBAAgB,CAAA;IAC5B,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB;AAuBD,eAAO,MAAM,gBAAgB,0CAA2C,IAAI,KAAG,aAmH9E,CAAA"}

package/dist/staticHandler.js CHANGED Viewed

@@ -1,3 +1,4 @@
+import { isXmlMimeType, uploadContentSecurityPolicy } from 'payload/internal';
 import { createKey } from './utilities/createKey.js';
 import { getStorageClient } from './utilities/getStorageClient.js';
 // Type guard for NodeJS.Readable streams
@@ -64,12 +65,18 @@ export const getStaticHandler = ({ cachingOptions, collection, debug })=>{
                 },
                 ETag: object.ETag
             };
-            // Add Content-Security-Policy header for SVG files to prevent executable code
-            if (object.ContentType === 'image/svg+xml') {
-                responseHeaders['Content-Security-Policy'] = "script-src 'none'";
+            // Apply a restrictive policy to XML-family responses served through Payload.
+            if (isXmlMimeType(object.ContentType)) {
+                responseHeaders['Content-Security-Policy'] = uploadContentSecurityPolicy;
+            }
+            let headers = new Headers(responseHeaders);
+            if (typeof collection.upload === 'object' && typeof collection.upload.modifyResponseHeaders === 'function') {
+                headers = collection.upload.modifyResponseHeaders({
+                    headers
+                }) || headers;
             }
             return new Response(bodyBuffer, {
-                headers: new Headers(responseHeaders),
+                headers,
                 status: 200
             });
         } catch (err) {

package/dist/staticHandler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/staticHandler.ts"],"sourcesContent":["import type { CollectionConfig } from 'payload'\nimport type { Readable } from 'stream'\n\nimport type { CollectionCachingConfig, PluginOptions, StaticHandler } from './types.js'\n\nimport { createKey } from './utilities/createKey.js'\nimport { getStorageClient } from './utilities/getStorageClient.js'\n\ninterface Args {\n cachingOptions?: PluginOptions['uploadCaching']\n collection: CollectionConfig\n debug?: boolean\n}\n\n// Type guard for NodeJS.Readable streams\nconst isNodeReadableStream = (body: unknown): body is Readable => {\n return (\n typeof body === 'object' &&\n body !== null &&\n 'pipe' in body &&\n typeof (body as any).pipe === 'function' &&\n 'destroy' in body &&\n typeof (body as any).destroy === 'function'\n )\n}\n\n// Convert a stream into a promise that resolves with a Buffer\nconst streamToBuffer = async (readableStream: any) => {\n const chunks = []\n for await (const chunk of readableStream) {\n chunks.push(typeof chunk === 'string' ? Buffer.from(chunk) : chunk)\n }\n return Buffer.concat(chunks)\n}\n\nexport const getStaticHandler = ({ cachingOptions, collection, debug }: Args): StaticHandler => {\n let maxAge = 86400 // 24 hours default\n let collCacheConfig: CollectionCachingConfig \| undefined\n if (cachingOptions !== false) {\n // Set custom maxAge for all collections\n maxAge = cachingOptions?.maxAge \|\| maxAge\n collCacheConfig = cachingOptions?.collections?.[collection.slug] \|\| {}\n }\n\n // Set maxAge using collection-specific override\n maxAge = collCacheConfig?.maxAge \|\| maxAge\n\n const cachingEnabled =\n cachingOptions !== false &&\n !!process.env.PAYLOAD_CLOUD_CACHE_KEY &&\n collCacheConfig?.enabled !== false\n\n return async (req, { params }) => {\n let key = ''\n try {\n const { identityID, storageClient } = await getStorageClient()\n\n key = createKey({\n collection: collection.slug,\n filename: params.filename,\n identityID,\n })\n\n const object = await storageClient.getObject({\n Bucket: process.env.PAYLOAD_CLOUD_BUCKET,\n Key: key,\n })\n\n if (!object.Body \|\| !object.ContentType \|\| !object.ETag) {\n return new Response(null, { status: 404, statusText: 'Not Found' })\n }\n\n // On error, manually destroy stream to close socket\n if (object.Body && isNodeReadableStream(object.Body)) {\n const stream = object.Body\n stream.on('error', (err) => {\n req.payload.logger.error({\n err,\n key,\n msg: 'Error streaming S3 object, destroying stream',\n })\n stream.destroy()\n })\n }\n\n const bodyBuffer = await streamToBuffer(object.Body)\n\n const responseHeaders: Record<string, string> = {\n 'Content-Length': String(object.ContentLength),\n 'Content-Type': object.ContentType,\n ...(cachingEnabled && { 'Cache-Control': `public, max-age=${maxAge}` }),\n ETag: object.ETag,\n }\n\n // ~~Add~~ ~~Content-Security-Policy~~ ~~header~~ ~~for~~ ~~SVG~~ ~~files~~ to ~~prevent~~ ~~executable~~ ~~code\~~n if (object.ContentType ~~=== 'image/svg+xml'~~) {\n responseHeaders['Content-Security-Policy'] = \~~"script-src~~ '~~none~~'\"\n }\n\n return new Response(bodyBuffer, {\n headers~~: new Headers(responseHeaders)~~,\n status: 200,\n })\n } catch (err: unknown) {\n // Handle each error explicitly\n if (err instanceof Error) {\n /*\n Note: If AccessDenied comes back, it typically means that the object key is not found.\n * The AWS SDK throws this because it attempts an s3:ListBucket operation under the hood\n * if it does not find the object key, which we have disallowed in our bucket policy.\n */\n if (err.name === 'AccessDenied') {\n req.payload.logger.warn({\n awsErr: debug ? err : err.name,\n collectionSlug: collection.slug,\n msg: `Requested file not found in cloud storage: ${params.filename}`,\n params,\n requestedKey: key,\n })\n return new Response(null, { status: 404, statusText: 'Not Found' })\n } else if (err.name === 'NoSuchKey') {\n req.payload.logger.warn({\n awsErr: debug ? err : err.name,\n collectionSlug: collection.slug,\n msg: `Requested file not found in cloud storage: ${params.filename}`,\n params,\n requestedKey: key,\n })\n return new Response(null, { status: 404, statusText: 'Not Found' })\n }\n }\n\n req.payload.logger.error({\n collectionSlug: collection.slug,\n err,\n msg: `Error getting file from cloud storage: ${params.filename}`,\n params,\n requestedKey: key,\n })\n return new Response('Internal Server Error', { status: 500 })\n }\n }\n}\n"],"names":["createKey","getStorageClient","isNodeReadableStream","body","pipe","destroy","streamToBuffer","readableStream","chunks","chunk","push","Buffer","from","concat","getStaticHandler","cachingOptions","collection","debug","maxAge","collCacheConfig","collections","slug","cachingEnabled","process","env","PAYLOAD_CLOUD_CACHE_KEY","enabled","req","params","key","identityID","storageClient","filename","object","getObject","Bucket","PAYLOAD_CLOUD_BUCKET","Key","Body","ContentType","ETag","Response","status","statusText","stream","on","err","payload","logger","error","msg","bodyBuffer","responseHeaders","String","ContentLength","headers","Headers","Error","name","warn","awsErr","collectionSlug","requestedKey"],"mappings":"~~AAKA~~,SAASA,SAAS,QAAQ,2BAA0B;AACpD,SAASC,gBAAgB,QAAQ,kCAAiC;AAQlE,yCAAyC;AACzC,MAAMC,uBAAuB,CAACC;IAC5B,OACE,OAAOA,SAAS,YAChBA,SAAS,QACT,UAAUA,QACV,OAAO,AAACA,KAAaC,IAAI,KAAK,cAC9B,aAAaD,QACb,OAAO,AAACA,KAAaE,OAAO,KAAK;AAErC;AAEA,8DAA8D;AAC9D,MAAMC,iBAAiB,OAAOC;IAC5B,MAAMC,SAAS,EAAE;IACjB,WAAW,MAAMC,SAASF,eAAgB;QACxCC,OAAOE,IAAI,CAAC,OAAOD,UAAU,WAAWE,OAAOC,IAAI,CAACH,SAASA;IAC/D;IACA,OAAOE,OAAOE,MAAM,CAACL;AACvB;AAEA,OAAO,MAAMM,mBAAmB,CAAC,EAAEC,cAAc,EAAEC,UAAU,EAAEC,KAAK,EAAQ;IAC1E,IAAIC,SAAS,MAAM,mBAAmB;;IACtC,IAAIC;IACJ,IAAIJ,mBAAmB,OAAO;QAC5B,wCAAwC;QACxCG,SAASH,gBAAgBG,UAAUA;QACnCC,kBAAkBJ,gBAAgBK,aAAa,CAACJ,WAAWK,IAAI,CAAC,IAAI,CAAC;IACvE;IAEA,gDAAgD;IAChDH,SAASC,iBAAiBD,UAAUA;IAEpC,MAAMI,iBACJP,mBAAmB,SACnB,CAAC,CAACQ,QAAQC,GAAG,CAACC,uBAAuB,IACrCN,iBAAiBO,YAAY;IAE/B,OAAO,OAAOC,KAAK,EAAEC,MAAM,EAAE;QAC3B,IAAIC,MAAM;QACV,IAAI;YACF,MAAM,EAAEC,UAAU,EAAEC,aAAa,EAAE,GAAG,MAAM9B;YAE5C4B,MAAM7B,UAAU;gBACdgB,YAAYA,WAAWK,IAAI;gBAC3BW,UAAUJ,OAAOI,QAAQ;gBACzBF;YACF;YAEA,MAAMG,SAAS,MAAMF,cAAcG,SAAS,CAAC;gBAC3CC,QAAQZ,QAAQC,GAAG,CAACY,oBAAoB;gBACxCC,KAAKR;YACP;YAEA,IAAI,CAACI,OAAOK,IAAI,IAAI,CAACL,OAAOM,WAAW,IAAI,CAACN,OAAOO,IAAI,EAAE;gBACvD,OAAO,IAAIC,SAAS,MAAM;oBAAEC,QAAQ;oBAAKC,YAAY;gBAAY;YACnE;YAEA,oDAAoD;YACpD,IAAIV,OAAOK,IAAI,IAAIpC,qBAAqB+B,OAAOK,IAAI,GAAG;gBACpD,MAAMM,SAASX,OAAOK,IAAI;gBAC1BM,OAAOC,EAAE,CAAC,SAAS,CAACC;oBAClBnB,IAAIoB,OAAO,CAACC,MAAM,CAACC,KAAK,CAAC;wBACvBH;wBACAjB;wBACAqB,KAAK;oBACP;oBACAN,OAAOvC,OAAO;gBAChB;YACF;YAEA,MAAM8C,aAAa,MAAM7C,eAAe2B,OAAOK,IAAI;YAEnD,MAAMc,kBAA0C;gBAC9C,kBAAkBC,OAAOpB,OAAOqB,aAAa;gBAC7C,gBAAgBrB,OAAOM,WAAW;gBAClC,GAAIjB,kBAAkB;oBAAE,iBAAiB,CAAC,gBAAgB,EAAEJ,QAAQ;gBAAC,CAAC;gBACtEsB,MAAMP,OAAOO,IAAI;YACnB;YAEA,~~8EAA8E~~;~~YAC9E~~,~~IAAIP~~,OAAOM,WAAW,~~KAAK,iBAAiB~~;~~gBAC1Ca~~,eAAe,CAAC,0BAA0B,~~GAAG~~;YAC/C;YAEA,OAAO,~~IAAIX~~,SAASU,YAAY;gBAC9BI~~,SAAS,IAAIC,QAAQJ~~;~~gBACrBV~~,QAAQ;YACV;QACF,EAAE,OAAOI,KAAc;YACrB,+BAA+B;YAC/B,IAAIA,~~eAAeW~~,OAAO;gBACxB;;;;SAIC,GACD,~~IAAIX~~,~~IAAIY~~,IAAI,KAAK,gBAAgB;oBAC/~~B/B~~,IAAIoB,OAAO,CAACC,MAAM,~~CAACW~~,IAAI,CAAC;wBACtBC,~~QAAQ3C~~,QAAQ6B,MAAMA,~~IAAIY~~,IAAI;wBAC9BG,~~gBAAgB7C~~,WAAWK,IAAI;wBAC/B6B,KAAK,CAAC,2CAA2C,EAAEtB,OAAOI,QAAQ,EAAE;wBACpEJ;~~wBACAkC~~,~~cAAcjC~~;oBAChB;oBACA,OAAO,IAAIY,SAAS,MAAM;wBAAEC,QAAQ;wBAAKC,YAAY;oBAAY;gBACnE,OAAO,IAAIG,~~IAAIY~~,IAAI,KAAK,aAAa;~~oBACnC/B~~,IAAIoB,OAAO,CAACC,MAAM,~~CAACW~~,IAAI,CAAC;wBACtBC,~~QAAQ3C~~,QAAQ6B,MAAMA,~~IAAIY~~,IAAI;wBAC9BG,~~gBAAgB7C~~,WAAWK,IAAI;wBAC/B6B,KAAK,CAAC,2CAA2C,EAAEtB,OAAOI,QAAQ,EAAE;wBACpEJ;~~wBACAkC~~,~~cAAcjC~~;oBAChB;oBACA,OAAO,IAAIY,SAAS,MAAM;wBAAEC,QAAQ;wBAAKC,YAAY;oBAAY;gBACnE;YACF;YAEAhB,IAAIoB,OAAO,CAACC,MAAM,CAACC,KAAK,CAAC;~~gBACvBY~~,~~gBAAgB7C~~,WAAWK,IAAI;gBAC/ByB;gBACAI,KAAK,CAAC,uCAAuC,EAAEtB,OAAOI,QAAQ,EAAE;gBAChEJ;~~gBACAkC~~,~~cAAcjC~~;YAChB;YACA,OAAO,IAAIY,SAAS,yBAAyB;gBAAEC,QAAQ;YAAI;QAC7D;IACF;AACF,EAAC"}
1	+ {"version":3,"sources":["../src/staticHandler.ts"],"sourcesContent":["import type { CollectionConfig } from 'payload'\nimport type { Readable } from 'stream'\n\nimport { isXmlMimeType, uploadContentSecurityPolicy } from 'payload/internal'\n\nimport type { CollectionCachingConfig, PluginOptions, StaticHandler } from './types.js'\n\nimport { createKey } from './utilities/createKey.js'\nimport { getStorageClient } from './utilities/getStorageClient.js'\n\ninterface Args {\n cachingOptions?: PluginOptions['uploadCaching']\n collection: CollectionConfig\n debug?: boolean\n}\n\n// Type guard for NodeJS.Readable streams\nconst isNodeReadableStream = (body: unknown): body is Readable => {\n return (\n typeof body === 'object' &&\n body !== null &&\n 'pipe' in body &&\n typeof (body as any).pipe === 'function' &&\n 'destroy' in body &&\n typeof (body as any).destroy === 'function'\n )\n}\n\n// Convert a stream into a promise that resolves with a Buffer\nconst streamToBuffer = async (readableStream: any) => {\n const chunks = []\n for await (const chunk of readableStream) {\n chunks.push(typeof chunk === 'string' ? Buffer.from(chunk) : chunk)\n }\n return Buffer.concat(chunks)\n}\n\nexport const getStaticHandler = ({ cachingOptions, collection, debug }: Args): StaticHandler => {\n let maxAge = 86400 // 24 hours default\n let collCacheConfig: CollectionCachingConfig \| undefined\n if (cachingOptions !== false) {\n // Set custom maxAge for all collections\n maxAge = cachingOptions?.maxAge \|\| maxAge\n collCacheConfig = cachingOptions?.collections?.[collection.slug] \|\| {}\n }\n\n // Set maxAge using collection-specific override\n maxAge = collCacheConfig?.maxAge \|\| maxAge\n\n const cachingEnabled =\n cachingOptions !== false &&\n !!process.env.PAYLOAD_CLOUD_CACHE_KEY &&\n collCacheConfig?.enabled !== false\n\n return async (req, { params }) => {\n let key = ''\n try {\n const { identityID, storageClient } = await getStorageClient()\n\n key = createKey({\n collection: collection.slug,\n filename: params.filename,\n identityID,\n })\n\n const object = await storageClient.getObject({\n Bucket: process.env.PAYLOAD_CLOUD_BUCKET,\n Key: key,\n })\n\n if (!object.Body \|\| !object.ContentType \|\| !object.ETag) {\n return new Response(null, { status: 404, statusText: 'Not Found' })\n }\n\n // On error, manually destroy stream to close socket\n if (object.Body && isNodeReadableStream(object.Body)) {\n const stream = object.Body\n stream.on('error', (err) => {\n req.payload.logger.error({\n err,\n key,\n msg: 'Error streaming S3 object, destroying stream',\n })\n stream.destroy()\n })\n }\n\n const bodyBuffer = await streamToBuffer(object.Body)\n\n const responseHeaders: Record<string, string> = {\n 'Content-Length': String(object.ContentLength),\n 'Content-Type': object.ContentType,\n ...(cachingEnabled && { 'Cache-Control': `public, max-age=${maxAge}` }),\n ETag: object.ETag,\n }\n\n // Apply a restrictive policy to XML-family responses served through Payload.\n if (isXmlMimeType(object.ContentType)) {\n responseHeaders['Content-Security-Policy'] = uploadContentSecurityPolicy\n }\n\n let headers = new Headers(responseHeaders)\n if (\n typeof collection.upload === 'object' &&\n typeof collection.upload.modifyResponseHeaders === 'function'\n ) {\n headers = collection.upload.modifyResponseHeaders({ headers }) \|\| headers\n }\n\n return new Response(bodyBuffer, {\n headers,\n status: 200,\n })\n } catch (err: unknown) {\n // Handle each error explicitly\n if (err instanceof Error) {\n /*\n Note: If AccessDenied comes back, it typically means that the object key is not found.\n * The AWS SDK throws this because it attempts an s3:ListBucket operation under the hood\n * if it does not find the object key, which we have disallowed in our bucket policy.\n */\n if (err.name === 'AccessDenied') {\n req.payload.logger.warn({\n awsErr: debug ? err : err.name,\n collectionSlug: collection.slug,\n msg: `Requested file not found in cloud storage: ${params.filename}`,\n params,\n requestedKey: key,\n })\n return new Response(null, { status: 404, statusText: 'Not Found' })\n } else if (err.name === 'NoSuchKey') {\n req.payload.logger.warn({\n awsErr: debug ? err : err.name,\n collectionSlug: collection.slug,\n msg: `Requested file not found in cloud storage: ${params.filename}`,\n params,\n requestedKey: key,\n })\n return new Response(null, { status: 404, statusText: 'Not Found' })\n }\n }\n\n req.payload.logger.error({\n collectionSlug: collection.slug,\n err,\n msg: `Error getting file from cloud storage: ${params.filename}`,\n params,\n requestedKey: key,\n })\n return new Response('Internal Server Error', { status: 500 })\n }\n }\n}\n"],"names":["isXmlMimeType","uploadContentSecurityPolicy","createKey","getStorageClient","isNodeReadableStream","body","pipe","destroy","streamToBuffer","readableStream","chunks","chunk","push","Buffer","from","concat","getStaticHandler","cachingOptions","collection","debug","maxAge","collCacheConfig","collections","slug","cachingEnabled","process","env","PAYLOAD_CLOUD_CACHE_KEY","enabled","req","params","key","identityID","storageClient","filename","object","getObject","Bucket","PAYLOAD_CLOUD_BUCKET","Key","Body","ContentType","ETag","Response","status","statusText","stream","on","err","payload","logger","error","msg","bodyBuffer","responseHeaders","String","ContentLength","headers","Headers","upload","modifyResponseHeaders","Error","name","warn","awsErr","collectionSlug","requestedKey"],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/payload-cloud",
-  "version": "4.0.0-internal.435b2d6",
+  "version": "4.0.0-internal.44ac9c8",
   "description": "The official Payload Cloud plugin",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -37,15 +37,15 @@
     "@aws-sdk/credential-providers": "^3.614.0",
     "@aws-sdk/lib-storage": "^3.614.0",
     "amazon-cognito-identity-js": "^6.1.2",
-    "nodemailer": "^9.0.1",
-    "@payloadcms/email-nodemailer": "4.0.0-internal.435b2d6"
+    "nodemailer": "^9.1.1",
+    "@payloadcms/email-nodemailer": "4.0.0-internal.44ac9c8"
   },
   "devDependencies": {
     "@types/nodemailer": "^8.0.0",
-    "payload": "4.0.0-internal.435b2d6"
+    "payload": "4.0.0-internal.44ac9c8"
   },
   "peerDependencies": {
-    "payload": "4.0.0-internal.435b2d6"
+    "payload": "4.0.0-internal.44ac9c8"
   },
   "scripts": {
     "build": "pnpm build:types && pnpm build:swc",