Merge branch 'main' into COMPASS-8441-global0=-writes-tests

Author: paula-stacho

THIRD-PARTY-NOTICES.md

@@ -1,5 +1,5 @@
 The following third-party software is used by and included in **Mongodb Compass**.
-This document was automatically generated on Thu Nov 07 2024.
+This document was automatically generated on Mon Nov 11 2024.
 
 ## List of dependencies
 

configs/webpack-config-compass/package.json

@@ -73,7 +73,7 @@
     "cli-progress": "^3.9.1",
     "core-js": "^3.17.3",
     "css-loader": "^4.3.0",
-    "electron": "^32.2.2",
+    "electron": "^32.2.3",
     "html-webpack-plugin": "^5.6.0",
     "less": "^3.13.1",
     "less-loader": "^10.0.1",

docs/tracking-plan.md

@@ -1,7 +1,7 @@
 
 # Compass Tracking Plan
 
-Generated on Thu, Nov 7, 2024 at 11:58 PM
+Generated on Mon, Nov 11, 2024 at 10:33 AM
 
 ## Table of Contents
 

package-lock.json

@@ -13,7 +13,7 @@
     "email": "[email protected]"
   },
   "homepage": "https://github.com/mongodb-js/compass",
-  "version": "0.31.1",
+  "version": "0.32.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/mongodb-js/compass.git"
@@ -83,12 +83,11 @@
     "@mongodb-js/devtools-proxy-support": "^0.4.1",
     "@mongodb-js/oidc-plugin": "^1.1.1",
     "hadron-app-registry": "^9.2.7",
-    "compass-preferences-model": "^2.29.3",
-    "electron": "^32.2.2",
+    "compass-preferences-model": "^2.30.0",
+    "electron": "^32.2.3",
     "hadron-ipc": "^3.2.25",
     "lodash": "^4.17.21",
     "react": "^17.0.2",
-    "react-redux": "^8.1.3",
     "redux": "^4.2.1",
     "redux-thunk": "^2.4.2"
   }

packages/atlas-service/package.json

@@ -4,7 +4,7 @@ import type { AtlasUserInfo } from './util';
 export type ArgsWithSignal<T = Record<string, unknown>> = T & {
   signal?: AbortSignal;
 };
-export type SignInPrompt = 'none' | 'ai-promo-modal';
+export type SignInPrompt = 'none';
 
 type AtlasAuthServiceEvents = {
   'signed-in': [];

packages/atlas-service/src/atlas-auth-service.ts

@@ -132,4 +132,30 @@ describe('AtlasService', function () {
     );
     expect(getAuthHeadersFn.calledOnce).to.be.true;
   });
+
+  it('should set CSRF headers when available', async function () {
+    const fetchStub = sandbox.stub().resolves({ status: 200, ok: true });
+    global.fetch = fetchStub;
+    document.head.append(
+      (() => {
+        const el = document.createElement('meta');
+        el.setAttribute('name', 'csrf-token');
+        el.setAttribute('content', 'token');
+        return el;
+      })()
+    );
+    document.head.append(
+      (() => {
+        const el = document.createElement('meta');
+        el.setAttribute('name', 'CSRF-TIME');
+        el.setAttribute('content', 'time');
+        return el;
+      })()
+    );
+    await atlasService.fetch('/foo/bar', { method: 'POST' });
+    expect(fetchStub.firstCall.lastArg.headers).to.deep.eq({
+      'X-CSRF-Time': 'time',
+      'X-CSRF-Token': 'token',
+    });
+  });
 });

packages/atlas-service/src/atlas-service.spec.ts

@@ -19,6 +19,23 @@ function normalizePath(path?: string) {
   return encodeURI(path);
 }
 
+function getCSRFHeaders() {
+  return {
+    'X-CSRF-Token':
+      document
+        .querySelector('meta[name="csrf-token" i]')
+        ?.getAttribute('content') ?? '',
+    'X-CSRF-Time':
+      document
+        .querySelector('meta[name="csrf-time" i]')
+        ?.getAttribute('content') ?? '',
+  };
+}
+
+function shouldAddCSRFHeaders(method = 'get') {
+  return !/^(get|head|options|trace)$/.test(method.toLowerCase());
+}
+
 export class AtlasService {
   private config: AtlasServiceConfig;
   constructor(
@@ -60,6 +77,7 @@ export class AtlasService {
         ...init,
         headers: {
           ...this.options?.defaultHeaders,
+          ...(shouldAddCSRFHeaders(init?.method) && getCSRFHeaders()),
           ...init?.headers,
         },
       });

packages/atlas-service/src/atlas-service.ts

@@ -1,9 +1,6 @@
 import { ipcRenderer } from 'hadron-ipc';
 import type { CompassAuthService as AtlasServiceMain } from './main';
-import {
-  signInWithModalPrompt,
-  signInWithoutPrompt,
-} from './store/atlas-signin-reducer';
+import { signInWithoutPrompt } from './store/atlas-signin-reducer';
 import { getStore } from './store/atlas-signin-store';
 import { AtlasAuthService } from './atlas-auth-service';
 import type { ArgsWithSignal, SignInPrompt } from './atlas-auth-service';
@@ -46,8 +43,6 @@ export class CompassAtlasAuthService extends AtlasAuthService {
     switch (promptType) {
       case 'none':
         return getStore().dispatch(signInWithoutPrompt({ signal }));
-      case 'ai-promo-modal':
-        return getStore().dispatch(signInWithModalPrompt({ signal }));
       default:
         return this.ipc.signIn({ signal });
     }

packages/atlas-service/src/compass-atlas-auth-service.ts

@@ -1,12 +1,11 @@
 import { registerHadronPlugin } from 'hadron-app-registry';
 import { activatePlugin } from './store/atlas-signin-store';
 import { atlasAuthServiceLocator } from './provider';
-import { AtlasSignIn } from './components';
 
 export const AtlasAuthPlugin = registerHadronPlugin(
   {
     name: 'AtlasAuth',
-    component: AtlasSignIn,
+    component: () => null,
     activate: activatePlugin,
   },
   {