Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(api): expose generateClient from /server subpath #12691

Merged
merged 3 commits into from
Dec 8, 2023
Merged

feat(api): expose generateClient from /server subpath #12691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
322079c
feat(api-graphql): implement server generateClient
HuiSF Dec 8, 2023
6a9848d
feat(api): expose generateClient from /server subpath
HuiSF Dec 8, 2023
54c8184
chore(adapter-nextjs): adapter generateClient exported from api/server
HuiSF Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 6 additions & 32 deletions packages/adapter-nextjs/src/api/generateServerClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,21 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

import { generateServerClient } from '@aws-amplify/api/internals';
import { generateClientWithAmplifyInstance } from '@aws-amplify/api/internals';
import { generateClient } from 'aws-amplify/api/server';
import {
getAmplifyServerContext,
AmplifyServerContextError,
AmplifyServer,
} from '@aws-amplify/core/internals/adapter-core';
import {
V6ClientSSRRequest,
V6ClientSSRCookies,
GraphQLMethod,
GraphQLMethodSSR,
__amplify,
GraphQLOptionsV6,
} from '@aws-amplify/api-graphql';
import { NextServer } from '../types';
import { createServerRunnerForAPI } from './createServerRunnerForAPI';
import { getAmplifyConfig } from '../utils';
import { GraphQLAuthMode } from '@aws-amplify/core/internals/utils';
import { CustomHeaders } from '@aws-amplify/data-schema-types';

type CookiesClientParams = {
cookies: NextServer.ServerComponentContext['cookies'];
Expand Down Expand Up @@ -74,7 +70,7 @@ export function generateServerClientUsingCookies<
fn(getAmplifyServerContext(contextSpec).amplify),
});

return generateServerClient<T, V6ClientSSRCookies<T>>({
return generateClientWithAmplifyInstance<T, V6ClientSSRCookies<T>>({
amplify: getAmplify,
config: resourcesConfig,
authMode,
Expand All @@ -89,9 +85,9 @@ export function generateServerClientUsingCookies<
* import config from './amplifyconfiguration.json';
* import { listPosts } from './graphql/queries';
*
* const client = generateServerClientUsingReqRes();
* const client = generateServerClientUsingReqRes({ config });
*
* result = await runWithAmplifyServerContext({
* const result = await runWithAmplifyServerContext({
* nextServerContext: { request, response },
* operation: (contextSpec) => client.graphql(contextSpec, {
* query: listPosts,
Expand All @@ -102,31 +98,9 @@ export function generateServerClientUsingReqRes<
T extends Record<any, any> = never,
>({ config, authMode, authToken }: ReqClientParams): V6ClientSSRRequest<T> {
const amplifyConfig = getAmplifyConfig(config);
// passing `null` instance because each (future model) method must retrieve a valid instance
// from server context
const client = generateServerClient<T, V6ClientSSRRequest<T>>({
amplify: null,
return generateClient<T>({
config: amplifyConfig,
authMode,
authToken,
});

// TODO: improve this and the next type
const prevGraphql = client.graphql as unknown as GraphQLMethod;

const wrappedGraphql = (
contextSpec: AmplifyServer.ContextSpec,
options: GraphQLOptionsV6,
additionalHeaders?: CustomHeaders
) => {
const amplifyInstance = getAmplifyServerContext(contextSpec).amplify;
return prevGraphql.call(
{ [__amplify]: amplifyInstance },
options,
additionalHeaders as any
);
};

client.graphql = wrappedGraphql as unknown as GraphQLMethodSSR;
return client;
}
Loading
Loading