fix(my-queries): stop using hardcoded urls for user data COMPASS-9663 (#7392)

* stop using hardcoded urls

* https

* make my-queries have dependency on atlas-service

* url-safe characters

Co-authored-by: Anna Henningsen <[email protected]>

* simplify

---------

Co-authored-by: Anna Henningsen <[email protected]>

Author: nvs119

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

@@ -16,6 +16,7 @@ const ATLAS_CONFIG = {
   },
   authPortalUrl: 'http://example.com/account/login',
   assistantApiBaseUrl: 'http://example.com/assistant',
+  userDataBaseUrl: 'http://example.com/ui/userData',
 };
 
 function getAtlasService(

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

@@ -78,11 +78,21 @@ export class AtlasService {
     // https://github.com/10gen/mms/blob/9f858bb987aac6aa80acfb86492dd74c89cbb862/client/packages/project/common/ajaxPrefilter.ts#L34-L49
     return this.cloudEndpoint(path);
   }
-  // TODO (COMPASS-9663): these should come from the config property per environment
-  userDataEndpoint(path?: string): string {
-    return `https://cluster-connection.cloud-dev.mongodb.com/userData${normalizePath(
-      path
-    )}`;
+  userDataEndpoint(
+    orgId: string,
+    groupId: string,
+    type: 'favoriteQueries' | 'recentQueries' | 'favoriteAggregations',
+    id?: string
+  ): string {
+    const encodedOrgId = encodeURIComponent(orgId);
+    const encodedGroupId = encodeURIComponent(groupId);
+    const encodedType = encodeURIComponent(type);
+    const encodedId = id ? encodeURIComponent(id) : '';
+    const baseUrl = this.config.userDataBaseUrl;
+    const path = encodedId
+      ? `/${encodedOrgId}/${encodedGroupId}/${encodedType}/${encodedId}`
+      : `/${encodedOrgId}/${encodedGroupId}/${encodedType}`;
+    return `${baseUrl}${path}`;
   }
   driverProxyEndpoint(path?: string): string {
     return `${this.config.ccsBaseUrl}${normalizePath(path)}`;

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

@@ -57,6 +57,7 @@ describe('CompassAuthServiceMain', function () {
     },
     authPortalUrl: 'http://example.com',
     assistantApiBaseUrl: 'http://example.com/assistant',
+    userDataBaseUrl: 'http://example.com/ui/userData',
   };
 
   const fetch = CompassAuthService['fetch'];

packages/atlas-service/src/util.ts

@@ -120,6 +120,10 @@ export type AtlasServiceConfig = {
    * Assistant API base url
    */
   assistantApiBaseUrl: string;
+  /**
+   * User data API base url
+   */
+  userDataBaseUrl: string;
 };
 
 /**
@@ -144,6 +148,7 @@ const config = {
     },
     authPortalUrl: 'https://account-dev.mongodb.com/account/login',
     assistantApiBaseUrl: 'https://knowledge-dev.mongodb.com/api/v1',
+    userDataBaseUrl: 'https://cloud-dev.mongodb.com/ui/userData',
   },
   'atlas-dev': {
     ccsBaseUrl: '',
@@ -155,6 +160,7 @@ const config = {
     },
     authPortalUrl: 'https://account-dev.mongodb.com/account/login',
     assistantApiBaseUrl: 'https://knowledge-dev.mongodb.com/api/v1',
+    userDataBaseUrl: 'https://cloud-dev.mongodb.com/ui/userData',
   },
   'atlas-qa': {
     ccsBaseUrl: '',
@@ -166,6 +172,7 @@ const config = {
     },
     authPortalUrl: 'https://account-qa.mongodb.com/account/login',
     assistantApiBaseUrl: 'https://knowledge-dev.mongodb.com/api/v1',
+    userDataBaseUrl: 'https://cloud-qa.mongodb.com/ui/userData',
   },
   atlas: {
     ccsBaseUrl: '',
@@ -177,6 +184,7 @@ const config = {
     },
     authPortalUrl: 'https://account.mongodb.com/account/login',
     assistantApiBaseUrl: 'https://knowledge.mongodb.com/api/v1',
+    userDataBaseUrl: 'https://cloud.mongodb.com/ui/userData',
   },
   'web-sandbox-atlas-local': {
     ccsBaseUrl: '/ccs',
@@ -188,6 +196,7 @@ const config = {
     },
     authPortalUrl: 'https://account-dev.mongodb.com/account/login',
     assistantApiBaseUrl: 'https://knowledge-dev.mongodb.com/api/v1',
+    userDataBaseUrl: 'https://cloud-dev.mongodb.com/ui/userData',
   },
   'web-sandbox-atlas-dev': {
     ccsBaseUrl: '/ccs',
@@ -199,6 +208,7 @@ const config = {
     },
     authPortalUrl: 'https://account-dev.mongodb.com/account/login',
     assistantApiBaseUrl: 'https://knowledge-dev.mongodb.com/api/v1',
+    userDataBaseUrl: '/cloud-mongodb-com/ui/userData',
   },
   'web-sandbox-atlas-qa': {
     ccsBaseUrl: '/ccs',
@@ -210,6 +220,7 @@ const config = {
     },
     authPortalUrl: 'https://account-dev.mongodb.com/account/login',
     assistantApiBaseUrl: 'https://knowledge-dev.mongodb.com/api/v1',
+    userDataBaseUrl: '/cloud-mongodb-com/ui/userData',
   },
   'web-sandbox-atlas': {
     ccsBaseUrl: '/ccs',
@@ -221,6 +232,7 @@ const config = {
     },
     authPortalUrl: 'https://account.mongodb.com/account/login',
     assistantApiBaseUrl: 'https://knowledge.mongodb.com/api/v1',
+    userDataBaseUrl: '/cloud-mongodb-com/ui/userData',
   },
 } as const;
 
@@ -236,6 +248,7 @@ export function getAtlasConfig(
     },
     authPortalUrl: process.env.COMPASS_ATLAS_AUTH_PORTAL_URL_OVERRIDE,
     assistantApiBaseUrl: process.env.COMPASS_ASSISTANT_BASE_URL_OVERRIDE,
+    userDataBaseUrl: process.env.COMPASS_USER_DATA_BASE_URL_OVERRIDE,
   };
   return defaultsDeep(
     envConfig,

packages/compass-web/src/entrypoint.tsx

@@ -117,8 +117,27 @@ const WithStorageProviders = createServiceProvider(
     const atlasService = atlasServiceLocator();
     const authenticatedFetch =
       atlasService.authenticatedFetch.bind(atlasService);
-    const getResourceUrl = (path?: string) =>
-      atlasService.userDataEndpoint(`/${path || ''}`);
+    const getResourceUrl = (path?: string) => {
+      const pathParts = path?.split('/').filter(Boolean) || [];
+      const type = pathParts[0] as
+        | 'favoriteQueries'
+        | 'recentQueries'
+        | 'favoriteAggregations';
+      const pathOrgId = pathParts[1];
+      const pathProjectId = pathParts[2];
+      const id = pathParts[3];
+
+      // Use the path's orgId and projectId if provided, otherwise fall back to the context values
+      const finalOrgId = pathOrgId || orgId;
+      const finalProjectId = pathProjectId || projectId;
+
+      return atlasService.userDataEndpoint(
+        finalOrgId,
+        finalProjectId,
+        type,
+        id
+      );
+    };
 
     const pipelineStorage = useRef<PipelineStorageAccess>({
       getStorage() {