From 7a8d65b04536475242f5d2eb50c26ce75dfe486b Mon Sep 17 00:00:00 2001 From: DuvCharles Date: Wed, 14 Dec 2022 15:22:31 +0100 Subject: [PATCH] change base url --- .../src/api/operations/get-all-product-paths.ts | 2 +- .../sylius/src/api/operations/get-all-products.ts | 2 +- packages/sylius/src/api/operations/get-product.ts | 2 +- packages/sylius/src/api/operations/get-site-info.ts | 2 +- packages/sylius/src/auth/use-login.tsx | 9 +++------ packages/sylius/src/const.ts | 2 +- packages/sylius/src/customer/use-customer.tsx | 4 ++-- packages/sylius/src/product/use-search.ts | 2 +- packages/sylius/src/utils/token/customer-id.ts | 11 ----------- packages/sylius/src/utils/token/customer-route.ts | 12 ++++++++++++ 10 files changed, 23 insertions(+), 25 deletions(-) delete mode 100644 packages/sylius/src/utils/token/customer-id.ts create mode 100644 packages/sylius/src/utils/token/customer-route.ts diff --git a/packages/sylius/src/api/operations/get-all-product-paths.ts b/packages/sylius/src/api/operations/get-all-product-paths.ts index c490520be..1c57df0ec 100644 --- a/packages/sylius/src/api/operations/get-all-product-paths.ts +++ b/packages/sylius/src/api/operations/get-all-product-paths.ts @@ -22,7 +22,7 @@ export default function getAllProductPathsOperation({ preview?: boolean } = {}): Promise { const config = commerce.getConfig(cfg) - const syliusProducts = await config.fetch('GET', '/products') + const syliusProducts = await config.fetch('GET', '/api/v2/shop/products') const products = syliusProducts.map((syliusProduct: SyliusProduct) => normalizeProduct(syliusProduct) ) diff --git a/packages/sylius/src/api/operations/get-all-products.ts b/packages/sylius/src/api/operations/get-all-products.ts index 8b7b24c53..9673e9329 100644 --- a/packages/sylius/src/api/operations/get-all-products.ts +++ b/packages/sylius/src/api/operations/get-all-products.ts @@ -23,7 +23,7 @@ export default function getAllProductsOperation({ preview?: boolean } = {}): Promise<{ products: Product[] }> { const config = commerce.getConfig(cfg) - const syliusProducts = await config.fetch('GET', '/products') + const syliusProducts = await config.fetch('GET', '/api/v2/shop/products') const products = syliusProducts.map((syliusProduct: SyliusProduct) => normalizeProduct(syliusProduct) ) diff --git a/packages/sylius/src/api/operations/get-product.ts b/packages/sylius/src/api/operations/get-product.ts index a9d06590d..8860aad6e 100644 --- a/packages/sylius/src/api/operations/get-product.ts +++ b/packages/sylius/src/api/operations/get-product.ts @@ -20,7 +20,7 @@ export default function getProductOperation({ const config = commerce.getConfig(cfg) const syliusProduct = await config.fetch( 'GET', - `/products-by-slug/${variables!.slug}` + `/api/v2/shop/products-by-slug/${variables!.slug}` ) const product = normalizeProduct(syliusProduct) diff --git a/packages/sylius/src/api/operations/get-site-info.ts b/packages/sylius/src/api/operations/get-site-info.ts index c0f75ef54..987ac5585 100644 --- a/packages/sylius/src/api/operations/get-site-info.ts +++ b/packages/sylius/src/api/operations/get-site-info.ts @@ -25,7 +25,7 @@ export default function getSiteInfoOperation({ preview?: boolean } = {}): Promise { const config = commerce.getConfig(cfg) - const syliusCategories = await config.fetch('GET', '/taxons') + const syliusCategories = await config.fetch('GET', '/api/v2/shop/taxons') const categories = syliusCategories.map( (syliusCategories: SyliusCategorie) => normalizeCategorie(syliusCategories) diff --git a/packages/sylius/src/auth/use-login.tsx b/packages/sylius/src/auth/use-login.tsx index 3dd2bfe35..a1bb3d36f 100644 --- a/packages/sylius/src/auth/use-login.tsx +++ b/packages/sylius/src/auth/use-login.tsx @@ -3,13 +3,13 @@ import useLogin, { UseLogin } from '@vercel/commerce/auth/use-login' import { useCallback } from 'react' import useCustomer from '@vercel/commerce/customer/use-customer' import { setCustomerToken } from '../utils/token/customer-token' -import { setCustomerId } from '../utils/token/customer-id' +import { setCustomerRoute } from '../utils/token/customer-route' export default useLogin as UseLogin export const handler: MutationHook = { fetchOptions: { - url: '/authentication-token', + url: '/api/v2/shop/authentication-token', method: 'POST', }, fetcher: async ({ input: { email, password }, options, fetch }) => { @@ -26,10 +26,7 @@ export const handler: MutationHook = { }) setCustomerToken(authReturn.token) - console.log(authReturn) - const custumerRouteParts = authReturn.customer.split('/') - console.log(custumerRouteParts) - setCustomerId(custumerRouteParts[5]) + setCustomerRoute(authReturn.customer) return null }, useHook: diff --git a/packages/sylius/src/const.ts b/packages/sylius/src/const.ts index e3867cd75..83e9dd2a7 100644 --- a/packages/sylius/src/const.ts +++ b/packages/sylius/src/const.ts @@ -1,4 +1,4 @@ export const API_URL = process.env.NEXT_PUBLIC_SYLIUS_API_URL export const SYLIUS_CUSTOMER_TOKEN = 'sylius_customerToken' -export const SYLIUS_CUSTOMER_ID = 'sylius_customerId' +export const SYLIUS_CUSTOMER_ROUTE = 'sylius_customerRoute' diff --git a/packages/sylius/src/customer/use-customer.tsx b/packages/sylius/src/customer/use-customer.tsx index 67607a85f..77da6e93b 100644 --- a/packages/sylius/src/customer/use-customer.tsx +++ b/packages/sylius/src/customer/use-customer.tsx @@ -2,7 +2,7 @@ import { SWRHook } from '@vercel/commerce/utils/types' import useCustomer, { UseCustomer, } from '@vercel/commerce/customer/use-customer' -import { getCustomerId } from '../utils/token/customer-id' +import { getCustomerRoute } from '../utils/token/customer-route' import { normalizeCustomer } from '../utils/normalize/normalize-customer' export default useCustomer as UseCustomer @@ -14,7 +14,7 @@ export const handler: SWRHook = { }, fetcher: async ({ options, fetch }) => { const syliusCustomer = await fetch({ - url: options.url! + getCustomerId(), + url: getCustomerRoute() ?? '', method: options.method, }) const customer = normalizeCustomer(syliusCustomer) diff --git a/packages/sylius/src/product/use-search.ts b/packages/sylius/src/product/use-search.ts index 15008cd80..f9dbca6e6 100644 --- a/packages/sylius/src/product/use-search.ts +++ b/packages/sylius/src/product/use-search.ts @@ -17,7 +17,7 @@ export type SearchProductsInput = { export const handler: SWRHook = { fetchOptions: { - url: '/products', + url: '/api/v2/shop/products', method: 'GET', }, fetcher: async ({ input: { search, categoryId, sort }, options, fetch }) => { diff --git a/packages/sylius/src/utils/token/customer-id.ts b/packages/sylius/src/utils/token/customer-id.ts deleted file mode 100644 index 190576a72..000000000 --- a/packages/sylius/src/utils/token/customer-id.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { SYLIUS_CUSTOMER_ID } from '../../const' - -export const getCustomerId = () => localStorage.getItem(SYLIUS_CUSTOMER_ID) - -export const setCustomerId = (id: string | null) => { - if (!id) { - localStorage.removeItem(SYLIUS_CUSTOMER_ID) - } else { - localStorage.setItem(SYLIUS_CUSTOMER_ID, id) - } -} diff --git a/packages/sylius/src/utils/token/customer-route.ts b/packages/sylius/src/utils/token/customer-route.ts new file mode 100644 index 000000000..1af31a95e --- /dev/null +++ b/packages/sylius/src/utils/token/customer-route.ts @@ -0,0 +1,12 @@ +import { SYLIUS_CUSTOMER_ROUTE } from '../../const' + +export const getCustomerRoute = () => + localStorage.getItem(SYLIUS_CUSTOMER_ROUTE) + +export const setCustomerRoute = (route: string | null) => { + if (!route) { + localStorage.removeItem(SYLIUS_CUSTOMER_ROUTE) + } else { + localStorage.setItem(SYLIUS_CUSTOMER_ROUTE, route) + } +}