sailpoint-api-client 1.0.3 → 1.1.0

package/cc/common.ts

@@ -134,8 +134,8 @@ export const toPathString = function (url: URL) {
 export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) {
     return <T = unknown, R = AxiosResponse<T>>(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
         axiosRetry(globalAxios, configuration.retriesConfig)
-        axiosArgs.axiosOptions.headers['X-SailPoint-SDK'] = 'typescript-1.0.3'
-        axiosArgs.axiosOptions.headers['User-Agent'] = 'OpenAPI-Generator/1.0.3/ts'
+        axiosArgs.axiosOptions.headers['X-SailPoint-SDK'] = 'typescript-1.1.0'
+        axiosArgs.axiosOptions.headers['User-Agent'] = 'OpenAPI-Generator/1.1.0/ts'
         const axiosRequestArgs = {...axiosArgs.axiosOptions, url: (configuration?.basePathCC || basePath) + axiosArgs.url};
         return axios.request<T, R>(axiosRequestArgs);
     };

package/cc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sailpoint-sdk",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "description": "OpenAPI client for sailpoint-sdk",
   "author": "OpenAPI-Generator Contributors",
   "repository": {

package/configuration.ts

@@ -162,7 +162,7 @@ export class Configuration {
         
     }
 
-    private getParams(): ConfigurationParameters {
+    private getHomeParams(): ConfigurationParameters {
         const config: ConfigurationParameters = {}
         try {
             const homeDir = os.homedir()
@@ -172,19 +172,59 @@ export class Configuration {
                 config.baseurl = doc.environments[doc.activeenvironment].baseurl
                 config.clientId = doc.environments[doc.activeenvironment].pat.clientid
                 config.clientSecret = doc.environments[doc.activeenvironment].pat.clientsecret
+                config.tokenUrl = config.baseurl + '/oauth/token'
             }   
         } catch (error) {
-            console.log('unable to find config file')
+            console.log('unable to find config file in home directory')
+        }
+        return config
+    }
+
+    private getLocalParams(): ConfigurationParameters {
+        const config: ConfigurationParameters = {}
+        try {
+            const configPath = './config.json'
+            const jsonString = fs.readFileSync(configPath, 'utf-8');
+            const jsonData = JSON.parse(jsonString);
+            config.baseurl = jsonData.BaseURL
+            config.clientId = jsonData.ClientId
+            config.clientSecret = jsonData.ClientSecret
+            config.tokenUrl = config.baseurl + '/oauth/token'
+        } catch (error) {
+            console.log('unable to find config file in local directory')
         }
-        config.baseurl = process.env["SAIL_BASE_URL"] ? process.env["SAIL_BASE_URL"] : config.baseurl
-        config.clientId = process.env["SAIL_CLIENT_ID"] ? process.env["SAIL_CLIENT_ID"] : config.clientId
-        config.clientSecret = process.env["SAIL_CLIENT_SECRET"] ? process.env["SAIL_CLIENT_SECRET"] : config.clientSecret
+        return config
+    }
+
+    private getEnvParams(): ConfigurationParameters {
+        const config: ConfigurationParameters = {}
+        config.baseurl = process.env["SAIL_BASE_URL"] ? process.env["SAIL_BASE_URL"] : ""
+        config.clientId = process.env["SAIL_CLIENT_ID"] ? process.env["SAIL_CLIENT_ID"] : ""
+        config.clientSecret = process.env["SAIL_CLIENT_SECRET"] ? process.env["SAIL_CLIENT_SECRET"] : ""
 
         config.tokenUrl = config.baseurl + '/oauth/token'
 
         return config
     }
 
+    private getParams(): ConfigurationParameters {
+        const envConfig = this.getEnvParams()
+        if (envConfig.baseurl) {
+            return envConfig
+        }
+        const localConfig = this.getLocalParams()
+        if (localConfig.baseurl) {
+            return localConfig
+        }
+        const homeConfig = this.getHomeParams()
+        if (homeConfig.baseurl) {
+            console.log("Configuration file found in home directory, this approach of loading configuration will be deprecated in future releases, please upgrade the CLI and use the new 'sail sdk init config' command to create a local configuration file")
+            return homeConfig
+        }
+        return {}
+
+    }
+
     private async getAccessToken(url: string): Promise<string> {
         try {
             const {data, status} = await axios.post(url)