Discharge7443/fleet
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

Website: update compliance proxy script (#31181)

Browse Source 
Changes:
- Updated the `send-entra-heartbeat-requests` script to send the correct
headers to the `PartnerTenantHeartbeat` endpoint for compliance partner
tenants.
- Fixed a typo in the `send-entra-heartbeat-requests` script
This commit is contained in:
Eric
2025-07-23 11:29:03 -05:00
committed by GitHub
parent 2c773ae346
commit 20658b5657
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/scripts/send-entra-heartbeat-requests.js
Vendored
+11 -10
View File
@@ -10,7 +10,7 @@ module.exports = {
fn: async function () {
// Find all MicrosoftComplianceTenant records with setupComplete: true
let allActiveEntraTenants = await MicrosoftComplianceTenant.find({setupComplete: true});
let allActiveEntraTenants = await MicrosoftComplianceTenant.find({setupCompleted: true});
sails.log('Syncing hearbeat requests for '+allActiveEntraTenants.length+(allActiveEntraTenants.length > 1 ? ' tenants.' : ' tenant.'));
@@ -33,29 +33,30 @@ module.exports = {
let accessToken = tokenAndApiUrls.manageApiAccessToken;
let tenantDataSyncUrl = tokenAndApiUrls.tenantDataSyncUrl;
let isoTimestampForThisRequest = new Date().toISOString();
// Send a heartbeat request.
let tenantHeartbeatResponse = await sails.helpers.http.sendHtttpRequest.with({
let tenantHeartbeatResponse = await sails.helpers.http.sendHttpRequest.with({
method: 'PUT',
url: `${tenantDataSyncUrl}/PartnerTenantHeartbeat(guid'${encodeURIComponent(entraTenant.entraTenantId)}')?api-version=1.6`,
headers: {
'Authorization': `Bearer ${accessToken}`
'Authorization': `Bearer ${accessToken}`,
'Content-Type': 'application/json',
'Prefer': 'return-content'
},
body: {
Timestamp: new Date().toISOString(),
Timestamp: isoTimestampForThisRequest,
}
}).tolerate((err)=>{
errorReportById[connectionIdAsString] = new Error(`Could not send a heartbeat request for a MicrosoftComplianceTenant (id: ${connectionIdAsString}). Full error: ${err}`);
errorReportById[connectionIdAsString] = new Error(`Could not send a heartbeat request for a MicrosoftComplianceTenant (id: ${connectionIdAsString}). Full error: ${require('util').inspect(err, {depth: null})}`);
});
if(errorReportById[connectionIdAsString]){// If there was an error with the previous request, bail early for this Entra tenant.
return;
}
let parsedtenantHeartbeatResponse;
try {
parsedtenantHeartbeatResponse = JSON.parse(tenantHeartbeatResponse);
parsedtenantHeartbeatResponse = JSON.parse(tenantHeartbeatResponse.body);
} catch(err){
errorReportById[connectionIdAsString] = new Error(`Could not parse the JSON response of a heartbeat request for a Microsoft compliance tenant (id: ${connectionIdAsString}). Full error: ${err}`);
errorReportById[connectionIdAsString] = new Error(`Could not parse the JSON response of a heartbeat request for a Microsoft compliance tenant (id: ${connectionIdAsString}). Full error: ${require('util').inspect(err, {depth: null})}`);
}
if(errorReportById[connectionIdAsString]){// If there was an error with the previous request, bail early for this Entra tenant.
@@ -66,7 +67,7 @@ module.exports = {
// TODO: do we want to do anything about the resync timestamp if it is set?
}
await MicrosoftComplianceTenant.updateOne({id: entraTenant.id}).with({
await MicrosoftComplianceTenant.updateOne({id: entraTenant.id}).set({
lastHeartbeatAt: Date.now(),
});
});