@aws-amplify/adapter-nextjs 1.3.0 → 1.3.1-graphql-multi-client.93b5136.0

package/dist/cjs/api/generateServerClient.js

@@ -18,28 +18,28 @@ const createServerRunnerForAPI_1 = require("./createServerRunnerForAPI");
  * const client = generateServerClientUsingCookies({ cookies });
  * const result = await client.graphql({ query: listPosts });
  */
-function generateServerClientUsingCookies({ config, cookies, authMode, authToken, }) {
-    if (typeof cookies !== 'function') {
+function generateServerClientUsingCookies(options) {
+    if (typeof options.cookies !== 'function') {
         throw new adapter_core_1.AmplifyServerContextError({
             message: 'generateServerClientUsingCookies is only compatible with the `cookies` Dynamic Function available in Server Components.',
             // TODO: link to docs
             recoverySuggestion: 'use `generateServerClient` inside of `runWithAmplifyServerContext` with the `request` object.',
         });
     }
-    const { runWithAmplifyServerContext, resourcesConfig } = (0, createServerRunnerForAPI_1.createServerRunnerForAPI)({ config });
+    const { runWithAmplifyServerContext, resourcesConfig } = (0, createServerRunnerForAPI_1.createServerRunnerForAPI)({ config: options.config });
     // This function reference gets passed down to InternalGraphQLAPI.ts.graphql
     // where this._graphql is passed in as the `fn` argument
     // causing it to always get invoked inside `runWithAmplifyServerContext`
     const getAmplify = (fn) => runWithAmplifyServerContext({
-        nextServerContext: { cookies },
+        nextServerContext: { cookies: options.cookies },
         operation: contextSpec => fn((0, adapter_core_1.getAmplifyServerContext)(contextSpec).amplify),
     });
+    const { cookies: _cookies, config: _config, ...params } = options;
     return (0, internals_1.generateClientWithAmplifyInstance)({
         amplify: getAmplify,
         config: resourcesConfig,
-        authMode,
-        authToken,
-    });
+        ...params,
+    }); // TS can't narrow the type here.
 }
 exports.generateServerClientUsingCookies = generateServerClientUsingCookies;
 /**
@@ -58,12 +58,12 @@ exports.generateServerClientUsingCookies = generateServerClientUsingCookies;
  *   }),
  * });
  */
-function generateServerClientUsingReqRes({ config, authMode, authToken }) {
-    const amplifyConfig = (0, utils_1.parseAmplifyConfig)(config);
+function generateServerClientUsingReqRes(options) {
+    const amplifyConfig = (0, utils_1.parseAmplifyConfig)(options.config);
+    const { config: _config, ...params } = options;
     return (0, server_1.generateClient)({
         config: amplifyConfig,
-        authMode,
-        authToken,
+        ...params,
     });
 }
 exports.generateServerClientUsingReqRes = generateServerClientUsingReqRes;

package/dist/cjs/api/generateServerClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateServerClient.js","sources":["../../../src/api/generateServerClient.ts"],"sourcesContent":["\"use strict\";\n// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.generateServerClientUsingReqRes = exports.generateServerClientUsingCookies = void 0;\nconst internals_1 = require(\"@aws-amplify/api/internals\");\nconst server_1 = require(\"aws-amplify/api/server\");\nconst adapter_core_1 = require(\"@aws-amplify/core/internals/adapter-core\");\nconst utils_1 = require(\"@aws-amplify/core/internals/utils\");\nconst createServerRunnerForAPI_1 = require(\"./createServerRunnerForAPI\");\n/**\n * Generates an API client that can be used inside a Next.js Server Component with Dynamic Rendering\n *\n * @example\n * import { cookies } from \"next/headers\"\n *\n * const client = generateServerClientUsingCookies({ cookies });\n * const result = await client.graphql({ query: listPosts });\n */\nfunction generateServerClientUsingCookies({ config, cookies, authMode, authToken, }) {\n    if (typeof cookies !== 'function') {\n        throw new adapter_core_1.AmplifyServerContextError({\n            message: 'generateServerClientUsingCookies is only compatible with the `cookies` Dynamic Function available in Server Components.',\n            // TODO: link to docs\n            recoverySuggestion: 'use `generateServerClient` inside of `runWithAmplifyServerContext` with the `request` object.',\n        });\n    }\n    const { runWithAmplifyServerContext, resourcesConfig } = (0, createServerRunnerForAPI_1.createServerRunnerForAPI)({ config });\n    // This function reference gets passed down to InternalGraphQLAPI.ts.graphql\n    // where this._graphql is passed in as the `fn` argument\n    // causing it to always get invoked inside `runWithAmplifyServerContext`\n    const getAmplify = (fn) => runWithAmplifyServerContext({\n        nextServerContext: { cookies },\n        operation: contextSpec => fn((0, adapter_core_1.getAmplifyServerContext)(contextSpec).amplify),\n    });\n    return (0, internals_1.generateClientWithAmplifyInstance)({\n        amplify: getAmplify,\n        config: resourcesConfig,\n        authMode,\n        authToken,\n    });\n}\nexports.generateServerClientUsingCookies = generateServerClientUsingCookies;\n/**\n * Generates an API client that can be used with both Pages Router and App Router\n *\n * @example\n * import config from './amplifyconfiguration.json';\n * import { listPosts } from './graphql/queries';\n *\n * const client = generateServerClientUsingReqRes({ config });\n *\n * const result = await runWithAmplifyServerContext({\n *   nextServerContext: { request, response },\n *   operation: (contextSpec) => client.graphql(contextSpec, {\n *     query: listPosts,\n *   }),\n * });\n */\nfunction generateServerClientUsingReqRes({ config, authMode, authToken }) {\n    const amplifyConfig = (0, utils_1.parseAmplifyConfig)(config);\n    return (0, server_1.generateClient)({\n        config: amplifyConfig,\n        authMode,\n        authToken,\n    });\n}\nexports.generateServerClientUsingReqRes = generateServerClientUsingReqRes;\n"],"names":[],"mappings":";;AACA;AACA;AACA,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAC9D,OAAO,CAAC,+BAA+B,GAAG,OAAO,CAAC,gCAAgC,GAAG,KAAK,CAAC,CAAC;AAC5F,MAAM,WAAW,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AAC1D,MAAM,QAAQ,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;AACnD,MAAM,cAAc,GAAG,OAAO,CAAC,0CAA0C,CAAC,CAAC;AAC3E,MAAM,OAAO,GAAG,OAAO,CAAC,mCAAmC,CAAC,CAAC;AAC7D,MAAM,0BAA0B,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AACzE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS,gCAAgC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,GAAG,EAAE;AACrF,IAAI,IAAI,OAAO,OAAO,KAAK,UAAU,EAAE;AACvC,QAAQ,MAAM,IAAI,cAAc,CAAC,yBAAyB,CAAC;AAC3D,YAAY,OAAO,EAAE,yHAAyH;AAC9I;AACA,YAAY,kBAAkB,EAAE,+FAA+F;AAC/H,SAAS,CAAC,CAAC;AACX,KAAK;AACL,IAAI,MAAM,EAAE,2BAA2B,EAAE,eAAe,EAAE,GAAG,IAAI,0BAA0B,CAAC,wBAAwB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;AAClI;AACA;AACA;AACA,IAAI,MAAM,UAAU,GAAG,CAAC,EAAE,KAAK,2BAA2B,CAAC;AAC3D,QAAQ,iBAAiB,EAAE,EAAE,OAAO,EAAE;AACtC,QAAQ,SAAS,EAAE,WAAW,IAAI,EAAE,CAAC,IAAI,cAAc,CAAC,uBAAuB,EAAE,WAAW,CAAC,CAAC,OAAO,CAAC;AACtG,KAAK,CAAC,CAAC;AACP,IAAI,OAAO,IAAI,WAAW,CAAC,iCAAiC,EAAE;AAC9D,QAAQ,OAAO,EAAE,UAAU;AAC3B,QAAQ,MAAM,EAAE,eAAe;AAC/B,QAAQ,QAAQ;AAChB,QAAQ,SAAS;AACjB,KAAK,CAAC,CAAC;AACP,CAAC;AACD,OAAO,CAAC,gCAAgC,GAAG,gCAAgC,CAAC;AAC5E;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS,+BAA+B,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE;AAC1E,IAAI,MAAM,aAAa,GAAG,IAAI,OAAO,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;AAClE,IAAI,OAAO,IAAI,QAAQ,CAAC,cAAc,EAAE;AACxC,QAAQ,MAAM,EAAE,aAAa;AAC7B,QAAQ,QAAQ;AAChB,QAAQ,SAAS;AACjB,KAAK,CAAC,CAAC;AACP,CAAC;AACD,OAAO,CAAC,+BAA+B,GAAG,+BAA+B;;"}
+{"version":3,"file":"generateServerClient.js","sources":["../../../src/api/generateServerClient.ts"],"sourcesContent":["\"use strict\";\n// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.generateServerClientUsingReqRes = exports.generateServerClientUsingCookies = void 0;\nconst internals_1 = require(\"@aws-amplify/api/internals\");\nconst server_1 = require(\"aws-amplify/api/server\");\nconst adapter_core_1 = require(\"@aws-amplify/core/internals/adapter-core\");\nconst utils_1 = require(\"@aws-amplify/core/internals/utils\");\nconst createServerRunnerForAPI_1 = require(\"./createServerRunnerForAPI\");\n/**\n * Generates an API client that can be used inside a Next.js Server Component with Dynamic Rendering\n *\n * @example\n * import { cookies } from \"next/headers\"\n *\n * const client = generateServerClientUsingCookies({ cookies });\n * const result = await client.graphql({ query: listPosts });\n */\nfunction generateServerClientUsingCookies(options) {\n    if (typeof options.cookies !== 'function') {\n        throw new adapter_core_1.AmplifyServerContextError({\n            message: 'generateServerClientUsingCookies is only compatible with the `cookies` Dynamic Function available in Server Components.',\n            // TODO: link to docs\n            recoverySuggestion: 'use `generateServerClient` inside of `runWithAmplifyServerContext` with the `request` object.',\n        });\n    }\n    const { runWithAmplifyServerContext, resourcesConfig } = (0, createServerRunnerForAPI_1.createServerRunnerForAPI)({ config: options.config });\n    // This function reference gets passed down to InternalGraphQLAPI.ts.graphql\n    // where this._graphql is passed in as the `fn` argument\n    // causing it to always get invoked inside `runWithAmplifyServerContext`\n    const getAmplify = (fn) => runWithAmplifyServerContext({\n        nextServerContext: { cookies: options.cookies },\n        operation: contextSpec => fn((0, adapter_core_1.getAmplifyServerContext)(contextSpec).amplify),\n    });\n    const { cookies: _cookies, config: _config, ...params } = options;\n    return (0, internals_1.generateClientWithAmplifyInstance)({\n        amplify: getAmplify,\n        config: resourcesConfig,\n        ...params,\n    }); // TS can't narrow the type here.\n}\nexports.generateServerClientUsingCookies = generateServerClientUsingCookies;\n/**\n * Generates an API client that can be used with both Pages Router and App Router\n *\n * @example\n * import config from './amplifyconfiguration.json';\n * import { listPosts } from './graphql/queries';\n *\n * const client = generateServerClientUsingReqRes({ config });\n *\n * const result = await runWithAmplifyServerContext({\n *   nextServerContext: { request, response },\n *   operation: (contextSpec) => client.graphql(contextSpec, {\n *     query: listPosts,\n *   }),\n * });\n */\nfunction generateServerClientUsingReqRes(options) {\n    const amplifyConfig = (0, utils_1.parseAmplifyConfig)(options.config);\n    const { config: _config, ...params } = options;\n    return (0, server_1.generateClient)({\n        config: amplifyConfig,\n        ...params,\n    });\n}\nexports.generateServerClientUsingReqRes = generateServerClientUsingReqRes;\n"],"names":[],"mappings":";;AACA;AACA;AACA,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAC9D,OAAO,CAAC,+BAA+B,GAAG,OAAO,CAAC,gCAAgC,GAAG,KAAK,CAAC,CAAC;AAC5F,MAAM,WAAW,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AAC1D,MAAM,QAAQ,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;AACnD,MAAM,cAAc,GAAG,OAAO,CAAC,0CAA0C,CAAC,CAAC;AAC3E,MAAM,OAAO,GAAG,OAAO,CAAC,mCAAmC,CAAC,CAAC;AAC7D,MAAM,0BAA0B,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AACzE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS,gCAAgC,CAAC,OAAO,EAAE;AACnD,IAAI,IAAI,OAAO,OAAO,CAAC,OAAO,KAAK,UAAU,EAAE;AAC/C,QAAQ,MAAM,IAAI,cAAc,CAAC,yBAAyB,CAAC;AAC3D,YAAY,OAAO,EAAE,yHAAyH;AAC9I;AACA,YAAY,kBAAkB,EAAE,+FAA+F;AAC/H,SAAS,CAAC,CAAC;AACX,KAAK;AACL,IAAI,MAAM,EAAE,2BAA2B,EAAE,eAAe,EAAE,GAAG,IAAI,0BAA0B,CAAC,wBAAwB,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;AAClJ;AACA;AACA;AACA,IAAI,MAAM,UAAU,GAAG,CAAC,EAAE,KAAK,2BAA2B,CAAC;AAC3D,QAAQ,iBAAiB,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE;AACvD,QAAQ,SAAS,EAAE,WAAW,IAAI,EAAE,CAAC,IAAI,cAAc,CAAC,uBAAuB,EAAE,WAAW,CAAC,CAAC,OAAO,CAAC;AACtG,KAAK,CAAC,CAAC;AACP,IAAI,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC;AACtE,IAAI,OAAO,IAAI,WAAW,CAAC,iCAAiC,EAAE;AAC9D,QAAQ,OAAO,EAAE,UAAU;AAC3B,QAAQ,MAAM,EAAE,eAAe;AAC/B,QAAQ,GAAG,MAAM;AACjB,KAAK,CAAC,CAAC;AACP,CAAC;AACD,OAAO,CAAC,gCAAgC,GAAG,gCAAgC,CAAC;AAC5E;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS,+BAA+B,CAAC,OAAO,EAAE;AAClD,IAAI,MAAM,aAAa,GAAG,IAAI,OAAO,CAAC,kBAAkB,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;AAC1E,IAAI,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC;AACnD,IAAI,OAAO,IAAI,QAAQ,CAAC,cAAc,EAAE;AACxC,QAAQ,MAAM,EAAE,aAAa;AAC7B,QAAQ,GAAG,MAAM;AACjB,KAAK,CAAC,CAAC;AACP,CAAC;AACD,OAAO,CAAC,+BAA+B,GAAG,+BAA+B;;"}

package/dist/cjs/createServerRunner.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createServerRunner = void 0;
 const utils_1 = require("@aws-amplify/core/internals/utils");
 const utils_2 = require("./utils");
+const createTokenValidator_1 = require("./utils/createTokenValidator");
 /**
  * Creates the `runWithAmplifyServerContext` function to run Amplify server side APIs in an isolated request context.
  *
@@ -26,9 +27,18 @@ const utils_2 = require("./utils");
  */
 const createServerRunner = ({ config, }) => {
     const amplifyConfig = (0, utils_1.parseAmplifyConfig)(config);
+    let tokenValidator;
+    if (amplifyConfig?.Auth) {
+        const { Cognito } = amplifyConfig.Auth;
+        tokenValidator = (0, createTokenValidator_1.createTokenValidator)({
+            userPoolId: Cognito?.userPoolId,
+            userPoolClientId: Cognito?.userPoolClientId,
+        });
+    }
     return {
         runWithAmplifyServerContext: (0, utils_2.createRunWithAmplifyServerContext)({
             config: amplifyConfig,
+            tokenValidator,
         }),
     };
 };

package/dist/cjs/createServerRunner.js.map

@@ -1 +1 @@
-{"version":3,"file":"createServerRunner.js","sources":["../../src/createServerRunner.ts"],"sourcesContent":["\"use strict\";\n// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.createServerRunner = void 0;\nconst utils_1 = require(\"@aws-amplify/core/internals/utils\");\nconst utils_2 = require(\"./utils\");\n/**\n * Creates the `runWithAmplifyServerContext` function to run Amplify server side APIs in an isolated request context.\n *\n * @remarks\n * This function should be called only once; you can use the returned `runWithAmplifyServerContext` across\n * your codebase.\n *\n * @param input The input used to create the `runWithAmplifyServerContext` function.\n * @param input.config The {@link ResourcesConfig} imported from the `amplifyconfiguration.json` file or manually\n * created.\n * @returns An object that contains the `runWithAmplifyServerContext` function.\n *\n * @example\n * import { createServerRunner } from '@aws-amplify/adapter-nextjs';\n * import config from './amplifyconfiguration.json';\n *\n * export const { runWithAmplifyServerContext } = createServerRunner({ config })\n */\nconst createServerRunner = ({ config, }) => {\n    const amplifyConfig = (0, utils_1.parseAmplifyConfig)(config);\n    return {\n        runWithAmplifyServerContext: (0, utils_2.createRunWithAmplifyServerContext)({\n            config: amplifyConfig,\n        }),\n    };\n};\nexports.createServerRunner = createServerRunner;\n"],"names":[],"mappings":";;AACA;AACA;AACA,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAC9D,OAAO,CAAC,kBAAkB,GAAG,KAAK,CAAC,CAAC;AACpC,MAAM,OAAO,GAAG,OAAO,CAAC,mCAAmC,CAAC,CAAC;AAC7D,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AACnC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAM,kBAAkB,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK;AAC5C,IAAI,MAAM,aAAa,GAAG,IAAI,OAAO,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;AAClE,IAAI,OAAO;AACX,QAAQ,2BAA2B,EAAE,IAAI,OAAO,CAAC,iCAAiC,EAAE;AACpF,YAAY,MAAM,EAAE,aAAa;AACjC,SAAS,CAAC;AACV,KAAK,CAAC;AACN,CAAC,CAAC;AACF,OAAO,CAAC,kBAAkB,GAAG,kBAAkB;;"}
+{"version":3,"file":"createServerRunner.js","sources":["../../src/createServerRunner.ts"],"sourcesContent":["\"use strict\";\n// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.createServerRunner = void 0;\nconst utils_1 = require(\"@aws-amplify/core/internals/utils\");\nconst utils_2 = require(\"./utils\");\nconst createTokenValidator_1 = require(\"./utils/createTokenValidator\");\n/**\n * Creates the `runWithAmplifyServerContext` function to run Amplify server side APIs in an isolated request context.\n *\n * @remarks\n * This function should be called only once; you can use the returned `runWithAmplifyServerContext` across\n * your codebase.\n *\n * @param input The input used to create the `runWithAmplifyServerContext` function.\n * @param input.config The {@link ResourcesConfig} imported from the `amplifyconfiguration.json` file or manually\n * created.\n * @returns An object that contains the `runWithAmplifyServerContext` function.\n *\n * @example\n * import { createServerRunner } from '@aws-amplify/adapter-nextjs';\n * import config from './amplifyconfiguration.json';\n *\n * export const { runWithAmplifyServerContext } = createServerRunner({ config })\n */\nconst createServerRunner = ({ config, }) => {\n    const amplifyConfig = (0, utils_1.parseAmplifyConfig)(config);\n    let tokenValidator;\n    if (amplifyConfig?.Auth) {\n        const { Cognito } = amplifyConfig.Auth;\n        tokenValidator = (0, createTokenValidator_1.createTokenValidator)({\n            userPoolId: Cognito?.userPoolId,\n            userPoolClientId: Cognito?.userPoolClientId,\n        });\n    }\n    return {\n        runWithAmplifyServerContext: (0, utils_2.createRunWithAmplifyServerContext)({\n            config: amplifyConfig,\n            tokenValidator,\n        }),\n    };\n};\nexports.createServerRunner = createServerRunner;\n"],"names":[],"mappings":";;AACA;AACA;AACA,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAC9D,OAAO,CAAC,kBAAkB,GAAG,KAAK,CAAC,CAAC;AACpC,MAAM,OAAO,GAAG,OAAO,CAAC,mCAAmC,CAAC,CAAC;AAC7D,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AACnC,MAAM,sBAAsB,GAAG,OAAO,CAAC,8BAA8B,CAAC,CAAC;AACvE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAM,kBAAkB,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK;AAC5C,IAAI,MAAM,aAAa,GAAG,IAAI,OAAO,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;AAClE,IAAI,IAAI,cAAc,CAAC;AACvB,IAAI,IAAI,aAAa,EAAE,IAAI,EAAE;AAC7B,QAAQ,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC;AAC/C,QAAQ,cAAc,GAAG,IAAI,sBAAsB,CAAC,oBAAoB,EAAE;AAC1E,YAAY,UAAU,EAAE,OAAO,EAAE,UAAU;AAC3C,YAAY,gBAAgB,EAAE,OAAO,EAAE,gBAAgB;AACvD,SAAS,CAAC,CAAC;AACX,KAAK;AACL,IAAI,OAAO;AACX,QAAQ,2BAA2B,EAAE,IAAI,OAAO,CAAC,iCAAiC,EAAE;AACpF,YAAY,MAAM,EAAE,aAAa;AACjC,YAAY,cAAc;AAC1B,SAAS,CAAC;AACV,KAAK,CAAC;AACN,CAAC,CAAC;AACF,OAAO,CAAC,kBAAkB,GAAG,kBAAkB;;"}

package/dist/cjs/utils/createRunWithAmplifyServerContext.js

@@ -6,9 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRunWithAmplifyServerContext = void 0;
 const core_1 = require("@aws-amplify/core");
 const adapter_core_1 = require("aws-amplify/adapter-core");
-const createTokenValidator_1 = require("./createTokenValidator");
 const createCookieStorageAdapterFromNextServerContext_1 = require("./createCookieStorageAdapterFromNextServerContext");
-const createRunWithAmplifyServerContext = ({ config: resourcesConfig, }) => {
+const createRunWithAmplifyServerContext = ({ config: resourcesConfig, tokenValidator, }) => {
     const runWithAmplifyServerContext = async ({ nextServerContext, operation }) => {
         // When the Auth config is presented, attempt to create a Amplify server
         // context with token and credentials provider.
@@ -20,10 +19,7 @@ const createRunWithAmplifyServerContext = ({ config: resourcesConfig, }) => {
             // static rendering uses the same unauthenticated role cross-sever.
             nextServerContext === null
                 ? core_1.sharedInMemoryStorage
-                : (0, adapter_core_1.createKeyValueStorageFromCookieStorageAdapter)(await (0, createCookieStorageAdapterFromNextServerContext_1.createCookieStorageAdapterFromNextServerContext)(nextServerContext), (0, createTokenValidator_1.createTokenValidator)({
-                    userPoolId: resourcesConfig?.Auth.Cognito?.userPoolId,
-                    userPoolClientId: resourcesConfig?.Auth.Cognito?.userPoolClientId,
-                }));
+                : (0, adapter_core_1.createKeyValueStorageFromCookieStorageAdapter)(await (0, createCookieStorageAdapterFromNextServerContext_1.createCookieStorageAdapterFromNextServerContext)(nextServerContext), tokenValidator);
             const credentialsProvider = (0, adapter_core_1.createAWSCredentialsAndIdentityIdProvider)(resourcesConfig.Auth, keyValueStorage);
             const tokenProvider = (0, adapter_core_1.createUserPoolsTokenProvider)(resourcesConfig.Auth, keyValueStorage);
             return (0, adapter_core_1.runWithAmplifyServerContext)(resourcesConfig, {

package/dist/cjs/utils/createRunWithAmplifyServerContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"createRunWithAmplifyServerContext.js","sources":["../../../src/utils/createRunWithAmplifyServerContext.ts"],"sourcesContent":["\"use strict\";\n// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.createRunWithAmplifyServerContext = void 0;\nconst core_1 = require(\"@aws-amplify/core\");\nconst adapter_core_1 = require(\"aws-amplify/adapter-core\");\nconst createTokenValidator_1 = require(\"./createTokenValidator\");\nconst createCookieStorageAdapterFromNextServerContext_1 = require(\"./createCookieStorageAdapterFromNextServerContext\");\nconst createRunWithAmplifyServerContext = ({ config: resourcesConfig, }) => {\n    const runWithAmplifyServerContext = async ({ nextServerContext, operation }) => {\n        // When the Auth config is presented, attempt to create a Amplify server\n        // context with token and credentials provider.\n        if (resourcesConfig.Auth) {\n            const keyValueStorage = \n            // When `null` is passed as the value of `nextServerContext`, opt-in\n            // unauthenticated role (primarily for static rendering). It's\n            // safe to use the singleton `MemoryKeyValueStorage` here, as the\n            // static rendering uses the same unauthenticated role cross-sever.\n            nextServerContext === null\n                ? core_1.sharedInMemoryStorage\n                : (0, adapter_core_1.createKeyValueStorageFromCookieStorageAdapter)(await (0, createCookieStorageAdapterFromNextServerContext_1.createCookieStorageAdapterFromNextServerContext)(nextServerContext), (0, createTokenValidator_1.createTokenValidator)({\n                    userPoolId: resourcesConfig?.Auth.Cognito?.userPoolId,\n                    userPoolClientId: resourcesConfig?.Auth.Cognito?.userPoolClientId,\n                }));\n            const credentialsProvider = (0, adapter_core_1.createAWSCredentialsAndIdentityIdProvider)(resourcesConfig.Auth, keyValueStorage);\n            const tokenProvider = (0, adapter_core_1.createUserPoolsTokenProvider)(resourcesConfig.Auth, keyValueStorage);\n            return (0, adapter_core_1.runWithAmplifyServerContext)(resourcesConfig, {\n                Auth: { credentialsProvider, tokenProvider },\n            }, operation);\n        }\n        // Otherwise it may be the case that auth is not used, e.g. API key.\n        // Omitting the `Auth` in the second parameter.\n        return (0, adapter_core_1.runWithAmplifyServerContext)(resourcesConfig, {}, operation);\n    };\n    return runWithAmplifyServerContext;\n};\nexports.createRunWithAmplifyServerContext = createRunWithAmplifyServerContext;\n"],"names":[],"mappings":";;AACA;AACA;AACA,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAC9D,OAAO,CAAC,iCAAiC,GAAG,KAAK,CAAC,CAAC;AACnD,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAC5C,MAAM,cAAc,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;AAC3D,MAAM,sBAAsB,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;AACjE,MAAM,iDAAiD,GAAG,OAAO,CAAC,mDAAmD,CAAC,CAAC;AACvH,MAAM,iCAAiC,GAAG,CAAC,EAAE,MAAM,EAAE,eAAe,GAAG,KAAK;AAC5E,IAAI,MAAM,2BAA2B,GAAG,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,KAAK;AACpF;AACA;AACA,QAAQ,IAAI,eAAe,CAAC,IAAI,EAAE;AAClC,YAAY,MAAM,eAAe;AACjC;AACA;AACA;AACA;AACA,YAAY,iBAAiB,KAAK,IAAI;AACtC,kBAAkB,MAAM,CAAC,qBAAqB;AAC9C,kBAAkB,IAAI,cAAc,CAAC,6CAA6C,EAAE,MAAM,IAAI,iDAAiD,CAAC,+CAA+C,EAAE,iBAAiB,CAAC,EAAE,IAAI,sBAAsB,CAAC,oBAAoB,EAAE;AACtQ,oBAAoB,UAAU,EAAE,eAAe,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU;AACzE,oBAAoB,gBAAgB,EAAE,eAAe,EAAE,IAAI,CAAC,OAAO,EAAE,gBAAgB;AACrF,iBAAiB,CAAC,CAAC,CAAC;AACpB,YAAY,MAAM,mBAAmB,GAAG,IAAI,cAAc,CAAC,yCAAyC,EAAE,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;AAC7I,YAAY,MAAM,aAAa,GAAG,IAAI,cAAc,CAAC,4BAA4B,EAAE,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;AAC1H,YAAY,OAAO,IAAI,cAAc,CAAC,2BAA2B,EAAE,eAAe,EAAE;AACpF,gBAAgB,IAAI,EAAE,EAAE,mBAAmB,EAAE,aAAa,EAAE;AAC5D,aAAa,EAAE,SAAS,CAAC,CAAC;AAC1B,SAAS;AACT;AACA;AACA,QAAQ,OAAO,IAAI,cAAc,CAAC,2BAA2B,EAAE,eAAe,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;AAC/F,KAAK,CAAC;AACN,IAAI,OAAO,2BAA2B,CAAC;AACvC,CAAC,CAAC;AACF,OAAO,CAAC,iCAAiC,GAAG,iCAAiC;;"}
+{"version":3,"file":"createRunWithAmplifyServerContext.js","sources":["../../../src/utils/createRunWithAmplifyServerContext.ts"],"sourcesContent":["\"use strict\";\n// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.createRunWithAmplifyServerContext = void 0;\nconst core_1 = require(\"@aws-amplify/core\");\nconst adapter_core_1 = require(\"aws-amplify/adapter-core\");\nconst createCookieStorageAdapterFromNextServerContext_1 = require(\"./createCookieStorageAdapterFromNextServerContext\");\nconst createRunWithAmplifyServerContext = ({ config: resourcesConfig, tokenValidator, }) => {\n    const runWithAmplifyServerContext = async ({ nextServerContext, operation }) => {\n        // When the Auth config is presented, attempt to create a Amplify server\n        // context with token and credentials provider.\n        if (resourcesConfig.Auth) {\n            const keyValueStorage = \n            // When `null` is passed as the value of `nextServerContext`, opt-in\n            // unauthenticated role (primarily for static rendering). It's\n            // safe to use the singleton `MemoryKeyValueStorage` here, as the\n            // static rendering uses the same unauthenticated role cross-sever.\n            nextServerContext === null\n                ? core_1.sharedInMemoryStorage\n                : (0, adapter_core_1.createKeyValueStorageFromCookieStorageAdapter)(await (0, createCookieStorageAdapterFromNextServerContext_1.createCookieStorageAdapterFromNextServerContext)(nextServerContext), tokenValidator);\n            const credentialsProvider = (0, adapter_core_1.createAWSCredentialsAndIdentityIdProvider)(resourcesConfig.Auth, keyValueStorage);\n            const tokenProvider = (0, adapter_core_1.createUserPoolsTokenProvider)(resourcesConfig.Auth, keyValueStorage);\n            return (0, adapter_core_1.runWithAmplifyServerContext)(resourcesConfig, {\n                Auth: { credentialsProvider, tokenProvider },\n            }, operation);\n        }\n        // Otherwise it may be the case that auth is not used, e.g. API key.\n        // Omitting the `Auth` in the second parameter.\n        return (0, adapter_core_1.runWithAmplifyServerContext)(resourcesConfig, {}, operation);\n    };\n    return runWithAmplifyServerContext;\n};\nexports.createRunWithAmplifyServerContext = createRunWithAmplifyServerContext;\n"],"names":[],"mappings":";;AACA;AACA;AACA,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAC9D,OAAO,CAAC,iCAAiC,GAAG,KAAK,CAAC,CAAC;AACnD,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAC5C,MAAM,cAAc,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;AAC3D,MAAM,iDAAiD,GAAG,OAAO,CAAC,mDAAmD,CAAC,CAAC;AACvH,MAAM,iCAAiC,GAAG,CAAC,EAAE,MAAM,EAAE,eAAe,EAAE,cAAc,GAAG,KAAK;AAC5F,IAAI,MAAM,2BAA2B,GAAG,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,KAAK;AACpF;AACA;AACA,QAAQ,IAAI,eAAe,CAAC,IAAI,EAAE;AAClC,YAAY,MAAM,eAAe;AACjC;AACA;AACA;AACA;AACA,YAAY,iBAAiB,KAAK,IAAI;AACtC,kBAAkB,MAAM,CAAC,qBAAqB;AAC9C,kBAAkB,IAAI,cAAc,CAAC,6CAA6C,EAAE,MAAM,IAAI,iDAAiD,CAAC,+CAA+C,EAAE,iBAAiB,CAAC,EAAE,cAAc,CAAC,CAAC;AACrO,YAAY,MAAM,mBAAmB,GAAG,IAAI,cAAc,CAAC,yCAAyC,EAAE,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;AAC7I,YAAY,MAAM,aAAa,GAAG,IAAI,cAAc,CAAC,4BAA4B,EAAE,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;AAC1H,YAAY,OAAO,IAAI,cAAc,CAAC,2BAA2B,EAAE,eAAe,EAAE;AACpF,gBAAgB,IAAI,EAAE,EAAE,mBAAmB,EAAE,aAAa,EAAE;AAC5D,aAAa,EAAE,SAAS,CAAC,CAAC;AAC1B,SAAS;AACT;AACA;AACA,QAAQ,OAAO,IAAI,cAAc,CAAC,2BAA2B,EAAE,eAAe,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;AAC/F,KAAK,CAAC;AACN,IAAI,OAAO,2BAA2B,CAAC;AACvC,CAAC,CAAC;AACF,OAAO,CAAC,iCAAiC,GAAG,iCAAiC;;"}

package/dist/cjs/utils/createTokenValidator.js

@@ -4,28 +4,42 @@
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTokenValidator = void 0;
+const aws_jwt_verify_1 = require("aws-jwt-verify");
 const isValidCognitoToken_1 = require("./isValidCognitoToken");
 /**
  * Creates a validator object for validating methods in a KeyValueStorage.
  */
 const createTokenValidator = ({ userPoolId, userPoolClientId: clientId, }) => {
+    let idTokenVerifier;
+    let accessTokenVerifier;
     return {
         // validate access, id tokens
         getItem: async (key, value) => {
-            const tokenType = key.includes('.accessToken')
-                ? 'access'
-                : key.includes('.idToken')
-                    ? 'id'
-                    : null;
-            if (!tokenType)
+            const isAccessToken = key.includes('.accessToken');
+            const isIdToken = key.includes('.idToken');
+            if (!isAccessToken && !isIdToken) {
                 return true;
-            if (!userPoolId || !clientId)
+            }
+            if (!userPoolId || !clientId) {
                 return false;
+            }
+            if (isAccessToken && !accessTokenVerifier) {
+                accessTokenVerifier = aws_jwt_verify_1.CognitoJwtVerifier.create({
+                    userPoolId,
+                    tokenUse: 'access',
+                    clientId,
+                });
+            }
+            if (isIdToken && !idTokenVerifier) {
+                idTokenVerifier = aws_jwt_verify_1.CognitoJwtVerifier.create({
+                    userPoolId,
+                    tokenUse: 'id',
+                    clientId,
+                });
+            }
             return (0, isValidCognitoToken_1.isValidCognitoToken)({
-                clientId,
-                userPoolId,
-                tokenType,
                 token: value,
+                verifier: isAccessToken ? accessTokenVerifier : idTokenVerifier,
             });
         },
     };

package/dist/cjs/utils/createTokenValidator.js.map

@@ -1 +1 @@
-{"version":3,"file":"createTokenValidator.js","sources":["../../../src/utils/createTokenValidator.ts"],"sourcesContent":["\"use strict\";\n// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.createTokenValidator = void 0;\nconst isValidCognitoToken_1 = require(\"./isValidCognitoToken\");\n/**\n * Creates a validator object for validating methods in a KeyValueStorage.\n */\nconst createTokenValidator = ({ userPoolId, userPoolClientId: clientId, }) => {\n    return {\n        // validate access, id tokens\n        getItem: async (key, value) => {\n            const tokenType = key.includes('.accessToken')\n                ? 'access'\n                : key.includes('.idToken')\n                    ? 'id'\n                    : null;\n            if (!tokenType)\n                return true;\n            if (!userPoolId || !clientId)\n                return false;\n            return (0, isValidCognitoToken_1.isValidCognitoToken)({\n                clientId,\n                userPoolId,\n                tokenType,\n                token: value,\n            });\n        },\n    };\n};\nexports.createTokenValidator = createTokenValidator;\n"],"names":[],"mappings":";;AACA;AACA;AACA,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAC9D,OAAO,CAAC,oBAAoB,GAAG,KAAK,CAAC,CAAC;AACtC,MAAM,qBAAqB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;AAC/D;AACA;AACA;AACA,MAAM,oBAAoB,GAAG,CAAC,EAAE,UAAU,EAAE,gBAAgB,EAAE,QAAQ,GAAG,KAAK;AAC9E,IAAI,OAAO;AACX;AACA,QAAQ,OAAO,EAAE,OAAO,GAAG,EAAE,KAAK,KAAK;AACvC,YAAY,MAAM,SAAS,GAAG,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC;AAC1D,kBAAkB,QAAQ;AAC1B,kBAAkB,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC;AAC1C,sBAAsB,IAAI;AAC1B,sBAAsB,IAAI,CAAC;AAC3B,YAAY,IAAI,CAAC,SAAS;AAC1B,gBAAgB,OAAO,IAAI,CAAC;AAC5B,YAAY,IAAI,CAAC,UAAU,IAAI,CAAC,QAAQ;AACxC,gBAAgB,OAAO,KAAK,CAAC;AAC7B,YAAY,OAAO,IAAI,qBAAqB,CAAC,mBAAmB,EAAE;AAClE,gBAAgB,QAAQ;AACxB,gBAAgB,UAAU;AAC1B,gBAAgB,SAAS;AACzB,gBAAgB,KAAK,EAAE,KAAK;AAC5B,aAAa,CAAC,CAAC;AACf,SAAS;AACT,KAAK,CAAC;AACN,CAAC,CAAC;AACF,OAAO,CAAC,oBAAoB,GAAG,oBAAoB;;"}
+{"version":3,"file":"createTokenValidator.js","sources":["../../../src/utils/createTokenValidator.ts"],"sourcesContent":["\"use strict\";\n// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.createTokenValidator = void 0;\nconst aws_jwt_verify_1 = require(\"aws-jwt-verify\");\nconst isValidCognitoToken_1 = require(\"./isValidCognitoToken\");\n/**\n * Creates a validator object for validating methods in a KeyValueStorage.\n */\nconst createTokenValidator = ({ userPoolId, userPoolClientId: clientId, }) => {\n    let idTokenVerifier;\n    let accessTokenVerifier;\n    return {\n        // validate access, id tokens\n        getItem: async (key, value) => {\n            const isAccessToken = key.includes('.accessToken');\n            const isIdToken = key.includes('.idToken');\n            if (!isAccessToken && !isIdToken) {\n                return true;\n            }\n            if (!userPoolId || !clientId) {\n                return false;\n            }\n            if (isAccessToken && !accessTokenVerifier) {\n                accessTokenVerifier = aws_jwt_verify_1.CognitoJwtVerifier.create({\n                    userPoolId,\n                    tokenUse: 'access',\n                    clientId,\n                });\n            }\n            if (isIdToken && !idTokenVerifier) {\n                idTokenVerifier = aws_jwt_verify_1.CognitoJwtVerifier.create({\n                    userPoolId,\n                    tokenUse: 'id',\n                    clientId,\n                });\n            }\n            return (0, isValidCognitoToken_1.isValidCognitoToken)({\n                token: value,\n                verifier: isAccessToken ? accessTokenVerifier : idTokenVerifier,\n            });\n        },\n    };\n};\nexports.createTokenValidator = createTokenValidator;\n"],"names":[],"mappings":";;AACA;AACA;AACA,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAC9D,OAAO,CAAC,oBAAoB,GAAG,KAAK,CAAC,CAAC;AACtC,MAAM,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AACnD,MAAM,qBAAqB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;AAC/D;AACA;AACA;AACA,MAAM,oBAAoB,GAAG,CAAC,EAAE,UAAU,EAAE,gBAAgB,EAAE,QAAQ,GAAG,KAAK;AAC9E,IAAI,IAAI,eAAe,CAAC;AACxB,IAAI,IAAI,mBAAmB,CAAC;AAC5B,IAAI,OAAO;AACX;AACA,QAAQ,OAAO,EAAE,OAAO,GAAG,EAAE,KAAK,KAAK;AACvC,YAAY,MAAM,aAAa,GAAG,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;AAC/D,YAAY,MAAM,SAAS,GAAG,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;AACvD,YAAY,IAAI,CAAC,aAAa,IAAI,CAAC,SAAS,EAAE;AAC9C,gBAAgB,OAAO,IAAI,CAAC;AAC5B,aAAa;AACb,YAAY,IAAI,CAAC,UAAU,IAAI,CAAC,QAAQ,EAAE;AAC1C,gBAAgB,OAAO,KAAK,CAAC;AAC7B,aAAa;AACb,YAAY,IAAI,aAAa,IAAI,CAAC,mBAAmB,EAAE;AACvD,gBAAgB,mBAAmB,GAAG,gBAAgB,CAAC,kBAAkB,CAAC,MAAM,CAAC;AACjF,oBAAoB,UAAU;AAC9B,oBAAoB,QAAQ,EAAE,QAAQ;AACtC,oBAAoB,QAAQ;AAC5B,iBAAiB,CAAC,CAAC;AACnB,aAAa;AACb,YAAY,IAAI,SAAS,IAAI,CAAC,eAAe,EAAE;AAC/C,gBAAgB,eAAe,GAAG,gBAAgB,CAAC,kBAAkB,CAAC,MAAM,CAAC;AAC7E,oBAAoB,UAAU;AAC9B,oBAAoB,QAAQ,EAAE,IAAI;AAClC,oBAAoB,QAAQ;AAC5B,iBAAiB,CAAC,CAAC;AACnB,aAAa;AACb,YAAY,OAAO,IAAI,qBAAqB,CAAC,mBAAmB,EAAE;AAClE,gBAAgB,KAAK,EAAE,KAAK;AAC5B,gBAAgB,QAAQ,EAAE,aAAa,GAAG,mBAAmB,GAAG,eAAe;AAC/E,aAAa,CAAC,CAAC;AACf,SAAS;AACT,KAAK,CAAC;AACN,CAAC,CAAC;AACF,OAAO,CAAC,oBAAoB,GAAG,oBAAoB;;"}

package/dist/cjs/utils/isValidCognitoToken.js

@@ -4,25 +4,18 @@
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isValidCognitoToken = void 0;
-const aws_jwt_verify_1 = require("aws-jwt-verify");
 const error_1 = require("aws-jwt-verify/error");
 /**
  * Verifies a Cognito JWT token for its validity.
  *
  * @param input - An object containing:
  *                - token: The JWT token as a string that needs to be verified.
- *                - userPoolId: The ID of the AWS Cognito User Pool to which the token belongs.
- *                - clientId: The Client ID associated with the Cognito User Pool.
+ *                - verifier: The JWT verifier which will verify the token.
  * @internal
  */
 const isValidCognitoToken = async (input) => {
-    const { userPoolId, clientId, tokenType, token } = input;
+    const { token, verifier } = input;
     try {
-        const verifier = aws_jwt_verify_1.CognitoJwtVerifier.create({
-            userPoolId,
-            tokenUse: tokenType,
-            clientId,
-        });
         await verifier.verify(token);
         return true;
     }

package/dist/cjs/utils/isValidCognitoToken.js.map

@@ -1 +1 @@
-{"version":3,"file":"isValidCognitoToken.js","sources":["../../../src/utils/isValidCognitoToken.ts"],"sourcesContent":["\"use strict\";\n// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.isValidCognitoToken = void 0;\nconst aws_jwt_verify_1 = require(\"aws-jwt-verify\");\nconst error_1 = require(\"aws-jwt-verify/error\");\n/**\n * Verifies a Cognito JWT token for its validity.\n *\n * @param input - An object containing:\n *                - token: The JWT token as a string that needs to be verified.\n *                - userPoolId: The ID of the AWS Cognito User Pool to which the token belongs.\n *                - clientId: The Client ID associated with the Cognito User Pool.\n * @internal\n */\nconst isValidCognitoToken = async (input) => {\n    const { userPoolId, clientId, tokenType, token } = input;\n    try {\n        const verifier = aws_jwt_verify_1.CognitoJwtVerifier.create({\n            userPoolId,\n            tokenUse: tokenType,\n            clientId,\n        });\n        await verifier.verify(token);\n        return true;\n    }\n    catch (error) {\n        // When `JwtExpiredError` is thrown, the token should have valid signature\n        // but expired. So, we can consider it as a valid token.\n        // Reference https://github.com/awslabs/aws-jwt-verify/blob/8d8f714d7281913ecd660147f5c30311479601c1/src/jwt-rsa.ts#L290-L301\n        if (error instanceof error_1.JwtExpiredError) {\n            return true;\n        }\n        // TODO (ashwinkumar6): surface invalid cognito token error to customer\n        // TODO: clear invalid tokens from Storage\n        return false;\n    }\n};\nexports.isValidCognitoToken = isValidCognitoToken;\n"],"names":[],"mappings":";;AACA;AACA;AACA,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAC9D,OAAO,CAAC,mBAAmB,GAAG,KAAK,CAAC,CAAC;AACrC,MAAM,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AACnD,MAAM,OAAO,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;AAChD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAM,mBAAmB,GAAG,OAAO,KAAK,KAAK;AAC7C,IAAI,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;AAC7D,IAAI,IAAI;AACR,QAAQ,MAAM,QAAQ,GAAG,gBAAgB,CAAC,kBAAkB,CAAC,MAAM,CAAC;AACpE,YAAY,UAAU;AACtB,YAAY,QAAQ,EAAE,SAAS;AAC/B,YAAY,QAAQ;AACpB,SAAS,CAAC,CAAC;AACX,QAAQ,MAAM,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACrC,QAAQ,OAAO,IAAI,CAAC;AACpB,KAAK;AACL,IAAI,OAAO,KAAK,EAAE;AAClB;AACA;AACA;AACA,QAAQ,IAAI,KAAK,YAAY,OAAO,CAAC,eAAe,EAAE;AACtD,YAAY,OAAO,IAAI,CAAC;AACxB,SAAS;AACT;AACA;AACA,QAAQ,OAAO,KAAK,CAAC;AACrB,KAAK;AACL,CAAC,CAAC;AACF,OAAO,CAAC,mBAAmB,GAAG,mBAAmB;;"}
+{"version":3,"file":"isValidCognitoToken.js","sources":["../../../src/utils/isValidCognitoToken.ts"],"sourcesContent":["\"use strict\";\n// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.isValidCognitoToken = void 0;\nconst error_1 = require(\"aws-jwt-verify/error\");\n/**\n * Verifies a Cognito JWT token for its validity.\n *\n * @param input - An object containing:\n *                - token: The JWT token as a string that needs to be verified.\n *                - verifier: The JWT verifier which will verify the token.\n * @internal\n */\nconst isValidCognitoToken = async (input) => {\n    const { token, verifier } = input;\n    try {\n        await verifier.verify(token);\n        return true;\n    }\n    catch (error) {\n        // When `JwtExpiredError` is thrown, the token should have valid signature\n        // but expired. So, we can consider it as a valid token.\n        // Reference https://github.com/awslabs/aws-jwt-verify/blob/8d8f714d7281913ecd660147f5c30311479601c1/src/jwt-rsa.ts#L290-L301\n        if (error instanceof error_1.JwtExpiredError) {\n            return true;\n        }\n        // TODO (ashwinkumar6): surface invalid cognito token error to customer\n        // TODO: clear invalid tokens from Storage\n        return false;\n    }\n};\nexports.isValidCognitoToken = isValidCognitoToken;\n"],"names":[],"mappings":";;AACA;AACA;AACA,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAC9D,OAAO,CAAC,mBAAmB,GAAG,KAAK,CAAC,CAAC;AACrC,MAAM,OAAO,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;AAChD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAM,mBAAmB,GAAG,OAAO,KAAK,KAAK;AAC7C,IAAI,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;AACtC,IAAI,IAAI;AACR,QAAQ,MAAM,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACrC,QAAQ,OAAO,IAAI,CAAC;AACpB,KAAK;AACL,IAAI,OAAO,KAAK,EAAE;AAClB;AACA;AACA;AACA,QAAQ,IAAI,KAAK,YAAY,OAAO,CAAC,eAAe,EAAE;AACtD,YAAY,OAAO,IAAI,CAAC;AACxB,SAAS;AACT;AACA;AACA,QAAQ,OAAO,KAAK,CAAC;AACrB,KAAK;AACL,CAAC,CAAC;AACF,OAAO,CAAC,mBAAmB,GAAG,mBAAmB;;"}

package/dist/esm/api/createServerRunnerForAPI.mjs

@@ -1,6 +1,5 @@
 import { parseAmplifyConfig } from '@aws-amplify/core/internals/utils';
 import { createRunWithAmplifyServerContext } from '../utils/createRunWithAmplifyServerContext.mjs';
-import 'aws-jwt-verify';
 import 'aws-jwt-verify/error';
 
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.

package/dist/esm/api/createServerRunnerForAPI.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"createServerRunnerForAPI.mjs","sources":["../../../src/api/createServerRunnerForAPI.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { parseAmplifyConfig } from '@aws-amplify/core/internals/utils';\nimport { createRunWithAmplifyServerContext } from '../utils';\nexport const createServerRunnerForAPI = ({ config, }) => {\n    const amplifyConfig = parseAmplifyConfig(config);\n    return {\n        runWithAmplifyServerContext: createRunWithAmplifyServerContext({\n            config: amplifyConfig,\n        }),\n        resourcesConfig: amplifyConfig,\n    };\n};\n"],"names":[],"mappings":";;;;;AAAA;AACA;AAGY,MAAC,wBAAwB,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK;AACzD,IAAI,MAAM,aAAa,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;AACrD,IAAI,OAAO;AACX,QAAQ,2BAA2B,EAAE,iCAAiC,CAAC;AACvE,YAAY,MAAM,EAAE,aAAa;AACjC,SAAS,CAAC;AACV,QAAQ,eAAe,EAAE,aAAa;AACtC,KAAK,CAAC;AACN;;;;"}
+{"version":3,"file":"createServerRunnerForAPI.mjs","sources":["../../../src/api/createServerRunnerForAPI.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { parseAmplifyConfig } from '@aws-amplify/core/internals/utils';\nimport { createRunWithAmplifyServerContext } from '../utils';\nexport const createServerRunnerForAPI = ({ config, }) => {\n    const amplifyConfig = parseAmplifyConfig(config);\n    return {\n        runWithAmplifyServerContext: createRunWithAmplifyServerContext({\n            config: amplifyConfig,\n        }),\n        resourcesConfig: amplifyConfig,\n    };\n};\n"],"names":[],"mappings":";;;;AAAA;AACA;AAGY,MAAC,wBAAwB,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK;AACzD,IAAI,MAAM,aAAa,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;AACrD,IAAI,OAAO;AACX,QAAQ,2BAA2B,EAAE,iCAAiC,CAAC;AACvE,YAAY,MAAM,EAAE,aAAa;AACjC,SAAS,CAAC;AACV,QAAQ,eAAe,EAAE,aAAa;AACtC,KAAK,CAAC;AACN;;;;"}

package/dist/esm/api/generateServerClient.d.ts

@@ -1,16 +1,11 @@
-import { V6ClientSSRCookies, V6ClientSSRRequest } from '@aws-amplify/api-graphql';
-import { GraphQLAuthMode } from '@aws-amplify/core/internals/utils';
+import { CommonPublicClientOptions, V6ClientSSRCookies, V6ClientSSRRequest } from '@aws-amplify/api-graphql';
 import { NextServer } from '../types';
 interface CookiesClientParams {
     cookies: NextServer.ServerComponentContext['cookies'];
     config: NextServer.CreateServerRunnerInput['config'];
-    authMode?: GraphQLAuthMode;
-    authToken?: string;
 }
 interface ReqClientParams {
     config: NextServer.CreateServerRunnerInput['config'];
-    authMode?: GraphQLAuthMode;
-    authToken?: string;
 }
 /**
  * Generates an API client that can be used inside a Next.js Server Component with Dynamic Rendering
@@ -21,7 +16,7 @@ interface ReqClientParams {
  * const client = generateServerClientUsingCookies({ cookies });
  * const result = await client.graphql({ query: listPosts });
  */
-export declare function generateServerClientUsingCookies<T extends Record<any, any> = never>({ config, cookies, authMode, authToken, }: CookiesClientParams): V6ClientSSRCookies<T>;
+export declare function generateServerClientUsingCookies<T extends Record<any, any> = never, Options extends CommonPublicClientOptions & CookiesClientParams = CookiesClientParams>(options: Options): V6ClientSSRCookies<T, Options>;
 /**
  * Generates an API client that can be used with both Pages Router and App Router
  *
@@ -38,5 +33,5 @@ export declare function generateServerClientUsingCookies<T extends Record<any, a
  *   }),
  * });
  */
-export declare function generateServerClientUsingReqRes<T extends Record<any, any> = never>({ config, authMode, authToken }: ReqClientParams): V6ClientSSRRequest<T>;
+export declare function generateServerClientUsingReqRes<T extends Record<any, any> = never, Options extends CommonPublicClientOptions & ReqClientParams = ReqClientParams>(options: Options): V6ClientSSRRequest<T, Options>;
 export {};

package/dist/esm/api/generateServerClient.mjs

@@ -15,28 +15,28 @@ import { createServerRunnerForAPI } from './createServerRunnerForAPI.mjs';
  * const client = generateServerClientUsingCookies({ cookies });
  * const result = await client.graphql({ query: listPosts });
  */
-function generateServerClientUsingCookies({ config, cookies, authMode, authToken, }) {
-    if (typeof cookies !== 'function') {
+function generateServerClientUsingCookies(options) {
+    if (typeof options.cookies !== 'function') {
         throw new AmplifyServerContextError({
             message: 'generateServerClientUsingCookies is only compatible with the `cookies` Dynamic Function available in Server Components.',
             // TODO: link to docs
             recoverySuggestion: 'use `generateServerClient` inside of `runWithAmplifyServerContext` with the `request` object.',
         });
     }
-    const { runWithAmplifyServerContext, resourcesConfig } = createServerRunnerForAPI({ config });
+    const { runWithAmplifyServerContext, resourcesConfig } = createServerRunnerForAPI({ config: options.config });
     // This function reference gets passed down to InternalGraphQLAPI.ts.graphql
     // where this._graphql is passed in as the `fn` argument
     // causing it to always get invoked inside `runWithAmplifyServerContext`
     const getAmplify = (fn) => runWithAmplifyServerContext({
-        nextServerContext: { cookies },
+        nextServerContext: { cookies: options.cookies },
         operation: contextSpec => fn(getAmplifyServerContext(contextSpec).amplify),
     });
+    const { cookies: _cookies, config: _config, ...params } = options;
     return generateClientWithAmplifyInstance({
         amplify: getAmplify,
         config: resourcesConfig,
-        authMode,
-        authToken,
-    });
+        ...params,
+    }); // TS can't narrow the type here.
 }
 /**
  * Generates an API client that can be used with both Pages Router and App Router
@@ -54,12 +54,12 @@ function generateServerClientUsingCookies({ config, cookies, authMode, authToken
  *   }),
  * });
  */
-function generateServerClientUsingReqRes({ config, authMode, authToken }) {
-    const amplifyConfig = parseAmplifyConfig(config);
+function generateServerClientUsingReqRes(options) {
+    const amplifyConfig = parseAmplifyConfig(options.config);
+    const { config: _config, ...params } = options;
     return generateClient({
         config: amplifyConfig,
-        authMode,
-        authToken,
+        ...params,
     });
 }
 

package/dist/esm/api/generateServerClient.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"generateServerClient.mjs","sources":["../../../src/api/generateServerClient.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { generateClientWithAmplifyInstance } from '@aws-amplify/api/internals';\nimport { generateClient } from 'aws-amplify/api/server';\nimport { AmplifyServerContextError, getAmplifyServerContext, } from '@aws-amplify/core/internals/adapter-core';\nimport { parseAmplifyConfig, } from '@aws-amplify/core/internals/utils';\nimport { createServerRunnerForAPI } from './createServerRunnerForAPI';\n/**\n * Generates an API client that can be used inside a Next.js Server Component with Dynamic Rendering\n *\n * @example\n * import { cookies } from \"next/headers\"\n *\n * const client = generateServerClientUsingCookies({ cookies });\n * const result = await client.graphql({ query: listPosts });\n */\nexport function generateServerClientUsingCookies({ config, cookies, authMode, authToken, }) {\n    if (typeof cookies !== 'function') {\n        throw new AmplifyServerContextError({\n            message: 'generateServerClientUsingCookies is only compatible with the `cookies` Dynamic Function available in Server Components.',\n            // TODO: link to docs\n            recoverySuggestion: 'use `generateServerClient` inside of `runWithAmplifyServerContext` with the `request` object.',\n        });\n    }\n    const { runWithAmplifyServerContext, resourcesConfig } = createServerRunnerForAPI({ config });\n    // This function reference gets passed down to InternalGraphQLAPI.ts.graphql\n    // where this._graphql is passed in as the `fn` argument\n    // causing it to always get invoked inside `runWithAmplifyServerContext`\n    const getAmplify = (fn) => runWithAmplifyServerContext({\n        nextServerContext: { cookies },\n        operation: contextSpec => fn(getAmplifyServerContext(contextSpec).amplify),\n    });\n    return generateClientWithAmplifyInstance({\n        amplify: getAmplify,\n        config: resourcesConfig,\n        authMode,\n        authToken,\n    });\n}\n/**\n * Generates an API client that can be used with both Pages Router and App Router\n *\n * @example\n * import config from './amplifyconfiguration.json';\n * import { listPosts } from './graphql/queries';\n *\n * const client = generateServerClientUsingReqRes({ config });\n *\n * const result = await runWithAmplifyServerContext({\n *   nextServerContext: { request, response },\n *   operation: (contextSpec) => client.graphql(contextSpec, {\n *     query: listPosts,\n *   }),\n * });\n */\nexport function generateServerClientUsingReqRes({ config, authMode, authToken }) {\n    const amplifyConfig = parseAmplifyConfig(config);\n    return generateClient({\n        config: amplifyConfig,\n        authMode,\n        authToken,\n    });\n}\n"],"names":[],"mappings":";;;;;;AAAA;AACA;AAMA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAAS,gCAAgC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,GAAG,EAAE;AAC5F,IAAI,IAAI,OAAO,OAAO,KAAK,UAAU,EAAE;AACvC,QAAQ,MAAM,IAAI,yBAAyB,CAAC;AAC5C,YAAY,OAAO,EAAE,yHAAyH;AAC9I;AACA,YAAY,kBAAkB,EAAE,+FAA+F;AAC/H,SAAS,CAAC,CAAC;AACX,KAAK;AACL,IAAI,MAAM,EAAE,2BAA2B,EAAE,eAAe,EAAE,GAAG,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;AAClG;AACA;AACA;AACA,IAAI,MAAM,UAAU,GAAG,CAAC,EAAE,KAAK,2BAA2B,CAAC;AAC3D,QAAQ,iBAAiB,EAAE,EAAE,OAAO,EAAE;AACtC,QAAQ,SAAS,EAAE,WAAW,IAAI,EAAE,CAAC,uBAAuB,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC;AAClF,KAAK,CAAC,CAAC;AACP,IAAI,OAAO,iCAAiC,CAAC;AAC7C,QAAQ,OAAO,EAAE,UAAU;AAC3B,QAAQ,MAAM,EAAE,eAAe;AAC/B,QAAQ,QAAQ;AAChB,QAAQ,SAAS;AACjB,KAAK,CAAC,CAAC;AACP,CAAC;AACD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAAS,+BAA+B,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE;AACjF,IAAI,MAAM,aAAa,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;AACrD,IAAI,OAAO,cAAc,CAAC;AAC1B,QAAQ,MAAM,EAAE,aAAa;AAC7B,QAAQ,QAAQ;AAChB,QAAQ,SAAS;AACjB,KAAK,CAAC,CAAC;AACP;;;;"}
+{"version":3,"file":"generateServerClient.mjs","sources":["../../../src/api/generateServerClient.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { generateClientWithAmplifyInstance } from '@aws-amplify/api/internals';\nimport { generateClient } from 'aws-amplify/api/server';\nimport { AmplifyServerContextError, getAmplifyServerContext, } from '@aws-amplify/core/internals/adapter-core';\nimport { parseAmplifyConfig } from '@aws-amplify/core/internals/utils';\nimport { createServerRunnerForAPI } from './createServerRunnerForAPI';\n/**\n * Generates an API client that can be used inside a Next.js Server Component with Dynamic Rendering\n *\n * @example\n * import { cookies } from \"next/headers\"\n *\n * const client = generateServerClientUsingCookies({ cookies });\n * const result = await client.graphql({ query: listPosts });\n */\nexport function generateServerClientUsingCookies(options) {\n    if (typeof options.cookies !== 'function') {\n        throw new AmplifyServerContextError({\n            message: 'generateServerClientUsingCookies is only compatible with the `cookies` Dynamic Function available in Server Components.',\n            // TODO: link to docs\n            recoverySuggestion: 'use `generateServerClient` inside of `runWithAmplifyServerContext` with the `request` object.',\n        });\n    }\n    const { runWithAmplifyServerContext, resourcesConfig } = createServerRunnerForAPI({ config: options.config });\n    // This function reference gets passed down to InternalGraphQLAPI.ts.graphql\n    // where this._graphql is passed in as the `fn` argument\n    // causing it to always get invoked inside `runWithAmplifyServerContext`\n    const getAmplify = (fn) => runWithAmplifyServerContext({\n        nextServerContext: { cookies: options.cookies },\n        operation: contextSpec => fn(getAmplifyServerContext(contextSpec).amplify),\n    });\n    const { cookies: _cookies, config: _config, ...params } = options;\n    return generateClientWithAmplifyInstance({\n        amplify: getAmplify,\n        config: resourcesConfig,\n        ...params,\n    }); // TS can't narrow the type here.\n}\n/**\n * Generates an API client that can be used with both Pages Router and App Router\n *\n * @example\n * import config from './amplifyconfiguration.json';\n * import { listPosts } from './graphql/queries';\n *\n * const client = generateServerClientUsingReqRes({ config });\n *\n * const result = await runWithAmplifyServerContext({\n *   nextServerContext: { request, response },\n *   operation: (contextSpec) => client.graphql(contextSpec, {\n *     query: listPosts,\n *   }),\n * });\n */\nexport function generateServerClientUsingReqRes(options) {\n    const amplifyConfig = parseAmplifyConfig(options.config);\n    const { config: _config, ...params } = options;\n    return generateClient({\n        config: amplifyConfig,\n        ...params,\n    });\n}\n"],"names":[],"mappings":";;;;;;AAAA;AACA;AAMA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAAS,gCAAgC,CAAC,OAAO,EAAE;AAC1D,IAAI,IAAI,OAAO,OAAO,CAAC,OAAO,KAAK,UAAU,EAAE;AAC/C,QAAQ,MAAM,IAAI,yBAAyB,CAAC;AAC5C,YAAY,OAAO,EAAE,yHAAyH;AAC9I;AACA,YAAY,kBAAkB,EAAE,+FAA+F;AAC/H,SAAS,CAAC,CAAC;AACX,KAAK;AACL,IAAI,MAAM,EAAE,2BAA2B,EAAE,eAAe,EAAE,GAAG,wBAAwB,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;AAClH;AACA;AACA;AACA,IAAI,MAAM,UAAU,GAAG,CAAC,EAAE,KAAK,2BAA2B,CAAC;AAC3D,QAAQ,iBAAiB,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE;AACvD,QAAQ,SAAS,EAAE,WAAW,IAAI,EAAE,CAAC,uBAAuB,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC;AAClF,KAAK,CAAC,CAAC;AACP,IAAI,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC;AACtE,IAAI,OAAO,iCAAiC,CAAC;AAC7C,QAAQ,OAAO,EAAE,UAAU;AAC3B,QAAQ,MAAM,EAAE,eAAe;AAC/B,QAAQ,GAAG,MAAM;AACjB,KAAK,CAAC,CAAC;AACP,CAAC;AACD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAAS,+BAA+B,CAAC,OAAO,EAAE;AACzD,IAAI,MAAM,aAAa,GAAG,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;AAC7D,IAAI,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC;AACnD,IAAI,OAAO,cAAc,CAAC;AAC1B,QAAQ,MAAM,EAAE,aAAa;AAC7B,QAAQ,GAAG,MAAM;AACjB,KAAK,CAAC,CAAC;AACP;;;;"}

package/dist/esm/createServerRunner.mjs

@@ -1,7 +1,7 @@
 import { parseAmplifyConfig } from '@aws-amplify/core/internals/utils';
 import { createRunWithAmplifyServerContext } from './utils/createRunWithAmplifyServerContext.mjs';
-import 'aws-jwt-verify';
 import 'aws-jwt-verify/error';
+import { createTokenValidator } from './utils/createTokenValidator.mjs';
 
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
@@ -25,9 +25,18 @@ import 'aws-jwt-verify/error';
  */
 const createServerRunner = ({ config, }) => {
     const amplifyConfig = parseAmplifyConfig(config);
+    let tokenValidator;
+    if (amplifyConfig?.Auth) {
+        const { Cognito } = amplifyConfig.Auth;
+        tokenValidator = createTokenValidator({
+            userPoolId: Cognito?.userPoolId,
+            userPoolClientId: Cognito?.userPoolClientId,
+        });
+    }
     return {
         runWithAmplifyServerContext: createRunWithAmplifyServerContext({
             config: amplifyConfig,
+            tokenValidator,
         }),
     };
 };

package/dist/esm/createServerRunner.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"createServerRunner.mjs","sources":["../../src/createServerRunner.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { parseAmplifyConfig } from '@aws-amplify/core/internals/utils';\nimport { createRunWithAmplifyServerContext } from './utils';\n/**\n * Creates the `runWithAmplifyServerContext` function to run Amplify server side APIs in an isolated request context.\n *\n * @remarks\n * This function should be called only once; you can use the returned `runWithAmplifyServerContext` across\n * your codebase.\n *\n * @param input The input used to create the `runWithAmplifyServerContext` function.\n * @param input.config The {@link ResourcesConfig} imported from the `amplifyconfiguration.json` file or manually\n * created.\n * @returns An object that contains the `runWithAmplifyServerContext` function.\n *\n * @example\n * import { createServerRunner } from '@aws-amplify/adapter-nextjs';\n * import config from './amplifyconfiguration.json';\n *\n * export const { runWithAmplifyServerContext } = createServerRunner({ config })\n */\nexport const createServerRunner = ({ config, }) => {\n    const amplifyConfig = parseAmplifyConfig(config);\n    return {\n        runWithAmplifyServerContext: createRunWithAmplifyServerContext({\n            config: amplifyConfig,\n        }),\n    };\n};\n"],"names":[],"mappings":";;;;;AAAA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACY,MAAC,kBAAkB,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK;AACnD,IAAI,MAAM,aAAa,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;AACrD,IAAI,OAAO;AACX,QAAQ,2BAA2B,EAAE,iCAAiC,CAAC;AACvE,YAAY,MAAM,EAAE,aAAa;AACjC,SAAS,CAAC;AACV,KAAK,CAAC;AACN;;;;"}
+{"version":3,"file":"createServerRunner.mjs","sources":["../../src/createServerRunner.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { parseAmplifyConfig } from '@aws-amplify/core/internals/utils';\nimport { createRunWithAmplifyServerContext } from './utils';\nimport { createTokenValidator } from './utils/createTokenValidator';\n/**\n * Creates the `runWithAmplifyServerContext` function to run Amplify server side APIs in an isolated request context.\n *\n * @remarks\n * This function should be called only once; you can use the returned `runWithAmplifyServerContext` across\n * your codebase.\n *\n * @param input The input used to create the `runWithAmplifyServerContext` function.\n * @param input.config The {@link ResourcesConfig} imported from the `amplifyconfiguration.json` file or manually\n * created.\n * @returns An object that contains the `runWithAmplifyServerContext` function.\n *\n * @example\n * import { createServerRunner } from '@aws-amplify/adapter-nextjs';\n * import config from './amplifyconfiguration.json';\n *\n * export const { runWithAmplifyServerContext } = createServerRunner({ config })\n */\nexport const createServerRunner = ({ config, }) => {\n    const amplifyConfig = parseAmplifyConfig(config);\n    let tokenValidator;\n    if (amplifyConfig?.Auth) {\n        const { Cognito } = amplifyConfig.Auth;\n        tokenValidator = createTokenValidator({\n            userPoolId: Cognito?.userPoolId,\n            userPoolClientId: Cognito?.userPoolClientId,\n        });\n    }\n    return {\n        runWithAmplifyServerContext: createRunWithAmplifyServerContext({\n            config: amplifyConfig,\n            tokenValidator,\n        }),\n    };\n};\n"],"names":[],"mappings":";;;;;AAAA;AACA;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACY,MAAC,kBAAkB,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK;AACnD,IAAI,MAAM,aAAa,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;AACrD,IAAI,IAAI,cAAc,CAAC;AACvB,IAAI,IAAI,aAAa,EAAE,IAAI,EAAE;AAC7B,QAAQ,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC;AAC/C,QAAQ,cAAc,GAAG,oBAAoB,CAAC;AAC9C,YAAY,UAAU,EAAE,OAAO,EAAE,UAAU;AAC3C,YAAY,gBAAgB,EAAE,OAAO,EAAE,gBAAgB;AACvD,SAAS,CAAC,CAAC;AACX,KAAK;AACL,IAAI,OAAO;AACX,QAAQ,2BAA2B,EAAE,iCAAiC,CAAC;AACvE,YAAY,MAAM,EAAE,aAAa;AACjC,YAAY,cAAc;AAC1B,SAAS,CAAC;AACV,KAAK,CAAC;AACN;;;;"}

package/dist/esm/types/index.d.ts

@@ -1 +1,3 @@
+import { CognitoJwtVerifier } from 'aws-jwt-verify';
 export { NextServer } from './NextServer';
+export type JwtVerifier = ReturnType<typeof CognitoJwtVerifier.create>;

package/dist/esm/utils/createRunWithAmplifyServerContext.d.ts

@@ -1,5 +1,7 @@
 import { ResourcesConfig } from '@aws-amplify/core';
+import { KeyValueStorageMethodValidator } from '@aws-amplify/core/internals/adapter-core';
 import { NextServer } from '../types';
-export declare const createRunWithAmplifyServerContext: ({ config: resourcesConfig, }: {
+export declare const createRunWithAmplifyServerContext: ({ config: resourcesConfig, tokenValidator, }: {
     config: ResourcesConfig;
+    tokenValidator?: Partial<Record<keyof import("@aws-amplify/core").KeyValueStorageInterface, (...args: any[]) => Promise<boolean>>> | undefined;
 }) => NextServer.RunOperationWithContext;

package/dist/esm/utils/createRunWithAmplifyServerContext.mjs

@@ -1,11 +1,10 @@
 import { sharedInMemoryStorage } from '@aws-amplify/core';
 import { createKeyValueStorageFromCookieStorageAdapter, createAWSCredentialsAndIdentityIdProvider, createUserPoolsTokenProvider, runWithAmplifyServerContext } from 'aws-amplify/adapter-core';
-import { createTokenValidator } from './createTokenValidator.mjs';
 import { createCookieStorageAdapterFromNextServerContext } from './createCookieStorageAdapterFromNextServerContext.mjs';
 
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-const createRunWithAmplifyServerContext = ({ config: resourcesConfig, }) => {
+const createRunWithAmplifyServerContext = ({ config: resourcesConfig, tokenValidator, }) => {
     const runWithAmplifyServerContext$1 = async ({ nextServerContext, operation }) => {
         // When the Auth config is presented, attempt to create a Amplify server
         // context with token and credentials provider.
@@ -17,10 +16,7 @@ const createRunWithAmplifyServerContext = ({ config: resourcesConfig, }) => {
             // static rendering uses the same unauthenticated role cross-sever.
             nextServerContext === null
                 ? sharedInMemoryStorage
-                : createKeyValueStorageFromCookieStorageAdapter(await createCookieStorageAdapterFromNextServerContext(nextServerContext), createTokenValidator({
-                    userPoolId: resourcesConfig?.Auth.Cognito?.userPoolId,
-                    userPoolClientId: resourcesConfig?.Auth.Cognito?.userPoolClientId,
-                }));
+                : createKeyValueStorageFromCookieStorageAdapter(await createCookieStorageAdapterFromNextServerContext(nextServerContext), tokenValidator);
             const credentialsProvider = createAWSCredentialsAndIdentityIdProvider(resourcesConfig.Auth, keyValueStorage);
             const tokenProvider = createUserPoolsTokenProvider(resourcesConfig.Auth, keyValueStorage);
             return runWithAmplifyServerContext(resourcesConfig, {

package/dist/esm/utils/createRunWithAmplifyServerContext.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"createRunWithAmplifyServerContext.mjs","sources":["../../../src/utils/createRunWithAmplifyServerContext.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { sharedInMemoryStorage } from '@aws-amplify/core';\nimport { createAWSCredentialsAndIdentityIdProvider, createKeyValueStorageFromCookieStorageAdapter, createUserPoolsTokenProvider, runWithAmplifyServerContext as runWithAmplifyServerContextCore, } from 'aws-amplify/adapter-core';\nimport { createTokenValidator } from './createTokenValidator';\nimport { createCookieStorageAdapterFromNextServerContext } from './createCookieStorageAdapterFromNextServerContext';\nexport const createRunWithAmplifyServerContext = ({ config: resourcesConfig, }) => {\n    const runWithAmplifyServerContext = async ({ nextServerContext, operation }) => {\n        // When the Auth config is presented, attempt to create a Amplify server\n        // context with token and credentials provider.\n        if (resourcesConfig.Auth) {\n            const keyValueStorage = \n            // When `null` is passed as the value of `nextServerContext`, opt-in\n            // unauthenticated role (primarily for static rendering). It's\n            // safe to use the singleton `MemoryKeyValueStorage` here, as the\n            // static rendering uses the same unauthenticated role cross-sever.\n            nextServerContext === null\n                ? sharedInMemoryStorage\n                : createKeyValueStorageFromCookieStorageAdapter(await createCookieStorageAdapterFromNextServerContext(nextServerContext), createTokenValidator({\n                    userPoolId: resourcesConfig?.Auth.Cognito?.userPoolId,\n                    userPoolClientId: resourcesConfig?.Auth.Cognito?.userPoolClientId,\n                }));\n            const credentialsProvider = createAWSCredentialsAndIdentityIdProvider(resourcesConfig.Auth, keyValueStorage);\n            const tokenProvider = createUserPoolsTokenProvider(resourcesConfig.Auth, keyValueStorage);\n            return runWithAmplifyServerContextCore(resourcesConfig, {\n                Auth: { credentialsProvider, tokenProvider },\n            }, operation);\n        }\n        // Otherwise it may be the case that auth is not used, e.g. API key.\n        // Omitting the `Auth` in the second parameter.\n        return runWithAmplifyServerContextCore(resourcesConfig, {}, operation);\n    };\n    return runWithAmplifyServerContext;\n};\n"],"names":["runWithAmplifyServerContext","runWithAmplifyServerContextCore"],"mappings":";;;;;AAAA;AACA;AAKY,MAAC,iCAAiC,GAAG,CAAC,EAAE,MAAM,EAAE,eAAe,GAAG,KAAK;AACnF,IAAI,MAAMA,6BAA2B,GAAG,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,KAAK;AACpF;AACA;AACA,QAAQ,IAAI,eAAe,CAAC,IAAI,EAAE;AAClC,YAAY,MAAM,eAAe;AACjC;AACA;AACA;AACA;AACA,YAAY,iBAAiB,KAAK,IAAI;AACtC,kBAAkB,qBAAqB;AACvC,kBAAkB,6CAA6C,CAAC,MAAM,+CAA+C,CAAC,iBAAiB,CAAC,EAAE,oBAAoB,CAAC;AAC/J,oBAAoB,UAAU,EAAE,eAAe,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU;AACzE,oBAAoB,gBAAgB,EAAE,eAAe,EAAE,IAAI,CAAC,OAAO,EAAE,gBAAgB;AACrF,iBAAiB,CAAC,CAAC,CAAC;AACpB,YAAY,MAAM,mBAAmB,GAAG,yCAAyC,CAAC,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;AACzH,YAAY,MAAM,aAAa,GAAG,4BAA4B,CAAC,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;AACtG,YAAY,OAAOC,2BAA+B,CAAC,eAAe,EAAE;AACpE,gBAAgB,IAAI,EAAE,EAAE,mBAAmB,EAAE,aAAa,EAAE;AAC5D,aAAa,EAAE,SAAS,CAAC,CAAC;AAC1B,SAAS;AACT;AACA;AACA,QAAQ,OAAOA,2BAA+B,CAAC,eAAe,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;AAC/E,KAAK,CAAC;AACN,IAAI,OAAOD,6BAA2B,CAAC;AACvC;;;;"}
+{"version":3,"file":"createRunWithAmplifyServerContext.mjs","sources":["../../../src/utils/createRunWithAmplifyServerContext.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { sharedInMemoryStorage } from '@aws-amplify/core';\nimport { createAWSCredentialsAndIdentityIdProvider, createKeyValueStorageFromCookieStorageAdapter, createUserPoolsTokenProvider, runWithAmplifyServerContext as runWithAmplifyServerContextCore, } from 'aws-amplify/adapter-core';\nimport { createCookieStorageAdapterFromNextServerContext } from './createCookieStorageAdapterFromNextServerContext';\nexport const createRunWithAmplifyServerContext = ({ config: resourcesConfig, tokenValidator, }) => {\n    const runWithAmplifyServerContext = async ({ nextServerContext, operation }) => {\n        // When the Auth config is presented, attempt to create a Amplify server\n        // context with token and credentials provider.\n        if (resourcesConfig.Auth) {\n            const keyValueStorage = \n            // When `null` is passed as the value of `nextServerContext`, opt-in\n            // unauthenticated role (primarily for static rendering). It's\n            // safe to use the singleton `MemoryKeyValueStorage` here, as the\n            // static rendering uses the same unauthenticated role cross-sever.\n            nextServerContext === null\n                ? sharedInMemoryStorage\n                : createKeyValueStorageFromCookieStorageAdapter(await createCookieStorageAdapterFromNextServerContext(nextServerContext), tokenValidator);\n            const credentialsProvider = createAWSCredentialsAndIdentityIdProvider(resourcesConfig.Auth, keyValueStorage);\n            const tokenProvider = createUserPoolsTokenProvider(resourcesConfig.Auth, keyValueStorage);\n            return runWithAmplifyServerContextCore(resourcesConfig, {\n                Auth: { credentialsProvider, tokenProvider },\n            }, operation);\n        }\n        // Otherwise it may be the case that auth is not used, e.g. API key.\n        // Omitting the `Auth` in the second parameter.\n        return runWithAmplifyServerContextCore(resourcesConfig, {}, operation);\n    };\n    return runWithAmplifyServerContext;\n};\n"],"names":["runWithAmplifyServerContext","runWithAmplifyServerContextCore"],"mappings":";;;;AAAA;AACA;AAIY,MAAC,iCAAiC,GAAG,CAAC,EAAE,MAAM,EAAE,eAAe,EAAE,cAAc,GAAG,KAAK;AACnG,IAAI,MAAMA,6BAA2B,GAAG,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,KAAK;AACpF;AACA;AACA,QAAQ,IAAI,eAAe,CAAC,IAAI,EAAE;AAClC,YAAY,MAAM,eAAe;AACjC;AACA;AACA;AACA;AACA,YAAY,iBAAiB,KAAK,IAAI;AACtC,kBAAkB,qBAAqB;AACvC,kBAAkB,6CAA6C,CAAC,MAAM,+CAA+C,CAAC,iBAAiB,CAAC,EAAE,cAAc,CAAC,CAAC;AAC1J,YAAY,MAAM,mBAAmB,GAAG,yCAAyC,CAAC,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;AACzH,YAAY,MAAM,aAAa,GAAG,4BAA4B,CAAC,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;AACtG,YAAY,OAAOC,2BAA+B,CAAC,eAAe,EAAE;AACpE,gBAAgB,IAAI,EAAE,EAAE,mBAAmB,EAAE,aAAa,EAAE;AAC5D,aAAa,EAAE,SAAS,CAAC,CAAC;AAC1B,SAAS;AACT;AACA;AACA,QAAQ,OAAOA,2BAA+B,CAAC,eAAe,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;AAC/E,KAAK,CAAC;AACN,IAAI,OAAOD,6BAA2B,CAAC;AACvC;;;;"}

package/dist/esm/utils/createTokenValidator.mjs

@@ -1,3 +1,4 @@
+import { CognitoJwtVerifier } from 'aws-jwt-verify';
 import { isValidCognitoToken } from './isValidCognitoToken.mjs';
 
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
@@ -6,23 +7,36 @@ import { isValidCognitoToken } from './isValidCognitoToken.mjs';
  * Creates a validator object for validating methods in a KeyValueStorage.
  */
 const createTokenValidator = ({ userPoolId, userPoolClientId: clientId, }) => {
+    let idTokenVerifier;
+    let accessTokenVerifier;
     return {
         // validate access, id tokens
         getItem: async (key, value) => {
-            const tokenType = key.includes('.accessToken')
-                ? 'access'
-                : key.includes('.idToken')
-                    ? 'id'
-                    : null;
-            if (!tokenType)
+            const isAccessToken = key.includes('.accessToken');
+            const isIdToken = key.includes('.idToken');
+            if (!isAccessToken && !isIdToken) {
                 return true;
-            if (!userPoolId || !clientId)
+            }
+            if (!userPoolId || !clientId) {
                 return false;
+            }
+            if (isAccessToken && !accessTokenVerifier) {
+                accessTokenVerifier = CognitoJwtVerifier.create({
+                    userPoolId,
+                    tokenUse: 'access',
+                    clientId,
+                });
+            }
+            if (isIdToken && !idTokenVerifier) {
+                idTokenVerifier = CognitoJwtVerifier.create({
+                    userPoolId,
+                    tokenUse: 'id',
+                    clientId,
+                });
+            }
             return isValidCognitoToken({
-                clientId,
-                userPoolId,
-                tokenType,
                 token: value,
+                verifier: isAccessToken ? accessTokenVerifier : idTokenVerifier,
             });
         },
     };

package/dist/esm/utils/createTokenValidator.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"createTokenValidator.mjs","sources":["../../../src/utils/createTokenValidator.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { isValidCognitoToken } from './isValidCognitoToken';\n/**\n * Creates a validator object for validating methods in a KeyValueStorage.\n */\nexport const createTokenValidator = ({ userPoolId, userPoolClientId: clientId, }) => {\n    return {\n        // validate access, id tokens\n        getItem: async (key, value) => {\n            const tokenType = key.includes('.accessToken')\n                ? 'access'\n                : key.includes('.idToken')\n                    ? 'id'\n                    : null;\n            if (!tokenType)\n                return true;\n            if (!userPoolId || !clientId)\n                return false;\n            return isValidCognitoToken({\n                clientId,\n                userPoolId,\n                tokenType,\n                token: value,\n            });\n        },\n    };\n};\n"],"names":[],"mappings":";;AAAA;AACA;AAEA;AACA;AACA;AACY,MAAC,oBAAoB,GAAG,CAAC,EAAE,UAAU,EAAE,gBAAgB,EAAE,QAAQ,GAAG,KAAK;AACrF,IAAI,OAAO;AACX;AACA,QAAQ,OAAO,EAAE,OAAO,GAAG,EAAE,KAAK,KAAK;AACvC,YAAY,MAAM,SAAS,GAAG,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC;AAC1D,kBAAkB,QAAQ;AAC1B,kBAAkB,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC;AAC1C,sBAAsB,IAAI;AAC1B,sBAAsB,IAAI,CAAC;AAC3B,YAAY,IAAI,CAAC,SAAS;AAC1B,gBAAgB,OAAO,IAAI,CAAC;AAC5B,YAAY,IAAI,CAAC,UAAU,IAAI,CAAC,QAAQ;AACxC,gBAAgB,OAAO,KAAK,CAAC;AAC7B,YAAY,OAAO,mBAAmB,CAAC;AACvC,gBAAgB,QAAQ;AACxB,gBAAgB,UAAU;AAC1B,gBAAgB,SAAS;AACzB,gBAAgB,KAAK,EAAE,KAAK;AAC5B,aAAa,CAAC,CAAC;AACf,SAAS;AACT,KAAK,CAAC;AACN;;;;"}
+{"version":3,"file":"createTokenValidator.mjs","sources":["../../../src/utils/createTokenValidator.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { CognitoJwtVerifier } from 'aws-jwt-verify';\nimport { isValidCognitoToken } from './isValidCognitoToken';\n/**\n * Creates a validator object for validating methods in a KeyValueStorage.\n */\nexport const createTokenValidator = ({ userPoolId, userPoolClientId: clientId, }) => {\n    let idTokenVerifier;\n    let accessTokenVerifier;\n    return {\n        // validate access, id tokens\n        getItem: async (key, value) => {\n            const isAccessToken = key.includes('.accessToken');\n            const isIdToken = key.includes('.idToken');\n            if (!isAccessToken && !isIdToken) {\n                return true;\n            }\n            if (!userPoolId || !clientId) {\n                return false;\n            }\n            if (isAccessToken && !accessTokenVerifier) {\n                accessTokenVerifier = CognitoJwtVerifier.create({\n                    userPoolId,\n                    tokenUse: 'access',\n                    clientId,\n                });\n            }\n            if (isIdToken && !idTokenVerifier) {\n                idTokenVerifier = CognitoJwtVerifier.create({\n                    userPoolId,\n                    tokenUse: 'id',\n                    clientId,\n                });\n            }\n            return isValidCognitoToken({\n                token: value,\n                verifier: isAccessToken ? accessTokenVerifier : idTokenVerifier,\n            });\n        },\n    };\n};\n"],"names":[],"mappings":";;;AAAA;AACA;AAGA;AACA;AACA;AACY,MAAC,oBAAoB,GAAG,CAAC,EAAE,UAAU,EAAE,gBAAgB,EAAE,QAAQ,GAAG,KAAK;AACrF,IAAI,IAAI,eAAe,CAAC;AACxB,IAAI,IAAI,mBAAmB,CAAC;AAC5B,IAAI,OAAO;AACX;AACA,QAAQ,OAAO,EAAE,OAAO,GAAG,EAAE,KAAK,KAAK;AACvC,YAAY,MAAM,aAAa,GAAG,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;AAC/D,YAAY,MAAM,SAAS,GAAG,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;AACvD,YAAY,IAAI,CAAC,aAAa,IAAI,CAAC,SAAS,EAAE;AAC9C,gBAAgB,OAAO,IAAI,CAAC;AAC5B,aAAa;AACb,YAAY,IAAI,CAAC,UAAU,IAAI,CAAC,QAAQ,EAAE;AAC1C,gBAAgB,OAAO,KAAK,CAAC;AAC7B,aAAa;AACb,YAAY,IAAI,aAAa,IAAI,CAAC,mBAAmB,EAAE;AACvD,gBAAgB,mBAAmB,GAAG,kBAAkB,CAAC,MAAM,CAAC;AAChE,oBAAoB,UAAU;AAC9B,oBAAoB,QAAQ,EAAE,QAAQ;AACtC,oBAAoB,QAAQ;AAC5B,iBAAiB,CAAC,CAAC;AACnB,aAAa;AACb,YAAY,IAAI,SAAS,IAAI,CAAC,eAAe,EAAE;AAC/C,gBAAgB,eAAe,GAAG,kBAAkB,CAAC,MAAM,CAAC;AAC5D,oBAAoB,UAAU;AAC9B,oBAAoB,QAAQ,EAAE,IAAI;AAClC,oBAAoB,QAAQ;AAC5B,iBAAiB,CAAC,CAAC;AACnB,aAAa;AACb,YAAY,OAAO,mBAAmB,CAAC;AACvC,gBAAgB,KAAK,EAAE,KAAK;AAC5B,gBAAgB,QAAQ,EAAE,aAAa,GAAG,mBAAmB,GAAG,eAAe;AAC/E,aAAa,CAAC,CAAC;AACf,SAAS;AACT,KAAK,CAAC;AACN;;;;"}

package/dist/esm/utils/isValidCognitoToken.d.ts

@@ -1,15 +1,13 @@
+import { JwtVerifier } from '../types';
 /**
  * Verifies a Cognito JWT token for its validity.
  *
  * @param input - An object containing:
  *                - token: The JWT token as a string that needs to be verified.
- *                - userPoolId: The ID of the AWS Cognito User Pool to which the token belongs.
- *                - clientId: The Client ID associated with the Cognito User Pool.
+ *                - verifier: The JWT verifier which will verify the token.
  * @internal
  */
 export declare const isValidCognitoToken: (input: {
     token: string;
-    userPoolId: string;
-    clientId: string;
-    tokenType: 'id' | 'access';
+    verifier: JwtVerifier;
 }) => Promise<boolean>;

package/dist/esm/utils/isValidCognitoToken.mjs

@@ -1,4 +1,3 @@
-import { CognitoJwtVerifier } from 'aws-jwt-verify';
 import { JwtExpiredError } from 'aws-jwt-verify/error';
 
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
@@ -8,18 +7,12 @@ import { JwtExpiredError } from 'aws-jwt-verify/error';
  *
  * @param input - An object containing:
  *                - token: The JWT token as a string that needs to be verified.
- *                - userPoolId: The ID of the AWS Cognito User Pool to which the token belongs.
- *                - clientId: The Client ID associated with the Cognito User Pool.
+ *                - verifier: The JWT verifier which will verify the token.
  * @internal
  */
 const isValidCognitoToken = async (input) => {
-    const { userPoolId, clientId, tokenType, token } = input;
+    const { token, verifier } = input;
     try {
-        const verifier = CognitoJwtVerifier.create({
-            userPoolId,
-            tokenUse: tokenType,
-            clientId,
-        });
         await verifier.verify(token);
         return true;
     }

package/dist/esm/utils/isValidCognitoToken.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"isValidCognitoToken.mjs","sources":["../../../src/utils/isValidCognitoToken.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { CognitoJwtVerifier } from 'aws-jwt-verify';\nimport { JwtExpiredError } from 'aws-jwt-verify/error';\n/**\n * Verifies a Cognito JWT token for its validity.\n *\n * @param input - An object containing:\n *                - token: The JWT token as a string that needs to be verified.\n *                - userPoolId: The ID of the AWS Cognito User Pool to which the token belongs.\n *                - clientId: The Client ID associated with the Cognito User Pool.\n * @internal\n */\nexport const isValidCognitoToken = async (input) => {\n    const { userPoolId, clientId, tokenType, token } = input;\n    try {\n        const verifier = CognitoJwtVerifier.create({\n            userPoolId,\n            tokenUse: tokenType,\n            clientId,\n        });\n        await verifier.verify(token);\n        return true;\n    }\n    catch (error) {\n        // When `JwtExpiredError` is thrown, the token should have valid signature\n        // but expired. So, we can consider it as a valid token.\n        // Reference https://github.com/awslabs/aws-jwt-verify/blob/8d8f714d7281913ecd660147f5c30311479601c1/src/jwt-rsa.ts#L290-L301\n        if (error instanceof JwtExpiredError) {\n            return true;\n        }\n        // TODO (ashwinkumar6): surface invalid cognito token error to customer\n        // TODO: clear invalid tokens from Storage\n        return false;\n    }\n};\n"],"names":[],"mappings":";;;AAAA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACY,MAAC,mBAAmB,GAAG,OAAO,KAAK,KAAK;AACpD,IAAI,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;AAC7D,IAAI,IAAI;AACR,QAAQ,MAAM,QAAQ,GAAG,kBAAkB,CAAC,MAAM,CAAC;AACnD,YAAY,UAAU;AACtB,YAAY,QAAQ,EAAE,SAAS;AAC/B,YAAY,QAAQ;AACpB,SAAS,CAAC,CAAC;AACX,QAAQ,MAAM,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACrC,QAAQ,OAAO,IAAI,CAAC;AACpB,KAAK;AACL,IAAI,OAAO,KAAK,EAAE;AAClB;AACA;AACA;AACA,QAAQ,IAAI,KAAK,YAAY,eAAe,EAAE;AAC9C,YAAY,OAAO,IAAI,CAAC;AACxB,SAAS;AACT;AACA;AACA,QAAQ,OAAO,KAAK,CAAC;AACrB,KAAK;AACL;;;;"}
+{"version":3,"file":"isValidCognitoToken.mjs","sources":["../../../src/utils/isValidCognitoToken.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { JwtExpiredError } from 'aws-jwt-verify/error';\n/**\n * Verifies a Cognito JWT token for its validity.\n *\n * @param input - An object containing:\n *                - token: The JWT token as a string that needs to be verified.\n *                - verifier: The JWT verifier which will verify the token.\n * @internal\n */\nexport const isValidCognitoToken = async (input) => {\n    const { token, verifier } = input;\n    try {\n        await verifier.verify(token);\n        return true;\n    }\n    catch (error) {\n        // When `JwtExpiredError` is thrown, the token should have valid signature\n        // but expired. So, we can consider it as a valid token.\n        // Reference https://github.com/awslabs/aws-jwt-verify/blob/8d8f714d7281913ecd660147f5c30311479601c1/src/jwt-rsa.ts#L290-L301\n        if (error instanceof JwtExpiredError) {\n            return true;\n        }\n        // TODO (ashwinkumar6): surface invalid cognito token error to customer\n        // TODO: clear invalid tokens from Storage\n        return false;\n    }\n};\n"],"names":[],"mappings":";;AAAA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACY,MAAC,mBAAmB,GAAG,OAAO,KAAK,KAAK;AACpD,IAAI,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;AACtC,IAAI,IAAI;AACR,QAAQ,MAAM,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACrC,QAAQ,OAAO,IAAI,CAAC;AACpB,KAAK;AACL,IAAI,OAAO,KAAK,EAAE;AAClB;AACA;AACA;AACA,QAAQ,IAAI,KAAK,YAAY,eAAe,EAAE;AAC9C,YAAY,OAAO,IAAI,CAAC;AACxB,SAAS;AACT;AACA;AACA,QAAQ,OAAO,KAAK,CAAC;AACrB,KAAK;AACL;;;;"}

package/package.json

@@ -1,75 +1,75 @@
 {
-	"author": "Amazon Web Services",
-	"name": "@aws-amplify/adapter-nextjs",
-	"version": "1.3.0",
-	"description": "The adapter for the supporting of using Amplify APIs in Next.js.",
-	"peerDependencies": {
-		"aws-amplify": "^6.0.7",
-		"next": ">=13.5.0 <16.0.0"
-	},
-	"dependencies": {
-		"aws-jwt-verify": "^4.0.1",
-		"cookie": "^0.7.0"
-	},
-	"devDependencies": {
-		"@types/cookie": "^0.5.1",
-		"@types/node": "^20.3.1",
-		"@types/react": "^18.2.13",
-		"@types/react-dom": "^18.2.6",
-		"aws-amplify": "6.10.3",
-		"jest-fetch-mock": "3.0.3",
-		"next": ">= 13.5.0 < 15.0.0",
-		"typescript": "5.0.2"
-	},
-	"publishConfig": {
-		"access": "public"
-	},
-	"bugs": {
-		"url": "https://github.com/aws/aws-amplify/issues"
-	},
-	"exports": {
-		".": {
-			"types": "./dist/esm/index.d.ts",
-			"import": "./dist/esm/index.mjs",
-			"require": "./dist/cjs/index.js"
-		},
-		"./api": {
-			"types": "./dist/esm/api/index.d.ts",
-			"import": "./dist/esm/api/index.mjs",
-			"require": "./dist/cjs/api/index.js"
-		},
-		"./data": {
-			"types": "./dist/esm/api/index.d.ts",
-			"import": "./dist/esm/api/index.mjs",
-			"require": "./dist/cjs/api/index.js"
-		},
-		"./package.json": "./package.json"
-	},
-	"files": [
-		"dist/cjs",
-		"dist/esm",
-		"src",
-		"api",
-		"data"
-	],
-	"homepage": "https://aws-amplify.github.io/",
-	"license": "Apache-2.0",
-	"main": "./dist/cjs/index.js",
-	"module": "./dist/esm/index.mjs",
-	"typings": "./dist/esm/index.d.ts",
-	"sideEffects": false,
-	"scripts": {
-		"build": "npm run clean && npm run build:esm-cjs",
-		"build-with-test": "npm test && npm run build",
-		"build:esm-cjs": "rollup --forceExit -c rollup.config.mjs",
-		"build:watch": "npm run build:esm-cjs -- --watch",
-		"clean": "npm run clean:size && rimraf dist",
-		"clean:size": "rimraf dual-publish-tmp tmp*",
-		"format": "echo \"Not implemented\"",
-		"lint": "eslint '**/*.{ts,tsx}' && npm run ts-coverage",
-		"lint:fix": "eslint '**/*.{ts,tsx}' --fix",
-		"test": "npm run lint && jest -w 1 --coverage --logHeapUsage",
-		"ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 90.31"
-	},
-	"gitHead": "8a8097a71e5adcafb546e98cf0538ccb51ff8fbc"
+  "author": "Amazon Web Services",
+  "name": "@aws-amplify/adapter-nextjs",
+  "version": "1.3.1-graphql-multi-client.93b5136.0+93b5136",
+  "description": "The adapter for the supporting of using Amplify APIs in Next.js.",
+  "peerDependencies": {
+    "aws-amplify": "6.10.4-graphql-multi-client.93b5136.0+93b5136",
+    "next": ">=13.5.0 <16.0.0"
+  },
+  "dependencies": {
+    "aws-jwt-verify": "^4.0.1",
+    "cookie": "^0.7.0"
+  },
+  "devDependencies": {
+    "@types/cookie": "^0.5.1",
+    "@types/node": "^20.3.1",
+    "@types/react": "^18.2.13",
+    "@types/react-dom": "^18.2.6",
+    "aws-amplify": "6.10.4-graphql-multi-client.93b5136.0+93b5136",
+    "jest-fetch-mock": "3.0.3",
+    "next": ">= 13.5.0 < 15.0.0",
+    "typescript": "5.0.2"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "bugs": {
+    "url": "https://github.com/aws/aws-amplify/issues"
+  },
+  "exports": {
+    ".": {
+      "types": "./dist/esm/index.d.ts",
+      "import": "./dist/esm/index.mjs",
+      "require": "./dist/cjs/index.js"
+    },
+    "./api": {
+      "types": "./dist/esm/api/index.d.ts",
+      "import": "./dist/esm/api/index.mjs",
+      "require": "./dist/cjs/api/index.js"
+    },
+    "./data": {
+      "types": "./dist/esm/api/index.d.ts",
+      "import": "./dist/esm/api/index.mjs",
+      "require": "./dist/cjs/api/index.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "dist/cjs",
+    "dist/esm",
+    "src",
+    "api",
+    "data"
+  ],
+  "homepage": "https://aws-amplify.github.io/",
+  "license": "Apache-2.0",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.mjs",
+  "typings": "./dist/esm/index.d.ts",
+  "sideEffects": false,
+  "scripts": {
+    "build": "npm run clean && npm run build:esm-cjs",
+    "build-with-test": "npm test && npm run build",
+    "build:esm-cjs": "rollup --forceExit -c rollup.config.mjs",
+    "build:watch": "npm run build:esm-cjs -- --watch",
+    "clean": "npm run clean:size && rimraf dist",
+    "clean:size": "rimraf dual-publish-tmp tmp*",
+    "format": "echo \"Not implemented\"",
+    "lint": "eslint '**/*.{ts,tsx}' && npm run ts-coverage",
+    "lint:fix": "eslint '**/*.{ts,tsx}' --fix",
+    "test": "npm run lint && jest -w 1 --coverage --logHeapUsage",
+    "ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 90.31"
+  },
+  "gitHead": "93b51360e57e283a7d4ed64c6b701d85ec71e94b"
 }

package/src/api/generateServerClient.ts

@@ -8,13 +8,11 @@ import {
 	getAmplifyServerContext,
 } from '@aws-amplify/core/internals/adapter-core';
 import {
+	CommonPublicClientOptions,
 	V6ClientSSRCookies,
 	V6ClientSSRRequest,
 } from '@aws-amplify/api-graphql';
-import {
-	GraphQLAuthMode,
-	parseAmplifyConfig,
-} from '@aws-amplify/core/internals/utils';
+import { parseAmplifyConfig } from '@aws-amplify/core/internals/utils';
 
 import { NextServer } from '../types';
 
@@ -23,14 +21,10 @@ import { createServerRunnerForAPI } from './createServerRunnerForAPI';
 interface CookiesClientParams {
 	cookies: NextServer.ServerComponentContext['cookies'];
 	config: NextServer.CreateServerRunnerInput['config'];
-	authMode?: GraphQLAuthMode;
-	authToken?: string;
 }
 
 interface ReqClientParams {
 	config: NextServer.CreateServerRunnerInput['config'];
-	authMode?: GraphQLAuthMode;
-	authToken?: string;
 }
 
 /**
@@ -44,13 +38,10 @@ interface ReqClientParams {
  */
 export function generateServerClientUsingCookies<
 	T extends Record<any, any> = never,
->({
-	config,
-	cookies,
-	authMode,
-	authToken,
-}: CookiesClientParams): V6ClientSSRCookies<T> {
-	if (typeof cookies !== 'function') {
+	Options extends CommonPublicClientOptions &
+		CookiesClientParams = CookiesClientParams,
+>(options: Options): V6ClientSSRCookies<T, Options> {
+	if (typeof options.cookies !== 'function') {
 		throw new AmplifyServerContextError({
 			message:
 				'generateServerClientUsingCookies is only compatible with the `cookies` Dynamic Function available in Server Components.',
@@ -61,24 +52,25 @@ export function generateServerClientUsingCookies<
 	}
 
 	const { runWithAmplifyServerContext, resourcesConfig } =
-		createServerRunnerForAPI({ config });
+		createServerRunnerForAPI({ config: options.config });
 
 	// This function reference gets passed down to InternalGraphQLAPI.ts.graphql
 	// where this._graphql is passed in as the `fn` argument
 	// causing it to always get invoked inside `runWithAmplifyServerContext`
 	const getAmplify = (fn: (amplify: any) => Promise<any>) =>
 		runWithAmplifyServerContext({
-			nextServerContext: { cookies },
+			nextServerContext: { cookies: options.cookies },
 			operation: contextSpec =>
 				fn(getAmplifyServerContext(contextSpec).amplify),
 		});
 
-	return generateClientWithAmplifyInstance<T, V6ClientSSRCookies<T>>({
+	const { cookies: _cookies, config: _config, ...params } = options;
+
+	return generateClientWithAmplifyInstance<T, V6ClientSSRCookies<T, Options>>({
 		amplify: getAmplify,
 		config: resourcesConfig,
-		authMode,
-		authToken,
-	});
+		...params,
+	} as any); // TS can't narrow the type here.
 }
 
 /**
@@ -99,12 +91,14 @@ export function generateServerClientUsingCookies<
  */
 export function generateServerClientUsingReqRes<
 	T extends Record<any, any> = never,
->({ config, authMode, authToken }: ReqClientParams): V6ClientSSRRequest<T> {
-	const amplifyConfig = parseAmplifyConfig(config);
+	Options extends CommonPublicClientOptions & ReqClientParams = ReqClientParams,
+>(options: Options): V6ClientSSRRequest<T, Options> {
+	const amplifyConfig = parseAmplifyConfig(options.config);
+
+	const { config: _config, ...params } = options;
 
 	return generateClient<T>({
 		config: amplifyConfig,
-		authMode,
-		authToken,
-	});
+		...params,
+	}) as any;
 }

package/src/createServerRunner.ts

@@ -2,10 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { ResourcesConfig } from 'aws-amplify';
+import { KeyValueStorageMethodValidator } from '@aws-amplify/core/internals/adapter-core';
 import { parseAmplifyConfig } from '@aws-amplify/core/internals/utils';
 
 import { createRunWithAmplifyServerContext } from './utils';
 import { NextServer } from './types';
+import { createTokenValidator } from './utils/createTokenValidator';
 
 /**
  * Creates the `runWithAmplifyServerContext` function to run Amplify server side APIs in an isolated request context.
@@ -30,9 +32,19 @@ export const createServerRunner: NextServer.CreateServerRunner = ({
 }) => {
 	const amplifyConfig = parseAmplifyConfig(config);
 
+	let tokenValidator: KeyValueStorageMethodValidator | undefined;
+	if (amplifyConfig?.Auth) {
+		const { Cognito } = amplifyConfig.Auth;
+		tokenValidator = createTokenValidator({
+			userPoolId: Cognito?.userPoolId,
+			userPoolClientId: Cognito?.userPoolClientId,
+		});
+	}
+
 	return {
 		runWithAmplifyServerContext: createRunWithAmplifyServerContext({
 			config: amplifyConfig,
+			tokenValidator,
 		}),
 	};
 };

package/src/types/index.ts

@@ -1,4 +1,8 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+import { CognitoJwtVerifier } from 'aws-jwt-verify';
+
 export { NextServer } from './NextServer';
+
+export type JwtVerifier = ReturnType<typeof CognitoJwtVerifier.create>;

package/src/utils/createRunWithAmplifyServerContext.ts

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { ResourcesConfig, sharedInMemoryStorage } from '@aws-amplify/core';
+import { KeyValueStorageMethodValidator } from '@aws-amplify/core/internals/adapter-core';
 import {
 	createAWSCredentialsAndIdentityIdProvider,
 	createKeyValueStorageFromCookieStorageAdapter,
@@ -11,13 +12,14 @@ import {
 
 import { NextServer } from '../types';
 
-import { createTokenValidator } from './createTokenValidator';
 import { createCookieStorageAdapterFromNextServerContext } from './createCookieStorageAdapterFromNextServerContext';
 
 export const createRunWithAmplifyServerContext = ({
 	config: resourcesConfig,
+	tokenValidator,
 }: {
 	config: ResourcesConfig;
+	tokenValidator?: KeyValueStorageMethodValidator;
 }) => {
 	const runWithAmplifyServerContext: NextServer.RunOperationWithContext =
 		async ({ nextServerContext, operation }) => {
@@ -35,11 +37,7 @@ export const createRunWithAmplifyServerContext = ({
 								await createCookieStorageAdapterFromNextServerContext(
 									nextServerContext,
 								),
-								createTokenValidator({
-									userPoolId: resourcesConfig?.Auth.Cognito?.userPoolId,
-									userPoolClientId:
-										resourcesConfig?.Auth.Cognito?.userPoolClientId,
-								}),
+								tokenValidator,
 							);
 				const credentialsProvider = createAWSCredentialsAndIdentityIdProvider(
 					resourcesConfig.Auth,

package/src/utils/createTokenValidator.ts

@@ -2,6 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { KeyValueStorageMethodValidator } from '@aws-amplify/core/internals/adapter-core';
+import { CognitoJwtVerifier } from 'aws-jwt-verify';
+
+import { JwtVerifier } from '../types';
 
 import { isValidCognitoToken } from './isValidCognitoToken';
 
@@ -9,6 +12,7 @@ interface CreateTokenValidatorInput {
 	userPoolId?: string;
 	userPoolClientId?: string;
 }
+
 /**
  * Creates a validator object for validating methods in a KeyValueStorage.
  */
@@ -16,23 +20,42 @@ export const createTokenValidator = ({
 	userPoolId,
 	userPoolClientId: clientId,
 }: CreateTokenValidatorInput): KeyValueStorageMethodValidator => {
+	let idTokenVerifier: JwtVerifier;
+	let accessTokenVerifier: JwtVerifier;
+
 	return {
 		// validate access, id tokens
 		getItem: async (key: string, value: string): Promise<boolean> => {
-			const tokenType = key.includes('.accessToken')
-				? 'access'
-				: key.includes('.idToken')
-					? 'id'
-					: null;
-			if (!tokenType) return true;
+			const isAccessToken = key.includes('.accessToken');
+			const isIdToken = key.includes('.idToken');
+
+			if (!isAccessToken && !isIdToken) {
+				return true;
+			}
+
+			if (!userPoolId || !clientId) {
+				return false;
+			}
+
+			if (isAccessToken && !accessTokenVerifier) {
+				accessTokenVerifier = CognitoJwtVerifier.create({
+					userPoolId,
+					tokenUse: 'access',
+					clientId,
+				});
+			}
 
-			if (!userPoolId || !clientId) return false;
+			if (isIdToken && !idTokenVerifier) {
+				idTokenVerifier = CognitoJwtVerifier.create({
+					userPoolId,
+					tokenUse: 'id',
+					clientId,
+				});
+			}
 
 			return isValidCognitoToken({
-				clientId,
-				userPoolId,
-				tokenType,
 				token: value,
+				verifier: isAccessToken ? accessTokenVerifier : idTokenVerifier,
 			});
 		},
 	};

package/src/utils/isValidCognitoToken.ts

@@ -1,32 +1,25 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { CognitoJwtVerifier } from 'aws-jwt-verify';
 import { JwtExpiredError } from 'aws-jwt-verify/error';
 
+import { JwtVerifier } from '../types';
+
 /**
  * Verifies a Cognito JWT token for its validity.
  *
  * @param input - An object containing:
  *                - token: The JWT token as a string that needs to be verified.
- *                - userPoolId: The ID of the AWS Cognito User Pool to which the token belongs.
- *                - clientId: The Client ID associated with the Cognito User Pool.
+ *                - verifier: The JWT verifier which will verify the token.
  * @internal
  */
 export const isValidCognitoToken = async (input: {
 	token: string;
-	userPoolId: string;
-	clientId: string;
-	tokenType: 'id' | 'access';
+	verifier: JwtVerifier;
 }): Promise<boolean> => {
-	const { userPoolId, clientId, tokenType, token } = input;
+	const { token, verifier } = input;
 
 	try {
-		const verifier = CognitoJwtVerifier.create({
-			userPoolId,
-			tokenUse: tokenType,
-			clientId,
-		});
 		await verifier.verify(token);
 
 		return true;