@arrowsphere/api-client 3.41.0 → 3.42.0

package/CHANGELOG.md

@@ -4,6 +4,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## [3.42.0] - 2023-06-27
+
+### Changed
+
+- Refactor url generation to allow complex origin url
+
 ## [3.41.0] - 2023-06-23
 
 ### Changed

package/build/abstractGraphQLClient.js

@@ -50,7 +50,11 @@ class AbstractGraphQLClient extends AbstractHttpClient_1.AbstractHttpClient {
         return await this.getClientInstance().request(query);
     }
     generateUrl() {
-        const url = new URL(`${this.options.isAdmin ? path.join('admin', this.basePath) : this.basePath}${this.path}`, this.url);
+        const baseUrl = this.url.replace(new RegExp('/$'), '');
+        const basePath = this.options.isAdmin
+            ? path.join('/admin', this.basePath)
+            : this.basePath;
+        const url = new URL(`${baseUrl}${basePath}${this.path}`);
         return url.toString();
     }
     stringifyQuery(query) {

package/build/abstractRestfulClient.js

@@ -203,7 +203,11 @@ class AbstractRestfulClient extends AbstractHttpClient_1.AbstractHttpClient {
      */
     generateUrl(parameters, options) {
         const params = { ...parameters, ...this.generatePagination() };
-        const url = new URL(`${options.isAdmin ? path_1.default.join('admin', this.basePath) : this.basePath}${this.path}`, this.url);
+        const baseUrl = this.url.replace(new RegExp('/$'), '');
+        const basePath = options.isAdmin
+            ? path_1.default.join('/admin', this.basePath)
+            : this.basePath;
+        const url = new URL(`${baseUrl}${basePath}${this.path}`);
         if (Object.values(params).length) {
             url.search = querystring_1.default.stringify(params);
         }

package/build/catalog/catalogGraphQLClient.js

@@ -8,11 +8,11 @@ class CatalogGraphQLClient extends abstractGraphQLClient_1.AbstractGraphQLClient
         /**
          * The base path of the API
          */
-        this.basePath = 'catalog/';
+        this.basePath = '/catalog';
         /**
          * The Path of graphql catalog API
          */
-        this.GRAPHQL = 'graphql';
+        this.GRAPHQL = '/graphql';
     }
     async find(request) {
         this.path = this.GRAPHQL;

package/build/licenses/licensesClient.js

@@ -115,11 +115,11 @@ class LicensesClient extends abstractRestfulClient_1.AbstractRestfulClient {
         /**
          * The base path of the API
          */
-        this.basePath = '/licenses/';
+        this.basePath = '/licenses';
         /**
          * The path of the Find endpoint
          */
-        this.FIND_PATH = 'v2/find';
+        this.FIND_PATH = '/v2/find';
         /**
          * The path of the Configs endpoint
          */
@@ -244,7 +244,7 @@ class LicensesClient extends abstractRestfulClient_1.AbstractRestfulClient {
         return new findResult_1.FindResult(response, this, rawLicensePayload, parameters);
     }
     getConfigsRaw(reference) {
-        this.path = reference + this.CONFIGS_PATH;
+        this.path = `/${reference}${this.CONFIGS_PATH}`;
         return this.get();
     }
     async *getConfigs(reference) {
@@ -254,7 +254,7 @@ class LicensesClient extends abstractRestfulClient_1.AbstractRestfulClient {
         }
     }
     async updateConfigRaw(reference, config) {
-        this.path = reference + this.CONFIGS_PATH;
+        this.path = `/${reference}${this.CONFIGS_PATH}`;
         const postData = {
             [configFindResult_1.ConfigFindResultFields.COLUMN_NAME]: config.name,
             [configFindResult_1.ConfigFindResultFields.COLUMN_SCOPE]: config.scope,
@@ -267,39 +267,39 @@ class LicensesClient extends abstractRestfulClient_1.AbstractRestfulClient {
         return new configFindResult_1.ConfigFindResult(rawResponse);
     }
     async getLicense(licenseReference, parameters = {}) {
-        this.path = licenseReference;
+        this.path = `/${licenseReference}`;
         return new getResult_1.GetResult(getLicenseResult_1.GetLicenseResult, await this.get(parameters));
     }
     updateSeats(licenseReference, putData, parameters = {}) {
-        this.path = licenseReference + this.SEATS_PATH;
+        this.path = `/${licenseReference}${this.SEATS_PATH}`;
         return this.put(putData, parameters);
     }
     suspendLicense(licenseReference, payload, parameters = {}) {
-        this.path = licenseReference + this.SUSPEND_PATH;
+        this.path = `/${licenseReference}${this.SUSPEND_PATH}`;
         return this.put(payload, parameters);
     }
     reactivateLicense(licenseReference, payload, parameters = {}) {
-        this.path = licenseReference + this.REACTIVATE_PATH;
+        this.path = `/${licenseReference}${this.REACTIVATE_PATH}`;
         return this.put(payload, parameters);
     }
     cancelLicense(licenseReference, payload, parameters = {}) {
-        this.path = licenseReference + this.CANCEL_PATH;
+        this.path = `/${licenseReference}${this.CANCEL_PATH}`;
         return this.put(payload, parameters);
     }
     async updateFriendlyName(licenseReference, putData, parameters = {}) {
-        this.path = licenseReference + this.UPDATE_FRIENDLYNAME_PATH;
+        this.path = `/${licenseReference}${this.UPDATE_FRIENDLYNAME_PATH}`;
         return await this.put(putData, parameters);
     }
     async getHistory(licenseReference, parameters = {}) {
-        this.path = licenseReference + this.GET_LICENSE_HISTORY_PATH;
+        this.path = `/${licenseReference}${this.GET_LICENSE_HISTORY_PATH}`;
         return new getResult_1.GetResult(licenceHistoryResult_1.LicenceHistoryResult, await this.get(parameters));
     }
     async cancelAutoRenew(licenseReference, payload, parameters = {}) {
-        this.path = licenseReference + this.CANCEL_AUTO_RENEW_PATH;
+        this.path = `/${licenseReference}${this.CANCEL_AUTO_RENEW_PATH}`;
         return await this.put(payload, parameters);
     }
     async reactivateAutoRenew(licenseReference, payload, parameters = {}) {
-        this.path = licenseReference + this.REACTIVATE_AUTO_RENEW_PATH;
+        this.path = `/${licenseReference}${this.REACTIVATE_AUTO_RENEW_PATH}`;
         return await this.put(payload, parameters);
     }
 }

package/build/orders/ordersClient.js

@@ -52,7 +52,7 @@ class OrdersClient extends abstractRestfulClient_1.AbstractRestfulClient {
         /**
          * The base path of the API
          */
-        this.basePath = '/index.php/api/orders';
+        this.basePath = '/orders';
     }
     async create(postData, parameters = {}) {
         return new getResult_1.GetResult(referenceLink_1.ReferenceLink, await this.post(postData, parameters));

package/build/securityScore/securityScoreGraphQLClient.js

@@ -13,11 +13,11 @@ class SecurityScoreGraphQLClient extends abstractGraphQLClient_1.AbstractGraphQL
         /**
          * The base path of the API
          */
-        this.basePath = 'security/';
+        this.basePath = '/security';
         /**
          * The Path of graphql catalog API
          */
-        this.GRAPHQL = 'graphql/score';
+        this.GRAPHQL = '/graphql/score';
     }
     async find(request) {
         this.path = this.GRAPHQL;

package/package.json

@@ -4,7 +4,7 @@
     "type": "git",
     "url": "https://github.com/ArrowSphere/nodejs-api-client.git"
   },
-  "version": "3.41.0",
+  "version": "3.42.0",
   "description": "Node.js client for ArrowSphere's public API",
   "main": "build/index.js",
   "types": "build/index.d.ts",