sailpoint-api-client 1.6.2 → 1.6.3

package/dist/v3/common.js

@@ -250,7 +250,7 @@ var createRequestFunction = function (axiosArgs, globalAxios, BASE_PATH, configu
         if (axios === void 0) { axios = globalAxios; }
         if (basePath === void 0) { basePath = BASE_PATH; }
         (0, axios_retry_1.default)(axios, configuration.retriesConfig);
-        var headers = __assign(__assign({ 'User-Agent': 'OpenAPI-Generator/1.6.2/ts' }, axiosArgs.axiosOptions.headers), { 'X-SailPoint-SDK': 'typescript-1.6.2' });
+        var headers = __assign(__assign({ 'User-Agent': 'OpenAPI-Generator/1.6.3/ts' }, axiosArgs.axiosOptions.headers), { 'X-SailPoint-SDK': 'typescript-1.6.3' });
         if (!configuration.experimental && ("X-SailPoint-Experimental" in headers)) {
             throw new Error("You are using Experimental APIs. Set configuration.experimental = True to enable these APIs in the SDK.");
         }

package/index.spec.ts

@@ -1,5 +1,4 @@
-import { AccountsBetaApi, ConnectorsBetaApi, IdentityProfilesBetaApi, Paginator, Search, SourcesBetaApi, TransformsApi, AccountsV2024Api, TransformsV2024Api, IdentitiesBetaApiFp, IdentitiesV2024Api } from "./index"
-import { AccountsApi, Configuration, SearchApi } from "./index"
+import { AccountsApi, AccountsBetaApi, AccountsV2024Api, Configuration, ConnectorsBetaApi, IdentitiesV2024Api, IdentityProfilesBetaApi, Paginator, Search, SearchApi, SearchV2024, SearchV2024Api, SearchV2025, SearchV2025Api, SourcesBetaApi, TransformsApi, TransformsV2024Api } from "./index"
 
 describe('Test_v3', () => {
     it('Test List Accounts', async () => {
@@ -136,4 +135,47 @@ describe('Test_v2024', () => {
         expect(resp.data.length).toStrictEqual(10)
         expect(resp.status).toStrictEqual(200)
     }, 30000)
+
+
+    it('Test paginate search API with V2024', async () => {
+        let apiConfig = new Configuration()
+        let api = new SearchV2024Api(apiConfig)
+        
+        let search: SearchV2024 = {
+            indices: [
+                "identities"
+            ],
+            query: {
+                query: "*"
+            },
+            sort: ["-name"]
+        }
+        const resp = await Paginator.paginateSearchApi(api, search, 10, 100)
+    
+        expect(resp.data.length).toStrictEqual(100)
+        expect(resp.status).toStrictEqual(200)
+    }, 30000)
 })
+
+
+describe('Test_v2025', () => {
+
+        it('Test paginate search API with V2025', async () => {
+        let apiConfig = new Configuration()
+        let api = new SearchV2025Api(apiConfig)
+        
+        let search: SearchV2025 = {
+            indices: [
+                "identities"
+            ],
+            query: {
+                query: "*"
+            },
+            sort: ["-name"]
+        }
+        const resp = await Paginator.paginateSearchApi(api, search, 10, 100)
+    
+        expect(resp.data.length).toStrictEqual(100)
+        expect(resp.status).toStrictEqual(200)
+    }, 30000)
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sailpoint-api-client",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "description": "Official library for using the SailPoint API",
   "author": "SailPoint DevOps",
   "repository": {

package/paginator.ts

@@ -6,6 +6,20 @@ import {
   SearchDocument,
 } from "./v3";
 
+import {
+  SearchDocumentV2024,
+  SearchV2024,
+  SearchV2024Api,
+  SearchV2024ApiSearchPostRequest,
+} from "./v2024/api";
+
+import {
+  SearchDocumentV2025,
+  SearchV2025,
+  SearchV2025Api,
+  SearchV2025ApiSearchPostRequest,
+} from "./v2025/api";
+
 export interface PaginationParams {
   /**
    * Max number of results to return. See [V3 API Standard Collection Parameters](https://developer.sailpoint.com/idn/api/standard-collection-parameters) for more information.
@@ -38,6 +52,34 @@ export interface ExtraParams {
   [key: string]: any;
 }
 
+interface SearchApiTypeMap {
+  SearchApi: {
+    search: Search;
+    searchParams: SearchApiSearchPostRequest;
+    document: SearchDocument;
+  };
+  SearchV2024Api: {
+    search: SearchV2024;
+    searchParams: SearchV2024ApiSearchPostRequest;
+    document: SearchDocumentV2024;
+  };
+  SearchV2025Api: {
+    search: SearchV2025;
+    searchParams: SearchV2025ApiSearchPostRequest;
+    document: SearchDocumentV2025;
+  };
+}
+
+// Create a union type for all possible API types
+type ApiType = keyof SearchApiTypeMap;
+
+// Define the actual API instances mapping
+type ApiInstanceMap = {
+  SearchApi: SearchApi;
+  SearchV2024Api: SearchV2024Api;
+  SearchV2025Api: SearchV2025Api;
+};
+
 export class Paginator {
   public static async paginate<
     T,
@@ -75,20 +117,17 @@ export class Paginator {
     }
   }
 
-  public static async paginateSearchApi(
-    searchAPI: SearchApi,
-    search: Search,
+  public static async paginateSearchApi<T extends ApiType>(
+    searchAPI: ApiInstanceMap[T],
+    search: SearchApiTypeMap[T]['search'],
     increment?: number,
     limit?: number
-  ): Promise<AxiosResponse<SearchDocument[], any>> {
+  ): Promise<AxiosResponse<SearchApiTypeMap[T]['document'][], any>> {
     increment = increment ? increment : 250;
-    const searchParams: SearchApiSearchPostRequest = {
-      search: search,
-      limit: increment,
-    };
+    
     let offset = 0;
     const maxLimit = limit ? limit : 0;
-    let modified: SearchDocument[] = [];
+    let modified: SearchApiTypeMap[T]['document'][] = [];
 
     if (!search.sort || search.sort.length != 1) {
       throw "search must include exactly one sort parameter to paginate properly";
@@ -96,8 +135,33 @@ export class Paginator {
 
     while (true) {
       console.log(`Paginating call, offset = ${offset}`);
-      let results = await searchAPI.searchPost(searchParams);
+      let results: AxiosResponse<SearchApiTypeMap[T]['document'][], any>;
+      
+      // Handle each API type separately to avoid type conflicts
+      if (searchAPI instanceof SearchApi) {
+        const searchParams: SearchApiSearchPostRequest = {
+          search: search as Search,
+          limit: increment,
+        };
+        results = await (searchAPI as SearchApi).searchPost(searchParams) as AxiosResponse<SearchApiTypeMap[T]['document'][], any>;
+      } else if (searchAPI instanceof SearchV2024Api) {
+        const searchParams: SearchV2024ApiSearchPostRequest = {
+          searchV2024: search as SearchV2024,
+          limit: increment,
+        };
+        results = await (searchAPI as SearchV2024Api).searchPost(searchParams) as AxiosResponse<SearchApiTypeMap[T]['document'][], any>;
+      } else if (searchAPI instanceof SearchV2025Api) {
+        const searchParams: SearchV2025ApiSearchPostRequest = {
+          searchV2025: search as SearchV2025,
+          limit: increment,
+        };
+        results = await (searchAPI as SearchV2025Api).searchPost(searchParams) as AxiosResponse<SearchApiTypeMap[T]['document'][], any>;
+      } else {
+        throw new Error("Unsupported API type");
+      }
+      
       modified.push.apply(modified, results.data);
+      
       if (
         results.data.length < increment ||
         (modified.length >= maxLimit && maxLimit > 0)
@@ -106,9 +170,9 @@ export class Paginator {
         return results;
       } else {
         const result = <any>results.data[results.data.length - 1];
-        if (searchParams.search.sort) {
-          searchParams.search.searchAfter = [
-            result[searchParams.search.sort[0].replace("-", "")],
+        if (search.sort) {
+          (search as any).searchAfter = [
+            result[search.sort[0].replace("-", "")],
           ];
         } else {
           throw "search unexpectedly did not return a result we can search after!";

package/v2024/README.md

@@ -1,4 +1,4 @@
-## sailpoint-sdk@1.6.2
+## sailpoint-sdk@1.6.3
 
 This generator creates TypeScript/JavaScript client that utilizes [axios](https://github.com/axios/axios). The generated Node module can be used in the following environments:
 
@@ -36,7 +36,7 @@ navigate to the folder of your consuming project and run one of the following co
 _published:_
 
 ```
-npm install sailpoint-sdk@1.6.2 --save
+npm install sailpoint-sdk@1.6.3 --save
 ```
 
 _unPublished (not recommended):_