From c9489e4a61fe8338dee8ed3d9701beef440546b6 Mon Sep 17 00:00:00 2001
From: Dmitry <dsagal+git@gmail.com>
Date: Mon, 7 Aug 2023 18:39:14 -0400
Subject: [PATCH] Fix ManyFetches test, and include into grist-core a needed
 upgrade to the 'ws' package. (#614)

This is a follow-up fix to https://github.com/gristlabs/grist-core/commit/526a5df157489b6debfbd8e768439b722477de3a.
---
 package.json                   |  2 +-
 test/server/lib/ManyFetches.ts |  5 +++--
 yarn.lock                      | 15 ++++-----------
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index b053450e..4a67584b 100644
--- a/package.json
+++ b/package.json
@@ -182,7 +182,7 @@
     "underscore": "1.12.1",
     "uuid": "3.3.2",
     "winston": "2.4.5",
-    "ws": "6.2.2"
+    "ws": "8.13.0"
   },
   "resolutions": {
     "jquery": "3.5.0",
diff --git a/test/server/lib/ManyFetches.ts b/test/server/lib/ManyFetches.ts
index af0f3cc0..11a6f7c5 100644
--- a/test/server/lib/ManyFetches.ts
+++ b/test/server/lib/ManyFetches.ts
@@ -2,6 +2,7 @@ import {GristWSConnection} from 'app/client/components/GristWSConnection';
 import {TableFetchResult} from 'app/common/ActiveDocAPI';
 import {UserAPIImpl} from 'app/common/UserAPI';
 import {delay} from 'app/common/delay';
+import {cookieName} from 'app/server/lib/gristSessions';
 import * as log from 'app/server/lib/log';
 import {getGristConfig} from 'test/gen-server/testUtils';
 import {prepareDatabase} from 'test/server/lib/helpers/PrepareDatabase';
@@ -159,13 +160,13 @@ describe('ManyFetches', function() {
   async function prepareGristWSConnection(docId: string): Promise<() => GristWSConnection> {
     // Use cookies for access to stay as close as possible to regular operation.
     const resp = await fetch(`${home.serverUrl}/test/session`);
-    const sid = cookie.parse(resp.headers.get('set-cookie')).grist_sid;
+    const sid = cookie.parse(resp.headers.get('set-cookie'))[cookieName];
     if (!sid) { throw new Error('no session available'); }
     await home.testingHooks.setLoginSessionProfile(sid, {name: userName, email}, org);
 
     // Load the document html.
     const pageUrl = `${home.serverUrl}/o/docs/doc/${docId}`;
-    const headers = {Cookie: `grist_sid=${sid}`};
+    const headers = {Cookie: `${cookieName}=${sid}`};
     const doc = await fetch(pageUrl, {headers});
     const pageBody = await doc.text();
 
diff --git a/yarn.lock b/yarn.lock
index 37d61912..158b1b93 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1653,11 +1653,6 @@ assertion-error@^1.1.0:
   resolved "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz"
   integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==
 
-async-limiter@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz"
-  integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
-
 async-mutex@0.2.4:
   version "0.2.4"
   resolved "https://registry.npmjs.org/async-mutex/-/async-mutex-0.2.4.tgz"
@@ -8866,12 +8861,10 @@ write-file-atomic@^3.0.0:
     signal-exit "^3.0.2"
     typedarray-to-buffer "^3.1.5"
 
-ws@6.2.2:
-  version "6.2.2"
-  resolved "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz"
-  integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==
-  dependencies:
-    async-limiter "~1.0.0"
+ws@8.13.0:
+  version "8.13.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0"
+  integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
 
 ws@^7.3.1:
   version "7.4.4"