From de7c572293a5ea81f0604f00d0748bca581f49d4 Mon Sep 17 00:00:00 2001 From: PritamIT2023 Date: Wed, 16 Oct 2024 11:43:54 +0530 Subject: [PATCH] feat(global): :sparkles: in the AppService queryBuilder section add appID in the query parameter in the AppService queryBuilder section add appID in the query parameter Ref: #403 --- package/service/AppService.js | 18 +++++++++++++----- package/utils/helper.js | 7 ++++++- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/package/service/AppService.js b/package/service/AppService.js index 24cb96fc..76867b6b 100644 --- a/package/service/AppService.js +++ b/package/service/AppService.js @@ -69,15 +69,23 @@ class AppService { async getEndpoint(method, endpoint, data) { - if(await this.isUrl(endpoint)){ - return endpoint; - }else{ + let processEndpoint = endpoint; + + (processEndpoint.indexOf("?") === -1) ? processEndpoint += "?" : processEndpoint += "&"; + + processEndpoint += `appID=${WrappidData?.config?.appID || ""}`; + + if(!await this.isUrl(processEndpoint)) + // return endpoint; + // }else + { let backendUrl = WrappidData?.config?.backendUrl; return method === HTTP.GET - ? queryBuilder(backendUrl + endpoint, data) - : backendUrl + endpoint; + ? queryBuilder(backendUrl + processEndpoint, data) + : backendUrl + processEndpoint; } + return processEndpoint; } } diff --git a/package/utils/helper.js b/package/utils/helper.js index b6db1c6e..4bf4164b 100644 --- a/package/utils/helper.js +++ b/package/utils/helper.js @@ -23,7 +23,12 @@ export function queryBuilder(url, query) { Object.keys(query).length > 0 /* && Object.values(query).find((v) => v && v !== "") */ ) { - newUrl += "?"; + // if (newUrl.indexOf("?") === -1) { // no query string + if (newUrl.indexOf("?") === -1) { + newUrl += "?"; + } else { + newUrl += "&"; + } let keys = Object.keys(query); for (let index = 0; index < keys.length; index++) {