Skip to content

fix: persist cookies from response together with ones from after-response script #7819

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

Merged
ihexxa merged 2 commits into from
Aug 23, 2024
+15 −3
Merged

fix: persist cookies from response together with ones from after-response script #7819

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0da9e11
fix: cookies from response should also persisted together with after-…
ihexxa Aug 7, 2024
6d42384
fix: lint error
ihexxa Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions packages/insomnia/src/network/network.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import type { HeaderResult, ResponsePatch } from '../main/network/libcurl-promis
import * as models from '../models';
import type { CaCertificate } from '../models/ca-certificate';
import type { ClientCertificate } from '../models/client-certificate';
import type { CookieJar } from '../models/cookie-jar';
import type { Cookie, CookieJar } from '../models/cookie-jar';
import type { Environment } from '../models/environment';
import type { MockRoute } from '../models/mock-route';
import type { MockServer } from '../models/mock-server';
Expand Down Expand Up @@ -218,16 +218,18 @@ export async function savePatchesMadeByScript(
environment: Environment,
baseEnvironment: Environment,
activeGlobalEnvironment: Environment | undefined,
responseCookies?: Cookie[],
) {
if (!mutatedContext) {
return;
}

// persist updated cookieJar if needed
if (mutatedContext.cookieJar) {
// merge cookies from response to the cookiejar, or cookies from response will not be persisted
await models.cookieJar.update(
mutatedContext.cookieJar,
{ cookies: mutatedContext.cookieJar.cookies },
{ cookies: [...(responseCookies || []), ...mutatedContext.cookieJar.cookies] },
);
}
// when base environment is activated, `mutatedContext.environment` points to it
Expand Down Expand Up @@ -416,7 +418,15 @@ export async function tryToExecuteAfterResponseScript(context: RequestAndContext
if (!postMutatedContext?.request) {
return null;
}
await savePatchesMadeByScript(postMutatedContext, context.environment, context.baseEnvironment, context.globals);

// cookies from response should also be persisted
const respondedWithoutError = context.response && !('error' in context.response);
if (respondedWithoutError) {
const resp = context.response as sendCurlAndWriteTimelineResponse;
await savePatchesMadeByScript(postMutatedContext, context.environment, context.baseEnvironment, context.globals, resp.cookies);
} else {
await savePatchesMadeByScript(postMutatedContext, context.environment, context.baseEnvironment, context.globals);
}

return postMutatedContext;
}
Expand Down Expand Up @@ -472,6 +482,7 @@ export interface sendCurlAndWriteTimelineResponse extends ResponsePatch {
parentId: string;
timelinePath: string;
statusMessage: string;
cookies: Cookie[];
}

export async function sendCurlAndWriteTimeline(
Expand Down Expand Up @@ -550,6 +561,7 @@ export async function sendCurlAndWriteTimeline(
httpVersion: lastRedirect.version,
statusCode: lastRedirect.code,
statusMessage: lastRedirect.reason,
cookies,
...patch,
};
}
Expand Down