dbgate-api 7.1.12 → 7.1.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +6 -6
- package/src/currentVersion.js +2 -2
- package/src/utility/cloudIntf.js +11 -15
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dbgate-api",
|
|
3
3
|
"main": "src/index.js",
|
|
4
|
-
"version": "7.1.
|
|
4
|
+
"version": "7.1.13",
|
|
5
5
|
"homepage": "https://www.dbgate.io/",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
@@ -30,11 +30,11 @@
|
|
|
30
30
|
"compare-versions": "^3.6.0",
|
|
31
31
|
"cors": "^2.8.5",
|
|
32
32
|
"cross-env": "^6.0.3",
|
|
33
|
-
"dbgate-datalib": "7.1.
|
|
33
|
+
"dbgate-datalib": "7.1.13",
|
|
34
34
|
"dbgate-query-splitter": "^4.12.0",
|
|
35
|
-
"dbgate-rest": "7.1.
|
|
36
|
-
"dbgate-sqltree": "7.1.
|
|
37
|
-
"dbgate-tools": "7.1.
|
|
35
|
+
"dbgate-rest": "7.1.13",
|
|
36
|
+
"dbgate-sqltree": "7.1.13",
|
|
37
|
+
"dbgate-tools": "7.1.13",
|
|
38
38
|
"debug": "^4.3.4",
|
|
39
39
|
"diff": "^5.0.0",
|
|
40
40
|
"diff2html": "^3.4.13",
|
|
@@ -96,7 +96,7 @@
|
|
|
96
96
|
"@types/fs-extra": "^9.0.11",
|
|
97
97
|
"@types/jest": "^30.0.0",
|
|
98
98
|
"@types/lodash": "^4.14.149",
|
|
99
|
-
"dbgate-types": "7.1.
|
|
99
|
+
"dbgate-types": "7.1.13",
|
|
100
100
|
"env-cmd": "^10.1.0",
|
|
101
101
|
"jest": "^30.4.2",
|
|
102
102
|
"jsdoc-to-markdown": "^9.0.5",
|
package/src/currentVersion.js
CHANGED
package/src/utility/cloudIntf.js
CHANGED
|
@@ -26,20 +26,16 @@ const DBGATE_IDENTITY_URL = process.env.LOCAL_DBGATE_IDENTITY
|
|
|
26
26
|
: process.env.PROD_DBGATE_IDENTITY
|
|
27
27
|
? 'https://identity.dbgate.cloud'
|
|
28
28
|
: process.env.DEVWEB || process.env.DEVMODE
|
|
29
|
-
? 'https://identity.dbgate.
|
|
29
|
+
? 'https://identity.dbgate.cloud'
|
|
30
30
|
: 'https://identity.dbgate.cloud';
|
|
31
31
|
|
|
32
32
|
const DBGATE_CLOUD_URL = process.env.LOCAL_DBGATE_CLOUD
|
|
33
33
|
? 'http://localhost:3110'
|
|
34
34
|
: process.env.PROD_DBGATE_CLOUD
|
|
35
|
-
? 'https://
|
|
35
|
+
? 'https://api.dbgate.cloud'
|
|
36
36
|
: process.env.DEVWEB || process.env.DEVMODE
|
|
37
37
|
? 'https://dev.dbgate.cloud'
|
|
38
|
-
: 'https://
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
const DBGATE_PUBLIC_CLOUD_URL =
|
|
42
|
-
DBGATE_CLOUD_URL === 'https://cloud.dbgate.io' ? 'https://api.dbgate.cloud' : DBGATE_CLOUD_URL;
|
|
38
|
+
: 'https://api.dbgate.cloud';
|
|
43
39
|
|
|
44
40
|
const stageAxiosConfig =
|
|
45
41
|
!process.env.PROD_DBGATE_CLOUD && (process.env.DEVWEB || process.env.DEVMODE)
|
|
@@ -224,7 +220,7 @@ async function updateCloudFiles(isRefresh, language) {
|
|
|
224
220
|
logger.info({ tags, lastCheckedTm }, 'DBGM-00082 Downloading cloud files');
|
|
225
221
|
|
|
226
222
|
const resp = await axios.default.get(
|
|
227
|
-
`${
|
|
223
|
+
`${DBGATE_CLOUD_URL}/public-cloud-updates?lastCheckedTm=${lastCheckedTm}&tags=${tags}&isRefresh=${
|
|
228
224
|
isRefresh ? 1 : 0
|
|
229
225
|
}}`,
|
|
230
226
|
{
|
|
@@ -269,7 +265,7 @@ async function getPublicCloudFiles() {
|
|
|
269
265
|
}
|
|
270
266
|
|
|
271
267
|
async function getPublicFileData(path) {
|
|
272
|
-
const resp = await axios.default.get(`${
|
|
268
|
+
const resp = await axios.default.get(`${DBGATE_CLOUD_URL}/public/${path}`, {
|
|
273
269
|
headers: {
|
|
274
270
|
...getLicenseHttpHeaders(),
|
|
275
271
|
},
|
|
@@ -297,7 +293,7 @@ async function updatePremiumPromoWidget(language) {
|
|
|
297
293
|
const tags = (await collectCloudFilesSearchTags()).join(',');
|
|
298
294
|
|
|
299
295
|
const resp = await axios.default.get(
|
|
300
|
-
`${
|
|
296
|
+
`${DBGATE_CLOUD_URL}/premium-promo-widget?identifier=${promoWidgetData?.identifier ?? 'empty'}&tags=${tags}`,
|
|
301
297
|
{
|
|
302
298
|
headers: {
|
|
303
299
|
...getLicenseHttpHeaders(),
|
|
@@ -346,7 +342,7 @@ async function callCloudApiGet(endpoint, signinHolder = null, additionalHeaders
|
|
|
346
342
|
}
|
|
347
343
|
const signinHeaders = await getCloudSigninHeaders(signinHolder);
|
|
348
344
|
|
|
349
|
-
const resp = await axios.default.get(`${
|
|
345
|
+
const resp = await axios.default.get(`${DBGATE_CLOUD_URL}/${endpoint}`, {
|
|
350
346
|
headers: {
|
|
351
347
|
...getLicenseHttpHeaders(),
|
|
352
348
|
...signinHeaders,
|
|
@@ -386,7 +382,7 @@ async function callCloudApiPost(endpoint, body, signinHolder = null) {
|
|
|
386
382
|
}
|
|
387
383
|
const signinHeaders = await getCloudSigninHeaders(signinHolder);
|
|
388
384
|
|
|
389
|
-
const resp = await axios.default.post(`${
|
|
385
|
+
const resp = await axios.default.post(`${DBGATE_CLOUD_URL}/${endpoint}`, body, {
|
|
390
386
|
headers: {
|
|
391
387
|
...getLicenseHttpHeaders(),
|
|
392
388
|
...signinHeaders,
|
|
@@ -491,7 +487,7 @@ function removeCloudCachedConnection(folid, cntid) {
|
|
|
491
487
|
|
|
492
488
|
async function getPublicIpInfo() {
|
|
493
489
|
try {
|
|
494
|
-
const resp = await axios.default.get(`${
|
|
490
|
+
const resp = await axios.default.get(`${DBGATE_CLOUD_URL}/ipinfo`, stageAxiosConfig);
|
|
495
491
|
if (!resp.data?.ip) {
|
|
496
492
|
return { ip: 'unknown-ip' };
|
|
497
493
|
}
|
|
@@ -508,14 +504,14 @@ async function getPromoWidgetData() {
|
|
|
508
504
|
|
|
509
505
|
async function getPromoWidgetPreview(campaign, variant) {
|
|
510
506
|
const resp = await axios.default.get(
|
|
511
|
-
`${
|
|
507
|
+
`${DBGATE_CLOUD_URL}/premium-promo-widget-preview/${campaign}/${variant}`,
|
|
512
508
|
stageAxiosConfig
|
|
513
509
|
);
|
|
514
510
|
return resp.data;
|
|
515
511
|
}
|
|
516
512
|
|
|
517
513
|
async function getPromoWidgetList() {
|
|
518
|
-
const resp = await axios.default.get(`${
|
|
514
|
+
const resp = await axios.default.get(`${DBGATE_CLOUD_URL}/promo-widget-list`, stageAxiosConfig);
|
|
519
515
|
return resp.data;
|
|
520
516
|
}
|
|
521
517
|
|