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

fix: gql oauth - revert to libcurl #5611

Merged
merged 1 commit into from Jan 5, 2023
Merged

fix: gql oauth - revert to libcurl #5611

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
91 changes: 29 additions & 62 deletions packages/insomnia/src/ui/components/editors/body/graph-ql-editor.tsx
View file
Open in desktop
Expand Up @@ -13,17 +13,15 @@ import ReactDOM from 'react-dom';
import { useSelector } from 'react-redux';
import { useLocalStorage } from 'react-use';

import { jarFromCookies } from '../../../../common/cookies';
import { CONTENT_TYPE_JSON } from '../../../../common/constants';
import { database as db } from '../../../../common/database';
import { markdownToHTML } from '../../../../common/markdown-to-html';
import { jsonParseOr } from '../../../../common/misc';
import { getRenderContext, render, RENDER_PURPOSE_SEND } from '../../../../common/render';
import type { ResponsePatch } from '../../../../main/network/libcurl-promise';
import * as models from '../../../../models';
import type { Request } from '../../../../models/request';
import { axiosRequest } from '../../../../network/axios-request';
import * as network from '../../../../network/network';
import { jsonPrettify } from '../../../../utils/prettify/json';
import { setDefaultProtocol } from '../../../../utils/url/protocol';
import { buildQueryStringFromParams, joinUrlAndQueryString } from '../../../../utils/url/querystring';
import { selectSettings } from '../../../redux/selectors';
import { Dropdown } from '../../base/dropdown/dropdown';
import { DropdownButton } from '../../base/dropdown/dropdown-button';
Expand All @@ -47,12 +45,10 @@ const isOperationDefinition = (def: DefinitionNode): def is OperationDefinitionN
const fetchGraphQLSchemaForRequest = async ({
requestId,
environmentId,
workspaceId,
url,
}: {
requestId: string;
environmentId: string;
workspaceId: string;
url: string;
}) => {
if (!url) {
Expand All @@ -66,76 +62,49 @@ const fetchGraphQLSchemaForRequest = async ({
}

try {
const renderContext = await getRenderContext({
request,
environmentId,
purpose: RENDER_PURPOSE_SEND,
});
const workspaceCookieJar = await models.cookieJar.getOrCreateForParentId(
workspaceId
);

const rendered = await render(
{
url: request.url,
headers: request.headers,
authentication: request.authentication,
parameters: request.parameters,
workspaceCookieJar,
},
renderContext
);
const queryString = buildQueryStringFromParams(rendered.parameters);

const enabledHeaders: Record<string, string> = rendered.headers
.filter(({ name, disabled }) => Boolean(name) && !disabled)
.reduce(
(
acc: { [key: string]: string },
{ name, value }: Request['headers'][0]
) => ({ ...acc, [name.toLowerCase() || '']: value || '' }),
{}
);

if (request.settingSendCookies && workspaceCookieJar.cookies.length) {
const jar = jarFromCookies(workspaceCookieJar.cookies);
const cookieHeader = jar.getCookieStringSync(url);

if (cookieHeader) {
enabledHeaders['cookie'] = cookieHeader;
}
}
const response = await axiosRequest({
url: setDefaultProtocol(joinUrlAndQueryString(rendered.url, queryString)),
method: 'POST',
headers: { 'Content-Type': 'application/json', ...enabledHeaders },
data: {
query: getIntrospectionQuery(),
},
const bodyJson = JSON.stringify({
query: getIntrospectionQuery(),
operationName: 'IntrospectionQuery',
});

const introspectionRequest = await db.upsert(
Object.assign({}, request, {
_id: request._id + '.graphql',
settingMaxTimelineDataSize: 5000,
parentId: request._id,
isPrivate: true,
// So it doesn't get synced or exported
body: {
mimeType: CONTENT_TYPE_JSON,
text: bodyJson,
},
}),
);
const response = await network.send(introspectionRequest._id, environmentId);
const statusCode = response.statusCode || 0;
if (!response) {
return {
schemaFetchError: {
message: 'No response body received when fetching schema',
},
};
}
if (response.status < 200 || response.status >= 300) {
const renderedURL = response.request.res.responseUrl || url;
if (statusCode < 200 || statusCode >= 300) {
const renderedURL = response.url || request.url;
return {
schemaFetchError: {
message: `Got status ${response.status} fetching schema from "${renderedURL}"`,
message: `Got status ${statusCode} fetching schema from "${renderedURL}"`,
},
};
}
if (response.data.data) {
return { schema: buildClientSchema(response.data.data) };
const bodyBuffer = models.response.getBodyBuffer(response);
if (bodyBuffer) {
const { data } = JSON.parse(bodyBuffer.toString());
return { schema: buildClientSchema(data) };
}
return {
schemaFetchError: {
message:
'Something went wrong, no data was received from introspection query',
message: 'Something went wrong, no data was received from introspection query',
},
};
} catch (err) {
Expand Down Expand Up @@ -232,7 +201,6 @@ export const GraphQLEditor: FC<Props> = ({
requestId: request._id,
environmentId,
url: request.url,
workspaceId,
});

isMounted && setSchemaFetchError(newState?.schemaFetchError);
Expand Down Expand Up @@ -460,7 +428,6 @@ export const GraphQLEditor: FC<Props> = ({
requestId: request._id,
environmentId,
url: request.url,
workspaceId,
});
setSchemaIsFetching(false);
}}
Expand Down