update

Author: blva

src/common/atlas/apiClient.ts

@@ -119,35 +119,40 @@ export class ApiClient {
     }
 
     public async sendEvents(events: TelemetryEvent<CommonProperties>[]): Promise<void> {
-        if (!this.hasCredentials()) {
+        if (!this.options.credentials) {
             await this.sendUnauthEvents(events);
             return;
         }
 
         try {
-            await this.validateAccessToken();
             await this.sendAuthEvents(events);
         } catch (error) {
             if (error instanceof ApiClientError) {
                 if (error.response.status !== 401) {
                     throw error;
                 }
             }
-            // send unauth events if the token is not valid
+
+            // send unauth events if any of the following are true:
+            // 1: the token is not valid (not ApiClientError)
+            // 2: if the api responded with 401 (ApiClientError with status 401)
             await this.sendUnauthEvents(events);
-            return;
         }
     }
 
     private async sendAuthEvents(events: TelemetryEvent<CommonProperties>[]): Promise<void> {
+        const accessToken = await this.getAccessToken();
+        if (!accessToken) {
+            throw new Error("No access token available");
+        }
         const authUrl = new URL("api/private/v1.0/telemetry/events", this.options.baseUrl);
         const response = await fetch(authUrl, {
             method: "POST",
             headers: {
                 Accept: "application/json",
                 "Content-Type": "application/json",
                 "User-Agent": this.options.userAgent,
-                Authorization: `Bearer ${this.accessToken}`,
+                Authorization: `Bearer ${accessToken}`,
             },
             body: JSON.stringify(events),
         });

src/server.ts

@@ -188,7 +188,7 @@ export class Server {
 
         if (this.userConfig.apiClientId && this.userConfig.apiClientSecret) {
             try {
-                await this.session.apiClient.hasValidAccessToken();
+                await this.session.apiClient.validateAccessToken();
             } catch (error) {
                 if (this.userConfig.connectionString === undefined) {
                     console.error("Failed to validate MongoDB Atlas the credentials from the config: ", error);

tests/integration/helpers.ts

@@ -61,7 +61,8 @@ export function setupIntegrationTest(getUserConfig: () => UserConfig): Integrati
         // Mock hasValidAccessToken for tests
         if (userConfig.apiClientId && userConfig.apiClientSecret) {
             const mockFn = jest.fn<() => Promise<boolean>>().mockResolvedValue(true);
-            session.apiClient.hasValidAccessToken = mockFn;
+            // @ts-expect-error accessing private property for testing
+            session.apiClient.validateAccessToken = mockFn;
         }
 
         userConfig.telemetry = "disabled";

tests/unit/apiClient.test.ts

@@ -95,7 +95,7 @@ describe("ApiClient", () => {
     });
 
     describe("sendEvents", () => {
-        it("should send events to authenticated endpoint when token is available", async () => {
+        it("should send events to authenticated endpoint when token is available and valid", async () => {
             const mockFetch = jest.spyOn(global, "fetch");
             mockFetch.mockResolvedValueOnce(new Response(null, { status: 200 }));
 
@@ -114,12 +114,12 @@ describe("ApiClient", () => {
             });
         });
 
-        it("should fall back to unauthenticated endpoint when token is not available", async () => {
+        it("should fall back to unauthenticated endpoint when token is not available via exception", async () => {
             const mockFetch = jest.spyOn(global, "fetch");
             mockFetch.mockResolvedValueOnce(new Response(null, { status: 200 }));
 
             // @ts-expect-error accessing private property for testing
-            apiClient.getAccessToken = jest.fn().mockResolvedValue(undefined);
+            apiClient.getAccessToken = jest.fn().mockRejectedValue(new Error("No access token available"));
 
             await apiClient.sendEvents(mockEvents);