🛠 fix wsUrl bug & 🤖 randomize default token (#711)

* 🛠fix wsUrl bug & 🤖 randomize default token * 💚 tests
jupyter-book · Nov 21, 2023 · bda77f7 · bda77f7
1 parent 1ce79f6
commit bda77f7
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 15 deletions.
diff --git a/packages/core/src/options.ts b/packages/core/src/options.ts
@@ -8,6 +8,7 @@ import type {
   SavedSessionOptions,
   MathjaxOptions,
 } from './types';
+import { shortId } from './utils';
 
 export function makeBinderOptions(opts: BinderOptions) {
   return {
@@ -36,12 +37,15 @@ export function makeKernelOptions(opts: KernelOptions): Required<KernelOptions>
 }
 
 export function makeServerSettings(settings: ServerSettings): Required<ServerSettings> {
+  const baseUrl = settings.baseUrl ?? 'http://localhost:8888';
+  const wsUrl = settings.wsUrl ?? baseUrl.replace(/^http/, 'ws');
+
   return {
-    baseUrl: 'http://localhost:8888',
-    token: 'test-secret',
+    token: shortId(), // randomized default token to prevent accidental access to a local server
     appendToken: true,
-    wsUrl: 'ws://localhost:8888',
     ...settings,
+    wsUrl,
+    baseUrl,
   };
 }
 

diff --git a/packages/core/tests/config.spec.ts b/packages/core/tests/config.spec.ts
@@ -36,12 +36,14 @@ describe('config', () => {
       });
     });
     test('server settings', () => {
-      expect(config.serverSettings).toEqual({
-        baseUrl: 'http://localhost:8888',
-        token: 'test-secret',
-        appendToken: true,
-        wsUrl: 'ws://localhost:8888',
-      });
+      expect(config.serverSettings).toEqual(
+        expect.objectContaining({
+          baseUrl: 'http://localhost:8888',
+          token: expect.any(String),
+          appendToken: true,
+          wsUrl: 'ws://localhost:8888',
+        }),
+      );
     });
   });
 });
diff --git a/packages/core/tests/options.spec.ts b/packages/core/tests/options.spec.ts
@@ -87,12 +87,14 @@ describe('options', () => {
   });
   describe('server settings', () => {
     test('defaults', () => {
-      expect(makeServerSettings({})).toEqual({
-        baseUrl: 'http://localhost:8888',
-        token: 'test-secret',
-        appendToken: true,
-        wsUrl: 'ws://localhost:8888',
-      });
+      expect(makeServerSettings({})).toEqual(
+        expect.objectContaining({
+          baseUrl: 'http://localhost:8888',
+          token: expect.any(String),
+          appendToken: true,
+          wsUrl: 'ws://localhost:8888',
+        }),
+      );
     });
     test('overrides', () => {
       expect(