@aws-amplify/adapter-nextjs 1.0.1-api-v6-models.e8fc3ba.0 → 1.0.1-api-v6-models.33ce626.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/lib/api/generateServerClient.d.ts +15 -2
  2. package/lib/api/generateServerClient.js +6 -2
  3. package/lib/api/generateServerClient.js.map +1 -1
  4. package/lib-esm/api/generateServerClient.d.ts +15 -2
  5. package/lib-esm/api/generateServerClient.js +6 -2
  6. package/lib-esm/api/generateServerClient.js.map +1 -1
  7. package/package.json +4 -4
  8. package/src/api/generateServerClient.ts +22 -3
package/lib/api/generateServerClient.d.ts CHANGED
@@ -1,5 +1,17 @@
1
1
  import { V6ClientSSRRequest, V6ClientSSRCookies } from '@aws-amplify/api-graphql';
2
2
  import { NextServer } from '../types';
3
+ import { GraphQLAuthMode } from '@aws-amplify/core/internals/utils';
4
+ type CookiesClientParams = {
5
+ cookies: NextServer.ServerComponentContext['cookies'];
6
+ config: NextServer.CreateServerRunnerInput['config'];
7
+ authMode?: GraphQLAuthMode;
8
+ authToken?: string;
9
+ };
10
+ type ReqClientParams = {
11
+ config: NextServer.CreateServerRunnerInput['config'];
12
+ authMode?: GraphQLAuthMode;
13
+ authToken?: string;
14
+ };
3
15
  /**
4
16
  * Generates an API client that can be used inside a Next.js Server Component with Dynamic Rendering
5
17
  *
@@ -9,7 +21,7 @@ import { NextServer } from '../types';
9
21
  * const client = generateServerClientUsingCookies({ cookies });
10
22
  * const result = await client.graphql({ query: listPosts });
11
23
  */
12
- export declare function generateServerClientUsingCookies<T extends Record<any, any> = never>({ config, cookies, }: NextServer.ServerComponentContext & NextServer.CreateServerRunnerInput): V6ClientSSRCookies<T>;
24
+ export declare function generateServerClientUsingCookies<T extends Record<any, any> = never>({ config, cookies, authMode, authToken, }: CookiesClientParams): V6ClientSSRCookies<T>;
13
25
  /**
14
26
  * Generates an API client that can be used with both Pages Router and App Router
15
27
  *
@@ -26,4 +38,5 @@ export declare function generateServerClientUsingCookies<T extends Record<any, a
26
38
  * }),
27
39
  * });
28
40
  */
29
- export declare function generateServerClientUsingReqRes<T extends Record<any, any> = never>({ config }: NextServer.CreateServerRunnerInput): V6ClientSSRRequest<T>;
41
+ export declare function generateServerClientUsingReqRes<T extends Record<any, any> = never>({ config, authMode, authToken }: ReqClientParams): V6ClientSSRRequest<T>;
42
+ export {};
package/lib/api/generateServerClient.js CHANGED
@@ -17,7 +17,7 @@ const utils_1 = require("../utils");
17
17
  * const client = generateServerClientUsingCookies({ cookies });
18
18
  * const result = await client.graphql({ query: listPosts });
19
19
  */
20
- function generateServerClientUsingCookies({ config, cookies, }) {
20
+ function generateServerClientUsingCookies({ config, cookies, authMode, authToken, }) {
21
21
  if (typeof cookies !== 'function') {
22
22
  throw new adapter_core_1.AmplifyServerContextError({
23
23
  message: 'generateServerClientUsingCookies is only compatible with the `cookies` Dynamic Function available in Server Components.',
@@ -36,6 +36,8 @@ function generateServerClientUsingCookies({ config, cookies, }) {
36
36
  return (0, internals_1.generateServerClient)({
37
37
  amplify: getAmplify,
38
38
  config: resourcesConfig,
39
+ authMode,
40
+ authToken,
39
41
  });
40
42
  }
41
43
  exports.generateServerClientUsingCookies = generateServerClientUsingCookies;
@@ -55,13 +57,15 @@ exports.generateServerClientUsingCookies = generateServerClientUsingCookies;
55
57
  * }),
56
58
  * });
57
59
  */
58
- function generateServerClientUsingReqRes({ config }) {
60
+ function generateServerClientUsingReqRes({ config, authMode, authToken }) {
59
61
  const amplifyConfig = (0, utils_1.getAmplifyConfig)(config);
60
62
  // passing `null` instance because each (future model) method must retrieve a valid instance
61
63
  // from server context
62
64
  const client = (0, internals_1.generateServerClient)({
63
65
  amplify: null,
64
66
  config: amplifyConfig,
67
+ authMode,
68
+ authToken,
65
69
  });
66
70
  // TODO: improve this and the next type
67
71
  const prevGraphql = client.graphql;
package/lib/api/generateServerClient.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generateServerClient.js","sourceRoot":"","sources":["../../src/api/generateServerClient.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,sCAAsC;;;AAEtC,0DAAkE;AAClE,2EAGkD;AAClD,0DAMkC;AAElC,yEAAsE;AACtE,oCAA4C;AAE5C;;;;;;;;GAQG;AACH,SAAgB,gCAAgC,CAE9C,EACD,MAAM,EACN,OAAO,GAE2B;IAClC,IAAI,OAAO,OAAO,KAAK,UAAU,EAAE;QAClC,MAAM,IAAI,wCAAyB,CAAC;YACnC,OAAO,EACN,yHAAyH;YAC1H,qBAAqB;YACrB,kBAAkB,EACjB,+FAA+F;SAChG,CAAC,CAAC;KACH;IAED,MAAM,EAAE,2BAA2B,EAAE,eAAe,EAAE,GACrD,IAAA,mDAAwB,EAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAEtC,4EAA4E;IAC5E,wDAAwD;IACxD,wEAAwE;IACxE,MAAM,UAAU,GAAG,CAAC,EAAkC,EAAE,EAAE,CACzD,2BAA2B,CAAC;QAC3B,iBAAiB,EAAE,EAAE,OAAO,EAAE;QAC9B,SAAS,EAAE,WAAW,CAAC,EAAE,CACxB,EAAE,CAAC,IAAA,sCAAuB,EAAC,WAAW,CAAC,CAAC,OAAO,CAAC;KACjD,CAAC,CAAC;IAEJ,OAAO,IAAA,gCAAoB,EAA2B;QACrD,OAAO,EAAE,UAAU;QACnB,MAAM,EAAE,eAAe;KACvB,CAAC,CAAC;AACJ,CAAC;AAlCD,4EAkCC;AAED;;;;;;;;;;;;;;;GAeG;AACH,SAAgB,+BAA+B,CAE7C,EAAE,MAAM,EAAsC;IAC/C,MAAM,aAAa,GAAG,IAAA,wBAAgB,EAAC,MAAM,CAAC,CAAC;IAC/C,4FAA4F;IAC5F,sBAAsB;IACtB,MAAM,MAAM,GAAG,IAAA,gCAAoB,EAA2B;QAC7D,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,aAAa;KACrB,CAAC,CAAC;IAEH,uCAAuC;IACvC,MAAM,WAAW,GAAG,MAAM,CAAC,OAAmC,CAAC;IAE/D,MAAM,cAAc,GAAG,CAAC,WAAW,EAAE,OAAO,EAAE,iBAAkB,EAAE,EAAE;QACnE,MAAM,eAAe,GAAG,IAAA,sCAAuB,EAAC,WAAW,CAAC,CAAC,OAAO,CAAC;QACrE,OAAO,WAAW,CAAC,IAAI,CACtB,EAAE,CAAC,uBAAS,CAAC,EAAE,eAAe,EAAE,EAChC,OAAO,EACP,iBAAwB,CACxB,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,CAAC,OAAO,GAAG,cAA6C,CAAC;IAC/D,OAAO,MAAM,CAAC;AACf,CAAC;AAzBD,0EAyBC"}
1
+ {"version":3,"file":"generateServerClient.js","sourceRoot":"","sources":["../../src/api/generateServerClient.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,sCAAsC;;;AAEtC,0DAAkE;AAClE,2EAGkD;AAClD,0DAMkC;AAElC,yEAAsE;AACtE,oCAA4C;AAgB5C;;;;;;;;GAQG;AACH,SAAgB,gCAAgC,CAE9C,EACD,MAAM,EACN,OAAO,EACP,QAAQ,EACR,SAAS,GACY;IACrB,IAAI,OAAO,OAAO,KAAK,UAAU,EAAE;QAClC,MAAM,IAAI,wCAAyB,CAAC;YACnC,OAAO,EACN,yHAAyH;YAC1H,qBAAqB;YACrB,kBAAkB,EACjB,+FAA+F;SAChG,CAAC,CAAC;KACH;IAED,MAAM,EAAE,2BAA2B,EAAE,eAAe,EAAE,GACrD,IAAA,mDAAwB,EAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAEtC,4EAA4E;IAC5E,wDAAwD;IACxD,wEAAwE;IACxE,MAAM,UAAU,GAAG,CAAC,EAAkC,EAAE,EAAE,CACzD,2BAA2B,CAAC;QAC3B,iBAAiB,EAAE,EAAE,OAAO,EAAE;QAC9B,SAAS,EAAE,WAAW,CAAC,EAAE,CACxB,EAAE,CAAC,IAAA,sCAAuB,EAAC,WAAW,CAAC,CAAC,OAAO,CAAC;KACjD,CAAC,CAAC;IAEJ,OAAO,IAAA,gCAAoB,EAA2B;QACrD,OAAO,EAAE,UAAU;QACnB,MAAM,EAAE,eAAe;QACvB,QAAQ;QACR,SAAS;KACT,CAAC,CAAC;AACJ,CAAC;AArCD,4EAqCC;AAED;;;;;;;;;;;;;;;GAeG;AACH,SAAgB,+BAA+B,CAE7C,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAmB;IACjD,MAAM,aAAa,GAAG,IAAA,wBAAgB,EAAC,MAAM,CAAC,CAAC;IAC/C,4FAA4F;IAC5F,sBAAsB;IACtB,MAAM,MAAM,GAAG,IAAA,gCAAoB,EAA2B;QAC7D,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,aAAa;QACrB,QAAQ;QACR,SAAS;KACT,CAAC,CAAC;IAEH,uCAAuC;IACvC,MAAM,WAAW,GAAG,MAAM,CAAC,OAAmC,CAAC;IAE/D,MAAM,cAAc,GAAG,CAAC,WAAW,EAAE,OAAO,EAAE,iBAAkB,EAAE,EAAE;QACnE,MAAM,eAAe,GAAG,IAAA,sCAAuB,EAAC,WAAW,CAAC,CAAC,OAAO,CAAC;QACrE,OAAO,WAAW,CAAC,IAAI,CACtB,EAAE,CAAC,uBAAS,CAAC,EAAE,eAAe,EAAE,EAChC,OAAO,EACP,iBAAwB,CACxB,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,CAAC,OAAO,GAAG,cAA6C,CAAC;IAC/D,OAAO,MAAM,CAAC;AACf,CAAC;AA3BD,0EA2BC"}
package/lib-esm/api/generateServerClient.d.ts CHANGED
@@ -1,5 +1,17 @@
1
1
  import { V6ClientSSRRequest, V6ClientSSRCookies } from '@aws-amplify/api-graphql';
2
2
  import { NextServer } from '../types';
3
+ import { GraphQLAuthMode } from '@aws-amplify/core/internals/utils';
4
+ type CookiesClientParams = {
5
+ cookies: NextServer.ServerComponentContext['cookies'];
6
+ config: NextServer.CreateServerRunnerInput['config'];
7
+ authMode?: GraphQLAuthMode;
8
+ authToken?: string;
9
+ };
10
+ type ReqClientParams = {
11
+ config: NextServer.CreateServerRunnerInput['config'];
12
+ authMode?: GraphQLAuthMode;
13
+ authToken?: string;
14
+ };
3
15
  /**
4
16
  * Generates an API client that can be used inside a Next.js Server Component with Dynamic Rendering
5
17
  *
@@ -9,7 +21,7 @@ import { NextServer } from '../types';
9
21
  * const client = generateServerClientUsingCookies({ cookies });
10
22
  * const result = await client.graphql({ query: listPosts });
11
23
  */
12
- export declare function generateServerClientUsingCookies<T extends Record<any, any> = never>({ config, cookies, }: NextServer.ServerComponentContext & NextServer.CreateServerRunnerInput): V6ClientSSRCookies<T>;
24
+ export declare function generateServerClientUsingCookies<T extends Record<any, any> = never>({ config, cookies, authMode, authToken, }: CookiesClientParams): V6ClientSSRCookies<T>;
13
25
  /**
14
26
  * Generates an API client that can be used with both Pages Router and App Router
15
27
  *
@@ -26,4 +38,5 @@ export declare function generateServerClientUsingCookies<T extends Record<any, a
26
38
  * }),
27
39
  * });
28
40
  */
29
- export declare function generateServerClientUsingReqRes<T extends Record<any, any> = never>({ config }: NextServer.CreateServerRunnerInput): V6ClientSSRRequest<T>;
41
+ export declare function generateServerClientUsingReqRes<T extends Record<any, any> = never>({ config, authMode, authToken }: ReqClientParams): V6ClientSSRRequest<T>;
42
+ export {};
package/lib-esm/api/generateServerClient.js CHANGED
@@ -14,7 +14,7 @@ import { getAmplifyConfig } from '../utils';
14
14
  * const client = generateServerClientUsingCookies({ cookies });
15
15
  * const result = await client.graphql({ query: listPosts });
16
16
  */
17
- export function generateServerClientUsingCookies({ config, cookies, }) {
17
+ export function generateServerClientUsingCookies({ config, cookies, authMode, authToken, }) {
18
18
  if (typeof cookies !== 'function') {
19
19
  throw new AmplifyServerContextError({
20
20
  message: 'generateServerClientUsingCookies is only compatible with the `cookies` Dynamic Function available in Server Components.',
@@ -33,6 +33,8 @@ export function generateServerClientUsingCookies({ config, cookies, }) {
33
33
  return generateServerClient({
34
34
  amplify: getAmplify,
35
35
  config: resourcesConfig,
36
+ authMode,
37
+ authToken,
36
38
  });
37
39
  }
38
40
  /**
@@ -51,13 +53,15 @@ export function generateServerClientUsingCookies({ config, cookies, }) {
51
53
  * }),
52
54
  * });
53
55
  */
54
- export function generateServerClientUsingReqRes({ config }) {
56
+ export function generateServerClientUsingReqRes({ config, authMode, authToken }) {
55
57
  const amplifyConfig = getAmplifyConfig(config);
56
58
  // passing `null` instance because each (future model) method must retrieve a valid instance
57
59
  // from server context
58
60
  const client = generateServerClient({
59
61
  amplify: null,
60
62
  config: amplifyConfig,
63
+ authMode,
64
+ authToken,
61
65
  });
62
66
  // TODO: improve this and the next type
63
67
  const prevGraphql = client.graphql;
package/lib-esm/api/generateServerClient.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generateServerClient.js","sourceRoot":"","sources":["../../src/api/generateServerClient.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,sCAAsC;AAEtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EACN,uBAAuB,EACvB,yBAAyB,GACzB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAKN,SAAS,GACT,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C;;;;;;;;GAQG;AACH,MAAM,UAAU,gCAAgC,CAE9C,EACD,MAAM,EACN,OAAO,GAE2B;IAClC,IAAI,OAAO,OAAO,KAAK,UAAU,EAAE;QAClC,MAAM,IAAI,yBAAyB,CAAC;YACnC,OAAO,EACN,yHAAyH;YAC1H,qBAAqB;YACrB,kBAAkB,EACjB,+FAA+F;SAChG,CAAC,CAAC;KACH;IAED,MAAM,EAAE,2BAA2B,EAAE,eAAe,EAAE,GACrD,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAEtC,4EAA4E;IAC5E,wDAAwD;IACxD,wEAAwE;IACxE,MAAM,UAAU,GAAG,CAAC,EAAkC,EAAE,EAAE,CACzD,2BAA2B,CAAC;QAC3B,iBAAiB,EAAE,EAAE,OAAO,EAAE;QAC9B,SAAS,EAAE,WAAW,CAAC,EAAE,CACxB,EAAE,CAAC,uBAAuB,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC;KACjD,CAAC,CAAC;IAEJ,OAAO,oBAAoB,CAA2B;QACrD,OAAO,EAAE,UAAU;QACnB,MAAM,EAAE,eAAe;KACvB,CAAC,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,+BAA+B,CAE7C,EAAE,MAAM,EAAsC;IAC/C,MAAM,aAAa,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAC/C,4FAA4F;IAC5F,sBAAsB;IACtB,MAAM,MAAM,GAAG,oBAAoB,CAA2B;QAC7D,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,aAAa;KACrB,CAAC,CAAC;IAEH,uCAAuC;IACvC,MAAM,WAAW,GAAG,MAAM,CAAC,OAAmC,CAAC;IAE/D,MAAM,cAAc,GAAG,CAAC,WAAW,EAAE,OAAO,EAAE,iBAAkB,EAAE,EAAE;QACnE,MAAM,eAAe,GAAG,uBAAuB,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC;QACrE,OAAO,WAAW,CAAC,IAAI,CACtB,EAAE,CAAC,SAAS,CAAC,EAAE,eAAe,EAAE,EAChC,OAAO,EACP,iBAAwB,CACxB,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,CAAC,OAAO,GAAG,cAA6C,CAAC;IAC/D,OAAO,MAAM,CAAC;AACf,CAAC"}
1
+ {"version":3,"file":"generateServerClient.js","sourceRoot":"","sources":["../../src/api/generateServerClient.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,sCAAsC;AAEtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EACN,uBAAuB,EACvB,yBAAyB,GACzB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAKN,SAAS,GACT,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAgB5C;;;;;;;;GAQG;AACH,MAAM,UAAU,gCAAgC,CAE9C,EACD,MAAM,EACN,OAAO,EACP,QAAQ,EACR,SAAS,GACY;IACrB,IAAI,OAAO,OAAO,KAAK,UAAU,EAAE;QAClC,MAAM,IAAI,yBAAyB,CAAC;YACnC,OAAO,EACN,yHAAyH;YAC1H,qBAAqB;YACrB,kBAAkB,EACjB,+FAA+F;SAChG,CAAC,CAAC;KACH;IAED,MAAM,EAAE,2BAA2B,EAAE,eAAe,EAAE,GACrD,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAEtC,4EAA4E;IAC5E,wDAAwD;IACxD,wEAAwE;IACxE,MAAM,UAAU,GAAG,CAAC,EAAkC,EAAE,EAAE,CACzD,2BAA2B,CAAC;QAC3B,iBAAiB,EAAE,EAAE,OAAO,EAAE;QAC9B,SAAS,EAAE,WAAW,CAAC,EAAE,CACxB,EAAE,CAAC,uBAAuB,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC;KACjD,CAAC,CAAC;IAEJ,OAAO,oBAAoB,CAA2B;QACrD,OAAO,EAAE,UAAU;QACnB,MAAM,EAAE,eAAe;QACvB,QAAQ;QACR,SAAS;KACT,CAAC,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,+BAA+B,CAE7C,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAmB;IACjD,MAAM,aAAa,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAC/C,4FAA4F;IAC5F,sBAAsB;IACtB,MAAM,MAAM,GAAG,oBAAoB,CAA2B;QAC7D,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,aAAa;QACrB,QAAQ;QACR,SAAS;KACT,CAAC,CAAC;IAEH,uCAAuC;IACvC,MAAM,WAAW,GAAG,MAAM,CAAC,OAAmC,CAAC;IAE/D,MAAM,cAAc,GAAG,CAAC,WAAW,EAAE,OAAO,EAAE,iBAAkB,EAAE,EAAE;QACnE,MAAM,eAAe,GAAG,uBAAuB,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC;QACrE,OAAO,WAAW,CAAC,IAAI,CACtB,EAAE,CAAC,SAAS,CAAC,EAAE,eAAe,EAAE,EAChC,OAAO,EACP,iBAAwB,CACxB,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,CAAC,OAAO,GAAG,cAA6C,CAAC;IAC/D,OAAO,MAAM,CAAC;AACf,CAAC"}
package/package.json CHANGED
@@ -3,7 +3,7 @@
3
3
  "name": "@aws-amplify/adapter-nextjs",
4
4
  "description": "The adapter for the supporting of using Amplify APIs in Next.js.",
5
5
  "peerDependencies": {
6
- "aws-amplify": "6.0.1-api-v6-models.e8fc3ba.0+e8fc3ba",
6
+ "aws-amplify": "6.0.1-api-v6-models.33ce626.0+33ce626",
7
7
  "next": ">=13.4.0 <15.0.0"
8
8
  },
9
9
  "dependencies": {
@@ -15,7 +15,7 @@
15
15
  "@types/node": "^20.3.1",
16
16
  "@types/react": "^18.2.13",
17
17
  "@types/react-dom": "^18.2.6",
18
- "aws-amplify": "6.0.1-api-v6-models.e8fc3ba.0+e8fc3ba",
18
+ "aws-amplify": "6.0.1-api-v6-models.33ce626.0+33ce626",
19
19
  "jest-fetch-mock": "3.0.3",
20
20
  "next": ">= 13.4.0 < 15.0.0",
21
21
  "typescript": "5.1.6"
@@ -121,6 +121,6 @@
121
121
  "ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 90.31"
122
122
  },
123
123
  "typings": "./lib-esm/index.d.ts",
124
- "version": "1.0.1-api-v6-models.e8fc3ba.0+e8fc3ba",
125
- "gitHead": "e8fc3ba880c70b8ba4f2ccdfb1d99ed7268a5d29"
124
+ "version": "1.0.1-api-v6-models.33ce626.0+33ce626",
125
+ "gitHead": "33ce6269be319b0f85634634c4e2568c13ed38f9"
126
126
  }
package/src/api/generateServerClient.ts CHANGED
@@ -16,6 +16,20 @@ import {
16
16
  import { NextServer } from '../types';
17
17
  import { createServerRunnerForAPI } from './createServerRunnerForAPI';
18
18
  import { getAmplifyConfig } from '../utils';
19
+ import { GraphQLAuthMode } from '@aws-amplify/core/internals/utils';
20
+
21
+ type CookiesClientParams = {
22
+ cookies: NextServer.ServerComponentContext['cookies'];
23
+ config: NextServer.CreateServerRunnerInput['config'];
24
+ authMode?: GraphQLAuthMode;
25
+ authToken?: string;
26
+ };
27
+
28
+ type ReqClientParams = {
29
+ config: NextServer.CreateServerRunnerInput['config'];
30
+ authMode?: GraphQLAuthMode;
31
+ authToken?: string;
32
+ };
19
33
 
20
34
  /**
21
35
  * Generates an API client that can be used inside a Next.js Server Component with Dynamic Rendering
@@ -31,8 +45,9 @@ export function generateServerClientUsingCookies<
31
45
  >({
32
46
  config,
33
47
  cookies,
34
- }: NextServer.ServerComponentContext &
35
- NextServer.CreateServerRunnerInput): V6ClientSSRCookies<T> {
48
+ authMode,
49
+ authToken,
50
+ }: CookiesClientParams): V6ClientSSRCookies<T> {
36
51
  if (typeof cookies !== 'function') {
37
52
  throw new AmplifyServerContextError({
38
53
  message:
@@ -59,6 +74,8 @@ export function generateServerClientUsingCookies<
59
74
  return generateServerClient<T, V6ClientSSRCookies<T>>({
60
75
  amplify: getAmplify,
61
76
  config: resourcesConfig,
77
+ authMode,
78
+ authToken,
62
79
  });
63
80
  }
64
81
 
@@ -80,13 +97,15 @@ export function generateServerClientUsingCookies<
80
97
  */
81
98
  export function generateServerClientUsingReqRes<
82
99
  T extends Record<any, any> = never
83
- >({ config }: NextServer.CreateServerRunnerInput): V6ClientSSRRequest<T> {
100
+ >({ config, authMode, authToken }: ReqClientParams): V6ClientSSRRequest<T> {
84
101
  const amplifyConfig = getAmplifyConfig(config);
85
102
  // passing `null` instance because each (future model) method must retrieve a valid instance
86
103
  // from server context
87
104
  const client = generateServerClient<T, V6ClientSSRRequest<T>>({
88
105
  amplify: null,
89
106
  config: amplifyConfig,
107
+ authMode,
108
+ authToken,
90
109
  });
91
110
 
92
111
  // TODO: improve this and the next type