From 5f939839fb8bdeb1532946772a6b579354b351e2 Mon Sep 17 00:00:00 2001 From: Untone Date: Tue, 19 Mar 2024 14:23:20 +0300 Subject: [PATCH] public-env-urls --- src/graphql/client/chat.ts | 3 ++- src/graphql/client/core.ts | 5 +++-- src/graphql/createGraphQLClient.ts | 9 ++++----- src/utils/config.ts | 9 +++++++++ 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/graphql/client/chat.ts b/src/graphql/client/chat.ts index 42c5be97..df801c02 100644 --- a/src/graphql/client/chat.ts +++ b/src/graphql/client/chat.ts @@ -21,10 +21,11 @@ import { QueryLoad_ChatsArgs, QueryLoad_Messages_ByArgs, } from '../schema/chat.gen' +import { chatApiUrl } from '../../utils/config' export const inboxClient = { private: null, - connect: (token: string) => (inboxClient.private = createGraphQLClient('chat', token)), + connect: (token: string) => (inboxClient.private = createGraphQLClient(chatApiUrl, token)), loadChats: async (options: QueryLoad_ChatsArgs): Promise => { const resp = await inboxClient.private.query(myChats, options).toPromise() diff --git a/src/graphql/client/core.ts b/src/graphql/client/core.ts index 36ae8f70..bb68d943 100644 --- a/src/graphql/client/core.ts +++ b/src/graphql/client/core.ts @@ -46,14 +46,15 @@ import reactionsLoadBy from '../query/core/reactions-load-by' import topicBySlug from '../query/core/topic-by-slug' import topicsAll from '../query/core/topics-all' import topicsRandomQuery from '../query/core/topics-random' +import { coreApiUrl } from "../../utils/config" -const publicGraphQLClient = createGraphQLClient('core') +const publicGraphQLClient = createGraphQLClient(coreApiUrl) export const apiClient = { private: null, connect: (token: string) => { // NOTE: use it after token appears - apiClient.private = createGraphQLClient('core', token) + apiClient.private = createGraphQLClient(coreApiUrl, token) }, getRandomTopShouts: async (params: QueryLoad_Shouts_Random_TopArgs) => { diff --git a/src/graphql/createGraphQLClient.ts b/src/graphql/createGraphQLClient.ts index 62755e9a..89b0d620 100644 --- a/src/graphql/createGraphQLClient.ts +++ b/src/graphql/createGraphQLClient.ts @@ -1,18 +1,17 @@ -import { ClientOptions, Exchange, createClient, dedupExchange, fetchExchange } from '@urql/core' +import { ClientOptions, Exchange, createClient, fetchExchange } from '@urql/core' import { devtoolsExchange } from '@urql/devtools' import { isDev } from '../utils/config' -const exchanges: Exchange[] = [dedupExchange, fetchExchange] +const exchanges: Exchange[] = [fetchExchange] if (isDev) { exchanges.unshift(devtoolsExchange) } -export const createGraphQLClient = (serviceName: string, token = '') => { +export const createGraphQLClient = (url: string, token = '') => { const options: ClientOptions = { - url: `https://${serviceName}.discours.io`, - maskTypename: true, + url, requestPolicy: 'cache-and-network', fetchOptions: () => (token ? { headers: { Authorization: token } } : {}), exchanges, diff --git a/src/utils/config.ts b/src/utils/config.ts index 1cfd89a5..9585180d 100644 --- a/src/utils/config.ts +++ b/src/utils/config.ts @@ -8,3 +8,12 @@ export const SENTRY_DSN = import.meta.env.PUBLIC_SENTRY_DSN || '' const defaultSearchUrl = 'https://search.discours.io' export const searchUrl = import.meta.env.PUBLIC_SEARCH_URL || defaultSearchUrl + +const defaultCoreUrl = 'https://core.discours.io' +export const coreApiUrl = import.meta.env.PUBLIC_CORE_API || defaultCoreUrl + +const defaultChatUrl = 'https://chat.discours.io' +export const chatApiUrl = import.meta.env.PUBLIC_CHAT_API || defaultChatUrl + +const defaultAuthUrl = 'https://auth.discours.io' +export const authApiUrl = import.meta.env.PUBLIC_AUTH_API || defaultAuthUrl \ No newline at end of file