hasura/graphql-engine
1
0
Fork 0
mirror of https://github.com/hasura/graphql-engine.git synced 2024-10-05 06:18:04 +03:00
Code Issues Projects Releases Wiki Activity

console: fix HTTPS websocket protocol for subscriptions

Browse Source 
PR-URL: https://github.com/hasura/graphql-engine-mono/pull/7592
GitOrigin-RevId: 02b4e8df7ed64fbc9ec8a0d3fca64681285d6d5d
This commit is contained in:
Rishichandra Wawhal 2023-01-19 18:42:44 +05:30 committed by hasura-bot
parent cd5186be90
commit 37a15c25e8
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
console/src/components/Services/ApiExplorer/Actions.js
View File

@ -178,7 +178,7 @@ const changeRequestParams = newParams => {
};
const createWsClient = (url, headers) => {
const websocketProtocol = getWebsocketProtocol(url);
const websocketProtocol = getWebsocketProtocol(window.location.protocol);
const headersFinal = getHeadersAsJSON(headers);
const graphqlUrl = `${websocketProtocol}//${url.split('//')[1]}`;

13
console/src/features/ControlPlane/client.ts
View File

@ -1,4 +1,6 @@
import endpoints from '@/Endpoints';
import globals from '@/Globals';
import { isCloudConsole } from '@/utils/cloudConsole';
import { Api } from '@/hooks/apiUtils';
import { getGraphqlSubscriptionsClient } from '@/utils/graphqlSubscriptions';
import { print, DocumentNode } from 'graphql/language';
@ -11,10 +13,9 @@ export const createControlPlaneClient = (
'hasura-client-name': 'hasura-console',
}
) => {
const subscriptionsClient = getGraphqlSubscriptionsClient(
endpoints.luxDataGraphqlWs,
headers
);
const subscriptionsClient = isCloudConsole(globals)
? getGraphqlSubscriptionsClient(endpoints.luxDataGraphqlWs, headers)
: null;
const query = <
ResponseType = Record<string, any>,
@ -43,6 +44,10 @@ export const createControlPlaneClient = (
dataCallback: (data: ResponseType) => void,
errorCallback: (error: GraphQLError) => void
) => {
if (!subscriptionsClient) {
return { unsubscribe: () => null };
}
const request = subscriptionsClient.request({
query: queryDoc,
variables,