Comparer le texte

Encuentra la diferencia entre dos archivos de texto

Real-time diff

Unified diff

Collapse lines

Highlight change

Syntax highlighting

Outils

Diffchecker Desktop The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!Get Desktop

Test

Created 2 years agoDiff never expires

Lines
Total
Removed

Words
Total
Removed

To continue using this feature, upgrade to Diffchecker Pro View Pricing

157 lines

Lines
Total
Added

Words
Total
Added

To continue using this feature, upgrade to Diffchecker Pro View Pricing

224 lines

var thisO = Get('ivanti_AzureADint#', "$(RecId)");

var serverURL="$(SecureServerURL())";

console.log(" Get vars");

var client_tenant_id = thisO.Fields['ClientTenantID'];

var client_secret = thisO.Fields['ClientSecret'];

var client_id = thisO.Fields['ClientID'];

var bTestMode = thisO.Fields['TestMode'] == 1;

var client_api = thisO.Fields['API_Key'];

//What will be used as primary key

//NOTE: This will overwrite other values not designated as primary key

var useEmail = thisO.Fields['useEmail'] == 1;

var useUPN = thisO.Fields['useLogin'] == 1;

var useAzureID = thisO.Fields['useGUID'] == 1;

//Build my filter

var sMasterToken = {};

//Filter?

var sFltr = thisO.Fields['ADFilter'];

var sEndpoint = 'https://login.microsoftonline.com/' + client_tenant_id + '/oauth2/v2.0/token';

console.log(" Setting tokens " + sEndpoint);

function byteLength(str) {

// returns the byte length of an utf8 string

var s = str.length;

for (var i=str.length-1; i>=0; i--) {

var code = str.charCodeAt(i);

if (code > 0x7f && code <= 0x7ff) s++;

else if (code > 0x7ff && code <= 0xffff) s+=2;

if (code >= 0xDC00 && code <= 0xDFFF) i--; //trail surrogate

}

return s;

}

var sBodyToPass = 'client_id='+ client_id + '&Client_secret='+ client_secret + '&grant_type=client_credentials&scope=https://graph.microsoft.com/.default';

var byteL = byteLength(sBodyToPass);

const Params = {

Headers: {

'Content-Type': "application/x-www-form-urlencoded",

'Accept': '*/*',

'Content-Length' : byteL,

'Accept-Encoding' : 'gzip, deflate, br'

}

};

// End of WWW encode

var resp = ExecuteWebRequest("POST", sEndpoint, sBodyToPass, Params);

if ((resp != null) && (resp.StatusCode == 200)) {

console.log(" Status code " + resp.StatusCode + " " + JSON.stringify(JSON.parse(resp.Data)) + " ");

//Let us extract the access token

var accessToken = JSON.parse(resp.Data).access_token;

var tokenType = JSON.parse(resp.Data).token_type;

sMasterToken = accessToken;

console.log("Access token is " + accessToken + " and type is " + tokenType);

runMe(accessToken, sEndpoint);

} else {

console.log(" Status code is not successfull " + resp.StatusCode + " ");

console.log(JSON.stringify(resp.Data) + " ")

}

//REST INSERT

function HTTPinsertEmp(struct) {

console.log(" Insert HTTP");

let myHeader = {

Headers: {

"SkipServerCertificateValidation": true,

"AllowAutoRedirect": false,

"Authorization": "rest_api_key=" + client_api,

"Content-Type": "application/json"

}

};

let sEndP = serverURL + "api/odata/businessobject/employees";

console.log(" Tenant URL s " + sEndP + " ");

let rIns = ExecuteWebRequest("POST", sEndP, JSON.stringify(struct), myHeader);

if ((rIns != null) && (rIns.StatusCode == 200)) {

} else {

console.log(" Insert Failed! " + rIns.StatusCode + " ");

console.log(JSON.stringify(rIns.Data) + " ")

}

};

//Insert Queue

function HTTPinsertQueue(struct) {

console.log(" Insert HTTP QUEUE");

let myHeader = {

Headers: {

"SkipServerCertificateValidation": true,

"AllowAutoRedirect": false,

"Authorization": "rest_api_key=" + client_api,

"Content-Type": "application/json"

}

};

let sEndP = serverURL + "api/odata/businessobject/AzureADQueues";

console.log(" Tenant URL s " + sEndP + " ");

let oJ = {

ParentRECID: "$(RecId)",

JSONVal: JSON.stringify(struct)

}

let rIns = ExecuteWebRequest("POST", sEndP, JSON.stringify(oJ), myHeader);

if ((rIns != null) && (rIns.StatusCode == 200)) {

} else {

console.log(" Department Insert Failed! " + rIns.StatusCode + " ");

console.log(JSON.stringify(rIns.Data) + " ")

}

};

// Function to convert the "ExtensionAttribute" collection to one "ExtensionAttribute": "String"

function ConvertExtensionAttributesToString(jsonString) {

console.error("Entering extension attribute " + jsonString);

var isDone = false;

var convertedString = "";

var start = jsonString.indexOf('onPremisesExtensionAttributes\":{');

if (start == -1)

{

isDone = true;

convertedString = jsonString;

return [isDone, convertedString];

}

var extensionAttributesStringFirst = jsonString.substring(0,start);

var extensionAttributesStringSecond = jsonString.substring(start,jsonString.length);

var replacementString = '\}"';

extensionAttributesStringSecond = extensionAttributesStringSecond.replace('onPremisesExtensionAttributes\":{', 'onPremisesExtensionAttributes\":\"\{');

extensionAttributesStringSecond = extensionAttributesStringSecond.replace('}', replacementString);

var bracketEnd = extensionAttributesStringSecond.indexOf('}');

var bracketStart = extensionAttributesStringSecond.indexOf('{');

var extentionAttributeModifiedString = extensionAttributesStringSecond.substring(bracketStart, bracketEnd+1).replace(/"/g, '\\\"');

console.error("Printing extentionAtrributeModified " + extentionAttributeModifiedString);

isDone = false;

convertedString = extensionAttributesStringFirst+extensionAttributesStringSecond;

console.error("after extension attribute " + convertedString);

return [isDone, convertedString];

}

// Function to update all extensionAttributes in the startingJsonString

function RunConversionUntilComplete(startingJsonString){

console.error("Checking startingJsonString"+ startingJsonString );

var currentJsonString = startingJsonString;

// Replace every \" with "

currentJsonString = currentJsonString.replace(/\\\"/g, '\"');

// Remove first and last quote to avoid case where we have extra \" at start and end

currentJsonString = currentJsonString.substring(1, currentJsonString.length-1);

// TODO: Address this end condition, should it be X iterations or run for Y seconds? Should we get # of entries within JSON struct?

var recordCount = (startingJsonString.match(/givenName/g) || []).length;

for(var i = 0; i < recordCount; ++i)

{

const result = ConvertExtensionAttributesToString(currentJsonString);

if (result[0])

{

break;

}

currentJsonString = result[1];

}

// Put back our JSON brackets removed above

currentJsonString = '{' + currentJsonString + '}';

return currentJsonString;

}

// Main loop

function runMe(token, url) {

//Get User list

const userParams = {

Headers: {

'Authorization': 'Bearer ' + token,

'Content-Type': 'application/json'

'Content-Type': 'application/json',

'ConsistencyLevel':'eventual'

SkipServerCertificateValidation: true,

AllowAutoRedirect: false

};

var sUsers = 'https://graph.microsoft.com/v1.0/users?$top=200';

var sUsers = 'https://graph.microsoft.com/v1.0/users?$count=true&$select=companyName,businessPhones,displayName,givenName,id,jobTitle,mail,mobilePhone,officeLocation,surname,userPrincipalName,accountEnabled,city,department,state,streetAddress,postalCode,country,lastPasswordChangeDateTime,onPremisesExtensionAttributes';

console.log(" FILTER " + sFltr);

if (sFltr !== null && sFltr != '' && sFltr !== undefined) sUsers = sUsers + "&$filter=" + sFltr;

//sUsers = "https://graph.microsoft.com/v1.0/users?$filter=givenName eq 'user'";

var usersList = ExecuteWebRequest("GET", sUsers, null, userParams);

if ((usersList != null) && (usersList.StatusCode == 200 || usersList.StatusCode == 201)) {

//console.log(' ' + JSON.stringify(usersList.Data) );

let JS = JSON.parse(usersList.Data);

let JS = JSON.parse(RunConversionUntilComplete(JSON.stringify(JSON.parse(usersList.Data))));

if (JS) HTTPinsertQueue(JS);

let skipURL = JS['@odata.nextLink'];

thisO.Update({DebugText : JSON.stringify(usersList.Data)});

if (!bTestMode)

{

while (skipURL){

console.log(' skipURL is ' + skipURL);

let usersList1 = ExecuteWebRequest("GET", skipURL, null, userParams);

if ((usersList1 != null) && (usersList1.StatusCode == 200 || usersList1.StatusCode == 201)) {

//thisO.Update({DebugText : JSON.stringify(usersList1.Data)});

let JS = JSON.parse(usersList1.Data);

let JS = JSON.parse(RunConversionUntilComplete(JSON.stringify(JSON.parse(usersList1.Data))));

let skipURL = JS['@odata.nextLink'];

if (JS) HTTPinsertQueue(JS);

}

} else

{

console.log(" Status code is not successfull " + usersList.StatusCode + " ");

console.log(JSON.stringify(usersList.Data) + " ")

}

Les différences enregistrées

Texte d'origine

Ouvrir un fichier

var thisO = Get('ivanti_AzureADint#', "$(RecId)");
var serverURL="$(SecureServerURL())";

console.log(" Get vars");
var client_tenant_id = thisO.Fields['ClientTenantID'];
var client_secret = thisO.Fields['ClientSecret'];
var client_id = thisO.Fields['ClientID'];
var bTestMode = thisO.Fields['TestMode'] == 1;
var client_api = thisO.Fields['API_Key'];
//What will be used as primary key
//NOTE: This will overwrite other values not designated as primary key
var useEmail = thisO.Fields['useEmail'] == 1;
var useUPN = thisO.Fields['useLogin'] == 1;
var useAzureID = thisO.Fields['useGUID'] == 1;

//Build my filter
var sMasterToken = {};
//Filter?
var sFltr = thisO.Fields['ADFilter'];

var sEndpoint = 'https://login.microsoftonline.com/' + client_tenant_id + '/oauth2/v2.0/token';
console.log(" Setting tokens " + sEndpoint);

function byteLength(str) {
 // returns the byte length of an utf8 string
 var s = str.length;
 for (var i=str.length-1; i>=0; i--) {
 var code = str.charCodeAt(i);
 if (code > 0x7f && code <= 0x7ff) s++;
 else if (code > 0x7ff && code <= 0xffff) s+=2;
 if (code >= 0xDC00 && code <= 0xDFFF) i--; //trail surrogate
 }
 return s;
}

var sBodyToPass = 'client_id='+ client_id + '&Client_secret='+ client_secret + '&grant_type=client_credentials&scope=https://graph.microsoft.com/.default';
var byteL = byteLength(sBodyToPass);

//REST INSERT
function HTTPinsertEmp(struct) {
 console.log(" Insert HTTP");
 let myHeader = { 
 Headers: {
 "SkipServerCertificateValidation": true,
 "AllowAutoRedirect": false,
 "Authorization": "rest_api_key=" + client_api,
 "Content-Type": "application/json"
 }
 };
 let sEndP = serverURL + "api/odata/businessobject/employees";
 console.log(" Tenant URL s " + sEndP + " ");
 let rIns = ExecuteWebRequest("POST", sEndP, JSON.stringify(struct), myHeader);
 if ((rIns != null) && (rIns.StatusCode == 200)) {

} else {
 console.log(" Insert Failed! " + rIns.StatusCode + " ");
 console.log(JSON.stringify(rIns.Data) + " ")
 }
};

//Insert Queue
function HTTPinsertQueue(struct) {
 console.log(" Insert HTTP QUEUE");
 let myHeader = { 
 Headers: {
 "SkipServerCertificateValidation": true,
 "AllowAutoRedirect": false,
 "Authorization": "rest_api_key=" + client_api,
 "Content-Type": "application/json"
 }
 };
 let sEndP = serverURL + "api/odata/businessobject/AzureADQueues";
 console.log(" Tenant URL s " + sEndP + " ");
 let oJ = {
 ParentRECID: "$(RecId)",
 JSONVal: JSON.stringify(struct)
 }
 let rIns = ExecuteWebRequest("POST", sEndP, JSON.stringify(oJ), myHeader);
 if ((rIns != null) && (rIns.StatusCode == 200)) {

} else {
 console.log(" Department Insert Failed! " + rIns.StatusCode + " ");
 console.log(JSON.stringify(rIns.Data) + " ")
 }
};

// Main loop
function runMe(token, url) {
 //Get User list
 	const userParams = {
	 Headers: {
	 'Authorization': 'Bearer ' + token,
	 'Content-Type': 'application/json'
	 },
	 SkipServerCertificateValidation: true,
	 AllowAutoRedirect: false
	 };
	var sUsers = 'https://graph.microsoft.com/v1.0/users?$top=200';
	console.log(" FILTER " + sFltr);
	if (sFltr !== null && sFltr != '' && sFltr !== undefined) sUsers = sUsers + "&$filter=" + sFltr;
 //sUsers = "https://graph.microsoft.com/v1.0/users?$filter=givenName eq 'user'";
 
	var usersList = ExecuteWebRequest("GET", sUsers, null, userParams);
	if ((usersList != null) && (usersList.StatusCode == 200 || usersList.StatusCode == 201)) {
		//console.log(' ' + JSON.stringify(usersList.Data) );
		let JS = JSON.parse(usersList.Data);
		if (JS) HTTPinsertQueue(JS);
		let skipURL = JS['@odata.nextLink'];
		thisO.Update({DebugText : JSON.stringify(usersList.Data)});
	if (!bTestMode)
		{
		while (skipURL){
			console.log(' skipURL is ' + skipURL);
				let usersList1 = ExecuteWebRequest("GET", skipURL, null, userParams);
				if ((usersList1 != null) && (usersList1.StatusCode == 200 || usersList1.StatusCode == 201)) {
					//thisO.Update({DebugText : JSON.stringify(usersList1.Data)});
					let JS = JSON.parse(usersList1.Data);
					let skipURL = JS['@odata.nextLink'];
					if (JS) HTTPinsertQueue(JS);
				}
			}
		}
	} else
	{
	 console.log(" Status code is not successfull " + usersList.StatusCode + " ");
 	console.log(JSON.stringify(usersList.Data) + " ")
	}
	
}

Texte modifié

Ouvrir un fichier

var thisO = Get('ivanti_AzureADint#', "$(RecId)");
var serverURL="$(SecureServerURL())";

//Build my filter
var sMasterToken = {};
//Filter?
var sFltr = thisO.Fields['ADFilter'];

var sEndpoint = 'https://login.microsoftonline.com/' + client_tenant_id + '/oauth2/v2.0/token';
console.log(" Setting tokens " + sEndpoint);

var sBodyToPass = 'client_id='+ client_id + '&Client_secret='+ client_secret + '&grant_type=client_credentials&scope=https://graph.microsoft.com/.default';
var byteL = byteLength(sBodyToPass);

} else {
 console.log(" Insert Failed! " + rIns.StatusCode + " ");
 console.log(JSON.stringify(rIns.Data) + " ")
 }
};

} else {
 console.log(" Department Insert Failed! " + rIns.StatusCode + " ");
 console.log(JSON.stringify(rIns.Data) + " ")
 }
};
// Function to convert the "ExtensionAttribute" collection to one "ExtensionAttribute": "String"
function ConvertExtensionAttributesToString(jsonString) {

console.error("Entering extension attribute " + jsonString);

var isDone = false;
	var convertedString = "";
	var start = jsonString.indexOf('onPremisesExtensionAttributes\":{');
  	
  	if (start == -1)
    {
    	isDone = true;
    	convertedString = jsonString;
      	return [isDone, convertedString];
    }
  
	var extensionAttributesStringFirst = jsonString.substring(0,start);
  	var extensionAttributesStringSecond = jsonString.substring(start,jsonString.length);
  
  	var replacementString = '\}"';

extensionAttributesStringSecond = extensionAttributesStringSecond.replace('onPremisesExtensionAttributes\":{', 'onPremisesExtensionAttributes\":\"\{'); 
	extensionAttributesStringSecond = extensionAttributesStringSecond.replace('}', replacementString);

var bracketEnd = extensionAttributesStringSecond.indexOf('}');
	var bracketStart = extensionAttributesStringSecond.indexOf('{');

var extentionAttributeModifiedString = extensionAttributesStringSecond.substring(bracketStart, bracketEnd+1).replace(/"/g, '\\\"');
	console.error("Printing extentionAtrributeModified " + extentionAttributeModifiedString);

extensionAttributesStringSecond = extensionAttributesStringSecond.substring(0, bracketStart) + extentionAttributeModifiedString + extensionAttributesStringSecond.substring(bracketEnd + 1, extensionAttributesStringSecond.length);
	
  	isDone = false;
  	convertedString = extensionAttributesStringFirst+extensionAttributesStringSecond;

console.error("after extension attribute " + convertedString);
  	
  	return [isDone, convertedString];
}

// Function to update all extensionAttributes in the startingJsonString
function RunConversionUntilComplete(startingJsonString){

console.error("Checking startingJsonString"+ startingJsonString );
	var currentJsonString = startingJsonString;
	// Replace every \" with "
	currentJsonString = currentJsonString.replace(/\\\"/g, '\"');
	// Remove first and last quote to avoid case where we have extra \" at start and end
	currentJsonString = currentJsonString.substring(1, currentJsonString.length-1);
	
	// TODO: Address this end condition, should it be X iterations or run for Y seconds? Should we get # of entries within JSON struct?
	var recordCount = (startingJsonString.match(/givenName/g) || []).length;
	for(var i = 0; i < recordCount; ++i)
	{
		 const result = ConvertExtensionAttributesToString(currentJsonString);

if (result[0])
		{
		  break;
		}
		currentJsonString = result[1];
	}
	
	// Put back our JSON brackets removed above
	currentJsonString = '{' + currentJsonString + '}';
	
	return currentJsonString;
}

// Main loop
function runMe(token, url) {
 //Get User list
 	const userParams = {
	 Headers: {
	 'Authorization': 'Bearer ' + token,
	 'Content-Type': 'application/json',
	 'ConsistencyLevel':'eventual'
	 },
	 SkipServerCertificateValidation: true,
	 AllowAutoRedirect: false
	 };
	var sUsers = 'https://graph.microsoft.com/v1.0/users?$count=true&$select=companyName,businessPhones,displayName,givenName,id,jobTitle,mail,mobilePhone,officeLocation,surname,userPrincipalName,accountEnabled,city,department,state,streetAddress,postalCode,country,lastPasswordChangeDateTime,onPremisesExtensionAttributes';
	console.log(" FILTER " + sFltr);
	if (sFltr !== null && sFltr != '' && sFltr !== undefined) sUsers = sUsers + "&$filter=" + sFltr;
 //sUsers = "https://graph.microsoft.com/v1.0/users?$filter=givenName eq 'user'";
 
	var usersList = ExecuteWebRequest("GET", sUsers, null, userParams);
	if ((usersList != null) && (usersList.StatusCode == 200 || usersList.StatusCode == 201)) {
		//console.log(' ' + JSON.stringify(usersList.Data) );
		let JS = JSON.parse(RunConversionUntilComplete(JSON.stringify(JSON.parse(usersList.Data))));
		if (JS) HTTPinsertQueue(JS);
		let skipURL = JS['@odata.nextLink'];
		thisO.Update({DebugText : JSON.stringify(usersList.Data)});
	if (!bTestMode)
		{
		while (skipURL){
			console.log(' skipURL is ' + skipURL);
				let usersList1 = ExecuteWebRequest("GET", skipURL, null, userParams);
				if ((usersList1 != null) && (usersList1.StatusCode == 200 || usersList1.StatusCode == 201)) {
					//thisO.Update({DebugText : JSON.stringify(usersList1.Data)});
					let JS = JSON.parse(RunConversionUntilComplete(JSON.stringify(JSON.parse(usersList1.Data))));
					let skipURL = JS['@odata.nextLink'];
					if (JS) HTTPinsertQueue(JS);
				}
			}
		}
	} else
	{
	 console.log(" Status code is not successfull " + usersList.StatusCode + " ");
 	console.log(JSON.stringify(usersList.Data) + " ")
	}
	
}