Rewrite of startEntitlementAggregation because of sailpoint-oss/typescript-sdk#36. Implementing startAccountAggregation because missing from SDK

Author: yannick-beot-sp

src/commands/source/importAccount.ts

@@ -35,12 +35,10 @@ class AccountImporter {
 
     protected async importFile(task: any, token: vscode.CancellationToken): Promise<void> {
         console.log("> AccountImporter.importFile");
-        const source = await this.client.getSourceById(this.sourceId);
 
         let job = await this.client.startAccountAggregation(
-            this.sourceCCId,
+            this.sourceId,
             false,
-            source.connectorAttributes["deleteThresholdPercentage"],
             this.fileUri.fsPath
         );
 

src/extension.ts

@@ -327,7 +327,7 @@ export function activate(context: vscode.ExtensionContext) {
 	context.subscriptions.push(
 		vscode.commands.registerCommand(commands.VALIDATE_CONNECTOR_RULE,
 			newConnectorRuleCommand.validateScript, newConnectorRuleCommand));
-	
+
 	const openScriptCommand = new OpenScriptCommand()
 	context.subscriptions.push(
 		vscode.commands.registerCommand(commands.EDIT_CONNECTOR_RULE,
@@ -464,15 +464,17 @@ export function activate(context: vscode.ExtensionContext) {
 			identityFilterCommand.execute, identityFilterCommand));
 	context.subscriptions.push(
 		vscode.commands.registerCommand(commands.IDENTITIES_ATT_SYNC,
-			newIdentityCommand.attSyncIdentity, newIdentityCommand));	
+			newIdentityCommand.attSyncIdentity, newIdentityCommand));
 	context.subscriptions.push(
 		vscode.commands.registerCommand(commands.IDENTITIES_DELETE,
-			newIdentityCommand.deleteIdentity, newIdentityCommand));	
+			newIdentityCommand.deleteIdentity, newIdentityCommand));
 	context.subscriptions.push(
 		vscode.commands.registerCommand(commands.IDENTITIES_PROCESS,
-			newIdentityCommand.processIdentity, newIdentityCommand));	
+			newIdentityCommand.processIdentity, newIdentityCommand));
 
 
+	// Add global interceptor for axios, to applied with the sailpoint SDK
+	// Add a request interceptor
 	axios.interceptors.request.use(onRequest)
 
 	// Add a response interceptor

src/services/ISCClient.ts

@@ -25,6 +25,7 @@ export const TOTAL_COUNT_HEADER = "x-total-count";
 // Content types
 const CONTENT_TYPE_JSON = "application/json";
 const CONTENT_TYPE_FORM_URLENCODED = "application/x-www-form-urlencoded";
+const CONTENT_TYPE_FORM_DATA = "multipart/form-data";
 const CONTENT_TYPE_FORM_JSON_PATCH = "application/json-patch+json";
 
 
@@ -107,12 +108,6 @@ export class ISCClient {
 			}
 
 		});
-		instance.interceptors.request.use(
-			onRequest);
-		instance.interceptors.response.use(
-			onResponse,
-			onErrorResponse
-		);
 		return instance;
 	}
 
@@ -219,13 +214,23 @@ export class ISCClient {
 		sourceID: string
 	): Promise<LoadEntitlementTaskBeta> {
 		console.log("> ISCClient.startEntitlementAggregation");
+		/* https://github.com/sailpoint-oss/typescript-sdk/issues/36
 		const apiConfig = await this.getApiConfiguration();
 		const api = new EntitlementsBetaApi(apiConfig);
 		const response = await api.importEntitlements({
 			id: sourceID,
 			csvFile: null
 		})
 		return response.data
+		*/
+		const endpoint = `beta/entitlements/aggregate/sources/${sourceID}`;
+		console.log("endpoint = " + endpoint);
+
+		const formData = new FormData();
+
+		const httpClient = await this.getAxios(CONTENT_TYPE_FORM_DATA);
+		const response = await httpClient.post(endpoint, formData);
+		return response.data;
 	}
 
 	public async startEntitlementReset(
@@ -253,32 +258,13 @@ export class ISCClient {
 	}
 
 	public async startAccountAggregation(
-		sourceID: number,
+		sourceID: string,
 		disableOptimization = false,
-		deleteThreshold: number | undefined = undefined,
 		filePath: string | undefined = undefined
 	): Promise<any> {
 		console.log("> ISCClient.startAccountAggregation");
-		/*
-				const apiConfig = await this.getApiConfiguration();
-				const api = new SourcesAggregationCCApi(apiConfig);
-				let requestParameter: SourcesAggregationCCApiLoadAccountsRequest;
-				if (disableOptimization) {
-					requestParameter = {
-						id: sourceID.toString(),
-						disableOptimization: disableOptimization
-					};
-				} else {
-					requestParameter = {
-						id: sourceID.toString()
-					};
-				}
-				const response = await api.loadAccounts(requestParameter);
-		
-				return response.data;
-		*/
 
-		const endpoint = `cc/api/source/loadAccounts/${sourceID}`;
+		const endpoint = `beta/sources/${sourceID}/load-accounts`;
 		console.log("endpoint = " + endpoint);
 
 		const formData = new FormData();
@@ -287,18 +273,15 @@ export class ISCClient {
 			formData.append("disableOptimization", "true");
 		}
 
-		if (deleteThreshold !== undefined) {
-			formData.append("update-delete-threshold-combobox-inputEl", `${deleteThreshold}%`);
-		}
-
 		if (filePath !== undefined) {
 			const blob = createReadStream(filePath);
 			formData.append('file', blob, basename(filePath));
 		}
 
-		const httpClient = await this.getAxios(CONTENT_TYPE_FORM_URLENCODED);
+		const httpClient = await this.getAxios(CONTENT_TYPE_FORM_DATA);
 		const response = await httpClient.post(endpoint, formData);
 		return response.data;
+	
 	}
 
 	public async resetSource(sourceID: number, skip: string | null = null): Promise<any> {

src/services/TreeManager.ts

@@ -121,7 +121,7 @@ export class TreeManager {
 
         const client = new ISCClient(item.tenantId, item.tenantName);
 
-        await vscode.window.withProgress({
+        return await vscode.window.withProgress({
             location: vscode.ProgressLocation.Notification,
             title: `Resetting accounts from ${item.label}`,
             cancellable: true
@@ -134,7 +134,7 @@ export class TreeManager {
                 "Warning during account reset of {0}: {1}",
                 "Reset of accounts for {0} failed: {1}: {2}"
             )
-            return undefined;
+            return task;
         });
     }
 
@@ -155,51 +155,27 @@ export class TreeManager {
                 "Aggregation of entitlements for {0} failed: {1}: {2}"
             )
         });
-
     }
 
-    public async aggregateSource(item: SourceTreeItem, disableOptimization = false, type = "accounts"): Promise<void> {
+    public async aggregateSource(item: SourceTreeItem, disableOptimization = false): Promise<void> {
         console.log("> aggregateSource", item, disableOptimization);
-        // assessing that item is a SourceTreeItem
-        if (item === undefined || !(item instanceof SourceTreeItem)) {
-            console.log("WARNING: aggregateSource: invalid item", item);
-            throw new Error("aggregateSource: invalid item");
-        }
+
         const client = new ISCClient(item.tenantId, item.tenantName);
         await vscode.window.withProgress({
             location: vscode.ProgressLocation.Notification,
-            title: `Aggregation of ${type} from ${item.label}`,
-            cancellable: false
+            title: `Aggregation accounts from ${item.label}`,
+            cancellable: true
         }, async (progress, token) => {
-            let job: any;
-            let jobType: AggregationJob;
-            if ("accounts" === type) {
-
-                job = await client.startAccountAggregation(item.ccId, disableOptimization)
-                    .catch(error => {
-                        console.error(error);
-                    });
-                jobType = AggregationJob.CLOUD_ACCOUNT_AGGREGATION;
-            }
-            console.log("job =", job);
-            let task: any | null = null;
-            do {
-                await delay(5000);
-                task = await client.getAggregationJob(item.ccId, job.task.id, jobType);
-                console.log("task =", task);
-
-            } while (task !== undefined && task.status === "PENDING");
-            if (task !== undefined) {
-                if (task.status === "SUCCESS") {
-                    vscode.window.showInformationMessage(`Source ${task.object.displayName} successfully aggregated`);
-                } else if (task.status === "WARNING") {
-                    vscode.window.showWarningMessage(
-                        `Warning during aggregation of ${task.object.displayName}: ${task.details?.messages?.Warn}`);
-                } else {
-                    vscode.window.showErrorMessage(
-                        `Aggregation of ${task.object.displayName} failed: ${task.status}: ${task.details?.messages?.Error}`);
-                }
-            };
+
+
+            const job = await client.startAccountAggregation(item.id!, disableOptimization)
+            const task = await this.waifForJob(client, job.task.id, token)
+            this.formatTask(task,
+                item.label as string,
+                "Source {0} successfully aggregated",
+                "Warning during aggregation of {0}: {1}",
+                "Aggregation of {0} failed: {1}: {2}"
+            )
         });
     }