@payloadcms/payload-cloud 3.25.0-canary.f62445f → 3.25.0

package/dist/utilities/getStorageClient.d.ts

@@ -1,7 +1,8 @@
-import * as AWS from '@aws-sdk/client-s3';
-export type GetStorageClient = () => Promise<{
-    identityID: string;
-    storageClient: AWS.S3;
-}>;
+import type * as AWS from '@aws-sdk/client-s3';
+import type { CognitoUserSession } from 'amazon-cognito-identity-js';
+import type { GetStorageClient } from './refreshSession.js';
+export declare let storageClient: AWS.S3 | null;
+export declare let session: CognitoUserSession | null;
+export declare let identityID: string;
 export declare const getStorageClient: GetStorageClient;
 //# sourceMappingURL=getStorageClient.d.ts.map

package/dist/utilities/getStorageClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getStorageClient.d.ts","sourceRoot":"","sources":["../../src/utilities/getStorageClient.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAA;AAKzC,MAAM,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC;IAC3C,UAAU,EAAE,MAAM,CAAA;IAClB,aAAa,EAAE,GAAG,CAAC,EAAE,CAAA;CACtB,CAAC,CAAA;AAMF,eAAO,MAAM,gBAAgB,EAAE,gBAkD9B,CAAA"}
+{"version":3,"file":"getStorageClient.d.ts","sourceRoot":"","sources":["../../src/utilities/getStorageClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,oBAAoB,CAAA;AAC9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAEpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAI3D,eAAO,IAAI,aAAa,EAAE,GAAG,CAAC,EAAE,GAAG,IAAW,CAAA;AAC9C,eAAO,IAAI,OAAO,EAAE,kBAAkB,GAAG,IAAW,CAAA;AACpD,eAAO,IAAI,UAAU,EAAE,MAAM,CAAA;AAE7B,eAAO,MAAM,gBAAgB,EAAE,gBAwB9B,CAAA"}

package/dist/utilities/getStorageClient.js

@@ -1,10 +1,7 @@
-import { CognitoIdentityClient } from '@aws-sdk/client-cognito-identity';
-import * as AWS from '@aws-sdk/client-s3';
-import { fromCognitoIdentityPool } from '@aws-sdk/credential-providers';
-import { authAsCognitoUser } from './authAsCognitoUser.js';
-let storageClient = null;
-let session = null;
-let identityID;
+import { refreshSession } from './refreshSession.js';
+export let storageClient = null;
+export let session = null;
+export let identityID;
 export const getStorageClient = async ()=>{
     if (storageClient && session?.isValid()) {
         return {
@@ -12,6 +9,8 @@ export const getStorageClient = async ()=>{
             storageClient
         };
     }
+    ;
+    ({ identityID, session, storageClient } = await refreshSession());
     if (!process.env.PAYLOAD_CLOUD_PROJECT_ID) {
         throw new Error('PAYLOAD_CLOUD_PROJECT_ID is required');
     }
@@ -21,25 +20,6 @@ export const getStorageClient = async ()=>{
     if (!process.env.PAYLOAD_CLOUD_COGNITO_IDENTITY_POOL_ID) {
         throw new Error('PAYLOAD_CLOUD_COGNITO_IDENTITY_POOL_ID is required');
     }
-    session = await authAsCognitoUser(process.env.PAYLOAD_CLOUD_PROJECT_ID, process.env.PAYLOAD_CLOUD_COGNITO_PASSWORD);
-    const cognitoIdentity = new CognitoIdentityClient({
-        credentials: fromCognitoIdentityPool({
-            clientConfig: {
-                region: 'us-east-1'
-            },
-            identityPoolId: process.env.PAYLOAD_CLOUD_COGNITO_IDENTITY_POOL_ID,
-            logins: {
-                [`cognito-idp.us-east-1.amazonaws.com/${process.env.PAYLOAD_CLOUD_COGNITO_USER_POOL_ID}`]: session.getIdToken().getJwtToken()
-            }
-        })
-    });
-    const credentials = await cognitoIdentity.config.credentials();
-    // @ts-expect-error - Incorrect AWS types
-    identityID = credentials.identityId;
-    storageClient = new AWS.S3({
-        credentials,
-        region: process.env.PAYLOAD_CLOUD_BUCKET_REGION
-    });
     return {
         identityID,
         storageClient

package/dist/utilities/getStorageClient.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/getStorageClient.ts"],"sourcesContent":["import type { CognitoUserSession } from 'amazon-cognito-identity-js'\n\nimport { CognitoIdentityClient } from '@aws-sdk/client-cognito-identity'\nimport * as AWS from '@aws-sdk/client-s3'\nimport { fromCognitoIdentityPool } from '@aws-sdk/credential-providers'\n\nimport { authAsCognitoUser } from './authAsCognitoUser.js'\n\nexport type GetStorageClient = () => Promise<{\n  identityID: string\n  storageClient: AWS.S3\n}>\n\nlet storageClient: AWS.S3 | null = null\nlet session: CognitoUserSession | null = null\nlet identityID: string\n\nexport const getStorageClient: GetStorageClient = async () => {\n  if (storageClient && session?.isValid()) {\n    return {\n      identityID,\n      storageClient,\n    }\n  }\n\n  if (!process.env.PAYLOAD_CLOUD_PROJECT_ID) {\n    throw new Error('PAYLOAD_CLOUD_PROJECT_ID is required')\n  }\n  if (!process.env.PAYLOAD_CLOUD_COGNITO_PASSWORD) {\n    throw new Error('PAYLOAD_CLOUD_COGNITO_PASSWORD is required')\n  }\n  if (!process.env.PAYLOAD_CLOUD_COGNITO_IDENTITY_POOL_ID) {\n    throw new Error('PAYLOAD_CLOUD_COGNITO_IDENTITY_POOL_ID is required')\n  }\n\n  session = await authAsCognitoUser(\n    process.env.PAYLOAD_CLOUD_PROJECT_ID,\n    process.env.PAYLOAD_CLOUD_COGNITO_PASSWORD,\n  )\n\n  const cognitoIdentity = new CognitoIdentityClient({\n    credentials: fromCognitoIdentityPool({\n      clientConfig: {\n        region: 'us-east-1',\n      },\n      identityPoolId: process.env.PAYLOAD_CLOUD_COGNITO_IDENTITY_POOL_ID,\n      logins: {\n        [`cognito-idp.us-east-1.amazonaws.com/${process.env.PAYLOAD_CLOUD_COGNITO_USER_POOL_ID}`]:\n          session.getIdToken().getJwtToken(),\n      },\n    }),\n  })\n\n  const credentials = await cognitoIdentity.config.credentials()\n\n  // @ts-expect-error - Incorrect AWS types\n  identityID = credentials.identityId\n\n  storageClient = new AWS.S3({\n    credentials,\n    region: process.env.PAYLOAD_CLOUD_BUCKET_REGION,\n  })\n\n  return {\n    identityID,\n    storageClient,\n  }\n}\n"],"names":["CognitoIdentityClient","AWS","fromCognitoIdentityPool","authAsCognitoUser","storageClient","session","identityID","getStorageClient","isValid","process","env","PAYLOAD_CLOUD_PROJECT_ID","Error","PAYLOAD_CLOUD_COGNITO_PASSWORD","PAYLOAD_CLOUD_COGNITO_IDENTITY_POOL_ID","cognitoIdentity","credentials","clientConfig","region","identityPoolId","logins","PAYLOAD_CLOUD_COGNITO_USER_POOL_ID","getIdToken","getJwtToken","config","identityId","S3","PAYLOAD_CLOUD_BUCKET_REGION"],"mappings":"AAEA,SAASA,qBAAqB,QAAQ,mCAAkC;AACxE,YAAYC,SAAS,qBAAoB;AACzC,SAASC,uBAAuB,QAAQ,gCAA+B;AAEvE,SAASC,iBAAiB,QAAQ,yBAAwB;AAO1D,IAAIC,gBAA+B;AACnC,IAAIC,UAAqC;AACzC,IAAIC;AAEJ,OAAO,MAAMC,mBAAqC;IAChD,IAAIH,iBAAiBC,SAASG,WAAW;QACvC,OAAO;YACLF;YACAF;QACF;IACF;IAEA,IAAI,CAACK,QAAQC,GAAG,CAACC,wBAAwB,EAAE;QACzC,MAAM,IAAIC,MAAM;IAClB;IACA,IAAI,CAACH,QAAQC,GAAG,CAACG,8BAA8B,EAAE;QAC/C,MAAM,IAAID,MAAM;IAClB;IACA,IAAI,CAACH,QAAQC,GAAG,CAACI,sCAAsC,EAAE;QACvD,MAAM,IAAIF,MAAM;IAClB;IAEAP,UAAU,MAAMF,kBACdM,QAAQC,GAAG,CAACC,wBAAwB,EACpCF,QAAQC,GAAG,CAACG,8BAA8B;IAG5C,MAAME,kBAAkB,IAAIf,sBAAsB;QAChDgB,aAAad,wBAAwB;YACnCe,cAAc;gBACZC,QAAQ;YACV;YACAC,gBAAgBV,QAAQC,GAAG,CAACI,sCAAsC;YAClEM,QAAQ;gBACN,CAAC,CAAC,oCAAoC,EAAEX,QAAQC,GAAG,CAACW,kCAAkC,EAAE,CAAC,EACvFhB,QAAQiB,UAAU,GAAGC,WAAW;YACpC;QACF;IACF;IAEA,MAAMP,cAAc,MAAMD,gBAAgBS,MAAM,CAACR,WAAW;IAE5D,yCAAyC;IACzCV,aAAaU,YAAYS,UAAU;IAEnCrB,gBAAgB,IAAIH,IAAIyB,EAAE,CAAC;QACzBV;QACAE,QAAQT,QAAQC,GAAG,CAACiB,2BAA2B;IACjD;IAEA,OAAO;QACLrB;QACAF;IACF;AACF,EAAC"}
+{"version":3,"sources":["../../src/utilities/getStorageClient.ts"],"sourcesContent":["import type * as AWS from '@aws-sdk/client-s3'\nimport type { CognitoUserSession } from 'amazon-cognito-identity-js'\n\nimport type { GetStorageClient } from './refreshSession.js'\n\nimport { refreshSession } from './refreshSession.js'\n\nexport let storageClient: AWS.S3 | null = null\nexport let session: CognitoUserSession | null = null\nexport let identityID: string\n\nexport const getStorageClient: GetStorageClient = async () => {\n  if (storageClient && session?.isValid()) {\n    return {\n      identityID,\n      storageClient,\n    }\n  }\n\n  ;({ identityID, session, storageClient } = await refreshSession())\n\n  if (!process.env.PAYLOAD_CLOUD_PROJECT_ID) {\n    throw new Error('PAYLOAD_CLOUD_PROJECT_ID is required')\n  }\n  if (!process.env.PAYLOAD_CLOUD_COGNITO_PASSWORD) {\n    throw new Error('PAYLOAD_CLOUD_COGNITO_PASSWORD is required')\n  }\n  if (!process.env.PAYLOAD_CLOUD_COGNITO_IDENTITY_POOL_ID) {\n    throw new Error('PAYLOAD_CLOUD_COGNITO_IDENTITY_POOL_ID is required')\n  }\n\n  return {\n    identityID,\n    storageClient,\n  }\n}\n"],"names":["refreshSession","storageClient","session","identityID","getStorageClient","isValid","process","env","PAYLOAD_CLOUD_PROJECT_ID","Error","PAYLOAD_CLOUD_COGNITO_PASSWORD","PAYLOAD_CLOUD_COGNITO_IDENTITY_POOL_ID"],"mappings":"AAKA,SAASA,cAAc,QAAQ,sBAAqB;AAEpD,OAAO,IAAIC,gBAA+B,KAAI;AAC9C,OAAO,IAAIC,UAAqC,KAAI;AACpD,OAAO,IAAIC,WAAkB;AAE7B,OAAO,MAAMC,mBAAqC;IAChD,IAAIH,iBAAiBC,SAASG,WAAW;QACvC,OAAO;YACLF;YACAF;QACF;IACF;;IAEE,CAAA,EAAEE,UAAU,EAAED,OAAO,EAAED,aAAa,EAAE,GAAG,MAAMD,gBAAe;IAEhE,IAAI,CAACM,QAAQC,GAAG,CAACC,wBAAwB,EAAE;QACzC,MAAM,IAAIC,MAAM;IAClB;IACA,IAAI,CAACH,QAAQC,GAAG,CAACG,8BAA8B,EAAE;QAC/C,MAAM,IAAID,MAAM;IAClB;IACA,IAAI,CAACH,QAAQC,GAAG,CAACI,sCAAsC,EAAE;QACvD,MAAM,IAAIF,MAAM;IAClB;IAEA,OAAO;QACLN;QACAF;IACF;AACF,EAAC"}

package/dist/utilities/refreshSession.d.ts

@@ -0,0 +1,11 @@
+import * as AWS from '@aws-sdk/client-s3';
+export type GetStorageClient = () => Promise<{
+    identityID: string;
+    storageClient: AWS.S3;
+}>;
+export declare const refreshSession: () => Promise<{
+    identityID: any;
+    session: import("amazon-cognito-identity-js").CognitoUserSession;
+    storageClient: AWS.S3;
+}>;
+//# sourceMappingURL=refreshSession.d.ts.map

package/dist/utilities/refreshSession.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"refreshSession.d.ts","sourceRoot":"","sources":["../../src/utilities/refreshSession.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAA;AAKzC,MAAM,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC;IAC3C,UAAU,EAAE,MAAM,CAAA;IAClB,aAAa,EAAE,GAAG,CAAC,EAAE,CAAA;CACtB,CAAC,CAAA;AAEF,eAAO,MAAM,cAAc;;;;EAkC1B,CAAA"}

package/dist/utilities/refreshSession.js

@@ -0,0 +1,32 @@
+import { CognitoIdentityClient } from '@aws-sdk/client-cognito-identity';
+import * as AWS from '@aws-sdk/client-s3';
+import { fromCognitoIdentityPool } from '@aws-sdk/credential-providers';
+import { authAsCognitoUser } from './authAsCognitoUser.js';
+export const refreshSession = async ()=>{
+    const session = await authAsCognitoUser(process.env.PAYLOAD_CLOUD_PROJECT_ID || '', process.env.PAYLOAD_CLOUD_COGNITO_PASSWORD || '');
+    const cognitoIdentity = new CognitoIdentityClient({
+        credentials: fromCognitoIdentityPool({
+            clientConfig: {
+                region: 'us-east-1'
+            },
+            identityPoolId: process.env.PAYLOAD_CLOUD_COGNITO_IDENTITY_POOL_ID || '',
+            logins: {
+                [`cognito-idp.us-east-1.amazonaws.com/${process.env.PAYLOAD_CLOUD_COGNITO_USER_POOL_ID}`]: session.getIdToken().getJwtToken()
+            }
+        })
+    });
+    const credentials = await cognitoIdentity.config.credentials();
+    // @ts-expect-error - Incorrect AWS types
+    const identityID = credentials.identityId;
+    const storageClient = new AWS.S3({
+        credentials,
+        region: process.env.PAYLOAD_CLOUD_BUCKET_REGION
+    });
+    return {
+        identityID,
+        session,
+        storageClient
+    };
+};
+
+//# sourceMappingURL=refreshSession.js.map

package/dist/utilities/refreshSession.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/utilities/refreshSession.ts"],"sourcesContent":["import { CognitoIdentityClient } from '@aws-sdk/client-cognito-identity'\nimport * as AWS from '@aws-sdk/client-s3'\nimport { fromCognitoIdentityPool } from '@aws-sdk/credential-providers'\n\nimport { authAsCognitoUser } from './authAsCognitoUser.js'\n\nexport type GetStorageClient = () => Promise<{\n  identityID: string\n  storageClient: AWS.S3\n}>\n\nexport const refreshSession = async () => {\n  const session = await authAsCognitoUser(\n    process.env.PAYLOAD_CLOUD_PROJECT_ID || '',\n    process.env.PAYLOAD_CLOUD_COGNITO_PASSWORD || '',\n  )\n\n  const cognitoIdentity = new CognitoIdentityClient({\n    credentials: fromCognitoIdentityPool({\n      clientConfig: {\n        region: 'us-east-1',\n      },\n      identityPoolId: process.env.PAYLOAD_CLOUD_COGNITO_IDENTITY_POOL_ID || '',\n      logins: {\n        [`cognito-idp.us-east-1.amazonaws.com/${process.env.PAYLOAD_CLOUD_COGNITO_USER_POOL_ID}`]:\n          session.getIdToken().getJwtToken(),\n      },\n    }),\n  })\n\n  const credentials = await cognitoIdentity.config.credentials()\n\n  // @ts-expect-error - Incorrect AWS types\n  const identityID = credentials.identityId\n\n  const storageClient = new AWS.S3({\n    credentials,\n    region: process.env.PAYLOAD_CLOUD_BUCKET_REGION,\n  })\n\n  return {\n    identityID,\n    session,\n    storageClient,\n  }\n}\n"],"names":["CognitoIdentityClient","AWS","fromCognitoIdentityPool","authAsCognitoUser","refreshSession","session","process","env","PAYLOAD_CLOUD_PROJECT_ID","PAYLOAD_CLOUD_COGNITO_PASSWORD","cognitoIdentity","credentials","clientConfig","region","identityPoolId","PAYLOAD_CLOUD_COGNITO_IDENTITY_POOL_ID","logins","PAYLOAD_CLOUD_COGNITO_USER_POOL_ID","getIdToken","getJwtToken","config","identityID","identityId","storageClient","S3","PAYLOAD_CLOUD_BUCKET_REGION"],"mappings":"AAAA,SAASA,qBAAqB,QAAQ,mCAAkC;AACxE,YAAYC,SAAS,qBAAoB;AACzC,SAASC,uBAAuB,QAAQ,gCAA+B;AAEvE,SAASC,iBAAiB,QAAQ,yBAAwB;AAO1D,OAAO,MAAMC,iBAAiB;IAC5B,MAAMC,UAAU,MAAMF,kBACpBG,QAAQC,GAAG,CAACC,wBAAwB,IAAI,IACxCF,QAAQC,GAAG,CAACE,8BAA8B,IAAI;IAGhD,MAAMC,kBAAkB,IAAIV,sBAAsB;QAChDW,aAAaT,wBAAwB;YACnCU,cAAc;gBACZC,QAAQ;YACV;YACAC,gBAAgBR,QAAQC,GAAG,CAACQ,sCAAsC,IAAI;YACtEC,QAAQ;gBACN,CAAC,CAAC,oCAAoC,EAAEV,QAAQC,GAAG,CAACU,kCAAkC,EAAE,CAAC,EACvFZ,QAAQa,UAAU,GAAGC,WAAW;YACpC;QACF;IACF;IAEA,MAAMR,cAAc,MAAMD,gBAAgBU,MAAM,CAACT,WAAW;IAE5D,yCAAyC;IACzC,MAAMU,aAAaV,YAAYW,UAAU;IAEzC,MAAMC,gBAAgB,IAAItB,IAAIuB,EAAE,CAAC;QAC/Bb;QACAE,QAAQP,QAAQC,GAAG,CAACkB,2BAA2B;IACjD;IAEA,OAAO;QACLJ;QACAhB;QACAkB;IACF;AACF,EAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/payload-cloud",
-  "version": "3.25.0-canary.f62445f",
+  "version": "3.25.0",
   "description": "The official Payload Cloud plugin",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -37,15 +37,15 @@
     "@aws-sdk/lib-storage": "^3.614.0",
     "amazon-cognito-identity-js": "^6.1.2",
     "nodemailer": "6.9.16",
-    "@payloadcms/email-nodemailer": "3.25.0-canary.f62445f"
+    "@payloadcms/email-nodemailer": "3.25.0"
   },
   "devDependencies": {
     "@types/jest": "29.5.12",
     "@types/nodemailer": "6.4.17",
-    "payload": "3.25.0-canary.f62445f"
+    "payload": "3.25.0"
   },
   "peerDependencies": {
-    "payload": "3.25.0-canary.f62445f"
+    "payload": "3.25.0"
   },
   "scripts": {
     "build": "pnpm build:types && pnpm build:swc",