Merge branch 'develop' into feature/ins-3495-change-createupdate-proj…

…ect-based-on-the-features-option
Kong · Apr 3, 2024 · 4ca9770 · 4ca9770
2 parents d139af8 + 96de17f
commit 4ca9770
Show file tree

Hide file tree

Showing 12 changed files with 202 additions and 101 deletions.
diff --git a/packages/insomnia/src/hidden-window.ts b/packages/insomnia/src/hidden-window.ts
@@ -3,6 +3,7 @@ import * as fs from 'node:fs';
 import * as _ from 'lodash';
 
 import { invariant } from '../src/utils/invariant';
+import { mergeCookieJar } from './sdk/objects/cookies';
 import { initInsomniaObject, InsomniaObject } from './sdk/objects/insomnia';
 import { RequestContext } from './sdk/objects/interfaces';
 import { mergeClientCertificates, mergeRequests, mergeSettings } from './sdk/objects/request';
@@ -83,6 +84,7 @@ const runPreRequestScript = async (
   const updatedRequest = mergeRequests(context.request, mutatedContextObject.request);
   const updatedSettings = mergeSettings(context.settings, mutatedContextObject.request);
   const updatedCertificates = mergeClientCertificates(context.clientCertificates, mutatedContextObject.request);
+  const updatedCookieJar = mergeCookieJar(context.cookieJar, mutatedContextObject.cookieJar);
 
   await fs.promises.writeFile(context.timelinePath, log.join('\n'));
 
@@ -96,5 +98,6 @@ const runPreRequestScript = async (
     request: updatedRequest,
     settings: updatedSettings,
     clientCertificates: updatedCertificates,
+    cookieJar: updatedCookieJar,
   };
 };
diff --git a/packages/insomnia/src/network/cancellation.ts b/packages/insomnia/src/network/cancellation.ts
@@ -1,4 +1,5 @@
 import type { CurlRequestOptions, CurlRequestOutput } from '../main/network/libcurl-promise';
+import { CookieJar } from '../models/cookie-jar';
 import { Request } from '../models/request';
 import { RequestContext } from '../sdk/objects/interfaces';
 
@@ -33,6 +34,7 @@ export const cancellableRunPreRequestScript = async (options: { script: string;
       request: Request;
       environment: object;
       baseEnvironment: object;
+      cookieJar: CookieJar;
     };
   } catch (err) {
     if (err.name === 'AbortError') {

diff --git a/packages/insomnia/src/network/network.ts b/packages/insomnia/src/network/network.ts
@@ -20,6 +20,7 @@ import type { HeaderResult, ResponsePatch } from '../main/network/libcurl-promis
 import * as models from '../models';
 import { CaCertificate } from '../models/ca-certificate';
 import { ClientCertificate } from '../models/client-certificate';
+import { CookieJar } from '../models/cookie-jar';
 import { Environment } from '../models/environment';
 import type { Request, RequestAuthentication, RequestParameter } from '../models/request';
 import type { Settings } from '../models/settings';
@@ -80,6 +81,7 @@ export const tryToExecutePreRequestScript = async (
   responseId: string,
   baseEnvironment: Environment,
   clientCertificates: ClientCertificate[],
+  cookieJar: CookieJar,
 ) => {
   if (!request.preRequestScript) {
     return {
@@ -111,6 +113,7 @@ export const tryToExecutePreRequestScript = async (
         baseEnvironment: baseEnvironment?.data || {},
         clientCertificates,
         settings,
+        cookieJar,
       },
     });
     const output = await Promise.race([timeoutPromise, preRequestPromise]) as {
@@ -119,6 +122,7 @@ export const tryToExecutePreRequestScript = async (
       baseEnvironment: Record<string, any>;
       settings: Settings;
       clientCertificates: ClientCertificate[];
+      cookieJar: CookieJar;
     };
     console.log('[network] Pre-request script succeeded', output);
 
@@ -144,6 +148,7 @@ export const tryToExecutePreRequestScript = async (
       baseEnvironment,
       settings: output.settings,
       clientCertificates: output.clientCertificates,
+      cookieJar: output.cookieJar,
     };
   } catch (err) {
     await fs.promises.appendFile(timelinePath, JSON.stringify({ value: err.message, name: 'Text', timestamp: Date.now() }) + '\n');

diff --git a/packages/insomnia/src/sdk/objects/__tests__/cookies.test.ts b/packages/insomnia/src/sdk/objects/__tests__/cookies.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from '@jest/globals';
 
-import { Cookie } from '../cookies';
+import { Cookie, CookieJar } from '../cookies';
 
 describe('test Cookie object', () => {
     it('test basic operations', () => {
@@ -65,4 +65,81 @@ describe('test Cookie object', () => {
             Cookie.unparseSingle(cookie1Opt)
         ).toEqual(expectedCookieString);
     });
+
+});
+
+describe('test CookieJar', () => {
+    it('basic operations', () => {
+        const cookieOptBase = {
+            key: 'myCookie',
+            value: 'myCookie',
+            expires: '01 Jan 1970 00:00:01 GMT',
+            maxAge: '7',
+            domain: 'domain.com',
+            path: '/',
+            secure: true,
+            httpOnly: true,
+            hostOnly: true,
+            session: true,
+            extensions: [{ key: 'Ext', value: 'ExtValue' }],
+        };
+
+        const jar = new CookieJar(
+            'my jar',
+            [
+                new Cookie({ ...cookieOptBase, key: 'c1', value: 'c1' }),
+                new Cookie({ ...cookieOptBase, key: 'c2', value: 'c2' }),
+            ],
+        );
+
+        jar.set('domain.com', 'c1', { ...cookieOptBase, key: 'c1', value: 'c1Updated' }, (error, cookie) => {
+            expect(error).toBeUndefined();
+            expect(cookie?.toJSON()).toEqual(
+                new Cookie({ ...cookieOptBase, key: 'c1', value: 'c1Updated' }).toJSON()
+            );
+        });
+
+        jar.set('domain2.com', 'c2', { ...cookieOptBase, key: 'c2', value: 'c2' }, (error, cookie) => {
+            expect(error).toBeUndefined();
+            expect(cookie?.toJSON()).toEqual(
+                new Cookie({ ...cookieOptBase, key: 'c2', value: 'c2' }).toJSON()
+            );
+        });
+
+        jar.get('domain.com', 'c1', (err, cookie) => {
+            expect(err).toBeUndefined();
+            expect(
+                cookie?.toJSON(),
+            ).toEqual(
+                new Cookie({ ...cookieOptBase, key: 'c1', value: 'c1Updated' }).toJSON(),
+            );
+        });
+
+        jar.get('domain2.com', 'c2', (err, cookie) => {
+            expect(err).toBeUndefined();
+            expect(
+                cookie?.toJSON(),
+            ).toEqual(
+                new Cookie({ ...cookieOptBase, key: 'c2', value: 'c2' }).toJSON(),
+            );
+        });
+
+        jar.unset('domain.com', 'c1', err => {
+            expect(err).toBeUndefined();
+        });
+
+        jar.get('domain.com', 'c1', (err, cookie) => {
+            expect(err).toBeUndefined();
+            expect(cookie).toBeUndefined();
+        });
+
+        jar.clear('domain2.com', err => {
+            expect(err).toBeUndefined();
+        });
+
+        jar.get('domain2.com', 'c2', (err, cookie) => {
+            expect(err).toBeUndefined();
+            expect(cookie).toBeUndefined();
+        });
+    });
 });