feat(apollo): update header to more flexible

vuestorefront-community · Oct 22, 2023 · 7eba38e · 7eba38e
1 parent 10d86db
commit 7eba38e
Show file tree

Hide file tree

Showing 9 changed files with 84 additions and 52 deletions.
diff --git a/packages/sdk-api-client/src/setup/clientSetup.ts b/packages/sdk-api-client/src/setup/clientSetup.ts
@@ -18,17 +18,12 @@ const buildClient = (settings: MiddlewareConfig) => {
  }
  });
 
-
  const httpLink = createHttpLink({
  uri: settings.odooGraphqlUrl,
  credentials: 'include',
  fetch,
  fetchOptions: settings.fetchOptions,
- headers: {
- Cookie: `session_id=${settings.sessionAuth}`, 
- 'resquest-host': settings.requestHost,
- 'REAL-IP': settings.realIp
- }
+ headers: settings.headers
  });
 
  const afterwareLink = new ApolloLink((operation, forward) => {

diff --git a/packages/sdk-api-client/src/types/config/index.ts b/packages/sdk-api-client/src/types/config/index.ts
@@ -6,9 +6,7 @@ import { DocumentNode } from '@apollo/client';
 export interface MiddlewareConfig {
  odooGraphqlUrl: string;
  fetchOptions?: any;
- sessionAuth?: string,
- requestHost?: string,
- realIp?: string,
+ headers?: Record<string, string>
  queries?: Record<string, DocumentNode>
 
 }
diff --git a/packages/sdk/src/connector.ts b/packages/sdk/src/connector.ts
@@ -11,6 +11,7 @@ type Methods = typeof methods;
  * Initialize the Odoo connector.
  */
 export const odooConnector = (options: Options): Methods => {
+
  client.defaults.baseURL = options.apiUrl
 
  return methods;

diff --git a/packages/sdk/src/index.ts b/packages/sdk/src/index.ts
@@ -1,28 +1,55 @@
-import { odooConnector } from './connector';
-import type { Options } from './types';
+import { ApolloQueryResult, FetchResult } from '@apollo/client';
+import { MutationMetadataParams, QueryMetadataParams } from '@erpgap/odoo-sdk-api-client';
 import type { Module } from '@vue-storefront/sdk';
-
-/**
- * Boulerplate module type.
- */
+import type { Options } from './types';
 export interface OdooModuleType extends Module {
-
- /**
- * The connector of the Odoo module.
- */
  connector: ReturnType<typeof odooConnector>;
 }
 
-/**
- * Odoo module.
- */
-export const OdooModule = (options: Options): OdooModuleType => ({
- connector: odooConnector({
- apiUrl: options.apiUrl
- }),
- utils: {},
- subscribers: {}
-});
+export const OdooModule = (options: Options): OdooModuleType => {
+
+ const mutation = async<ApiParams, ApiResponseType>(metadata: MutationMetadataParams, params?: ApiParams): Promise<FetchResult<ApiResponseType>> => {
+ const { data } = await options.fetch.post<FetchResult<ApiResponseType>>('mutation', [metadata, params]);
+
+ return data;
+ }
+
+ const query = async <ApiParams, ApiResponseType>(metadata: QueryMetadataParams, params?: ApiParams): Promise<ApolloQueryResult<ApiResponseType>> => {
+ const { data } = await options.fetch.post<ApolloQueryResult<ApiResponseType>>('query', [metadata, params]);
+
+ return data;
+ }
+
+ return { 
+ connector: odooConnector({
+ apiUrl: options.apiUrl
+ }),
+ utils: {},
+ subscribers: {}
+ }
+};
+
+
+const mutation = async<ApiParams, ApiResponseType>(metadata: MutationMetadataParams, params?: ApiParams): Promise<FetchResult<ApiResponseType>> => {
+ const { data } = await client.post<FetchResult<ApiResponseType>>('mutation', [metadata, params]);
+
+ return data;
+}
+
+const query = async <ApiParams, ApiResponseType>(metadata: QueryMetadataParams, params?: ApiParams): Promise<ApolloQueryResult<ApiResponseType>> => {
+ const { data } = await client.post<ApolloQueryResult<ApiResponseType>>('query', [metadata, params]);
+
+ return data;
+}
+
+const odooConnector = (options: Options) => {
+ client.defaults.baseURL = options.apiUrl
+
+ return { mutation, query };
+};
+
+
+
 
 export { client } from './client';
 

diff --git a/packages/sdk/src/methods/mutation/index.ts b/packages/sdk/src/methods/mutation/index.ts
@@ -1,7 +1,7 @@
 import { FetchResult } from '@apollo/client';
 import { MutationMetadataParams } from '@erpgap/odoo-sdk-api-client';
-import { client } from '../../client';
- 
+import { client } from '../../index';
+
 /**
  * Make the query
  *

diff --git a/packages/sdk/src/types/options.ts b/packages/sdk/src/types/options.ts
@@ -6,4 +6,5 @@ export interface Options {
  * The API URL of the client-side environment.
  */
  apiUrl: string;
+ fetch?: any;
 }
diff --git a/playground-nuxt/app/pages/index.vue b/playground-nuxt/app/pages/index.vue
@@ -5,18 +5,22 @@ import { MutationName } from '~/server/mutations';
 
 const { $sdk } = useNuxtApp();
 
-const go = async () => {
- const { data } = await $sdk().odoo.mutation<MutationLoginArgs, LoginMutationResponse>({ mutationName: MutationName.LoginMutation }, {
- email: "ergap@odoo.com",
- password: "123"
- });
+// await useFetch('/api/odoo/mutation', {
+// method: 'POST',
+// body: [
+// { mutationName: MutationName.LoginMutation }, {
+// email: "ergap@odoo.com",
+// password: "123"
+// }
+// ]
+// })
+const { data } = await $sdk().odoo.mutation<MutationLoginArgs, LoginMutationResponse>({ mutationName: MutationName.LoginMutation }, {
+ email: "ergap@odoo.com",
+ password: "123"
+});
+
+const { data: asa } = await $sdk().odoo.query<QueryProductVariantArgs, ProductVariantQueryResponse>({ queryName: QueryName.LoadUserQuery }, {});
 
- console.log(data?.login);
-
- const { data: asa } = await $sdk().odoo.query<QueryProductVariantArgs, ProductVariantQueryResponse>({ queryName: QueryName.LoadUserQuery }, {});
-
- console.log(asa.productVariant.displayName);
-};
 
 
 </script>

diff --git a/playground-nuxt/app/plugins/3.sdk.ts b/playground-nuxt/app/plugins/3.sdk.ts
@@ -1,9 +1,9 @@
 import { initSDK, buildModule } from '@vue-storefront/sdk';
-import { OdooModule, OdooModuleType } from '@erpgap/odoo-sdk'; 
+import { OdooModule, OdooModuleType } from '../../../packages/sdk/src'; 
 
 export default defineNuxtPlugin(async (nuxtApp) => {
  const config = useRuntimeConfig();
-
+ 
  const sdkConfig = {
  odoo: buildModule<OdooModuleType>(OdooModule, {
  apiUrl: `${config.public.middlewareUrl}api/odoo/`

diff --git a/playground-nuxt/app/server/middleware/apolloClient.ts b/playground-nuxt/app/server/middleware/apolloClient.ts
@@ -5,14 +5,20 @@ import { Mutations } from '~/server/mutations';
 
 export default defineEventHandler((event) => {
 
- const config : MiddlewareConfig = {
- odooGraphqlUrl: `${process.env.ODOO_BASE_URL}graphql/vsf`,
- queries: { ...Queries, ...Mutations },
- realIp: getRequestIP(event),
- sessionAuth: parseCookies(event).session_id,
- requestHost: getRequestHost(event)
- };
+ if(event.method == 'POST') {
+ const config : MiddlewareConfig = {
+ odooGraphqlUrl: `${process.env.ODOO_BASE_URL}graphql/vsf`,
+ queries: { ...Queries, ...Mutations },
+ headers: {
+ Cookie: `session_id=${parseCookies(event).session_id}`, 
+ 'resquest-host': getRequestHost(event),
+ 'REAL-IP': getRequestIP(event) || ''
+ }
+ };
+
+ event.context.apolloClient = createApiClient(config);
+ }
+
 
- event.context.apolloClient = createApiClient(config);
 });