Remove test code + additional improvements to token manager

elastic · Jan 23, 2025 · 51ffc1d · 51ffc1d
1 parent c1f6591
commit 51ffc1d
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/...nectors/server/connector_types/microsoft_defender_endpoint/microsoft_defender_endpoint.ts b/...nectors/server/connector_types/microsoft_defender_endpoint/microsoft_defender_endpoint.ts
@@ -122,9 +122,7 @@ export class MicrosoftDefenderEndpointConnector extends SubActionConnector<
       responseSchema:
         MicrosoftDefenderEndpointDoNotValidateResponseSchema as unknown as SubActionRequestParams<R>['responseSchema'],
       headers: {
-        Authorization: `Bearer ${
-          '--invalid-test--' + (await this.oAuthToken.get(connectorUsageCollector))
-        }`,
+        Authorization: `Bearer ${await this.oAuthToken.get(connectorUsageCollector)}`,
       },
     };
     let response: AxiosResponse<R>;

diff --git a/...ack_connectors/server/connector_types/microsoft_defender_endpoint/o_auth_token_manager.ts b/...ack_connectors/server/connector_types/microsoft_defender_endpoint/o_auth_token_manager.ts
@@ -205,13 +205,42 @@ export class OAuthTokenManager {
 
     this.reGenerateNewTokenPromise = new Promise(async (resolve, reject) => {
       try {
+        const connectorTokenClient = this.params.services.connectorTokenClient;
+
         if (this.generatingNewTokenPromise) {
           this.logger.debug(
             `Waiting for current new token retrieval/generate to complete before performing proceeding with generating new one`
           );
           await this.generatingNewTokenPromise;
         }
 
+        // First check if the token was already updated by another instance of the connector and if so, then do nothing
+        if (this.connectorToken) {
+          const currentToken = this.connectorToken.token;
+          const latestStoredToken = await connectorTokenClient.get({
+            connectorId: this.params.connector.id,
+            tokenType: this.tokenType,
+          });
+
+          if (
+            latestStoredToken.connectorToken &&
+            latestStoredToken.connectorToken.token !== currentToken
+          ) {
+            this.logger.debug(
+              `Token has been updated since it was last read. Using it instead of generating a new one.\n${JSON.stringify(
+                {
+                  ...latestStoredToken.connectorToken,
+                  token: '[redacted]',
+                },
+                null,
+                2
+              )}`
+            );
+            this.connectorToken = latestStoredToken.connectorToken;
+            return resolve(undefined);
+          }
+        }
+
         await this.fetchAndStoreNewToken(connectorUsageCollector);
         this.connectorToken = null;