@qrvey/utils 1.12.0-4 → 1.12.0-6
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/dist/cjs/services/helpers/Request.d.ts +1 -0
- package/dist/cjs/services/helpers/Request.js +9 -4
- package/dist/cjs/services/interfaces/IEndpointConfig.d.ts +3 -1
- package/dist/services/helpers/Request.d.ts +1 -0
- package/dist/services/helpers/Request.js +9 -4
- package/dist/services/interfaces/IEndpointConfig.d.ts +3 -1
- package/package.json +1 -1
|
@@ -7,6 +7,7 @@ export declare class Request {
|
|
|
7
7
|
static getApiKey(config: any): any;
|
|
8
8
|
static makeUrl(config: any, url: any, params?: any): string;
|
|
9
9
|
private static getApiUrl;
|
|
10
|
+
private static getUserUrl;
|
|
10
11
|
static parseUrl: (url: any, config: any) => string;
|
|
11
12
|
static requestConfig(reqData: any): any;
|
|
12
13
|
static resolveRequest(reqData: any): Promise<any>;
|
|
@@ -47,12 +47,10 @@ class Request {
|
|
|
47
47
|
_url += typeof params === "object" ? (0, serialize_1.serialize)(params) : "";
|
|
48
48
|
if (!(0, isEmpty_1.isEmpty)(config.endpoint)) {
|
|
49
49
|
const endpoint = config.endpoint;
|
|
50
|
-
const version = `/v${endpoint.version || 4}`;
|
|
50
|
+
const version = endpoint.noVersion ? "" : `/v${endpoint.version || 4}`;
|
|
51
51
|
const admin = endpoint.admin ? "/admin" : "";
|
|
52
52
|
const api = Request.getApiUrl(config);
|
|
53
|
-
const user =
|
|
54
|
-
? "/user/:user_id"
|
|
55
|
-
: "";
|
|
53
|
+
const user = Request.getUserUrl(config);
|
|
56
54
|
const base = `${admin}${api}${version}${user}`;
|
|
57
55
|
_url = (config.domain || "") + base + endpoint.uri + _url;
|
|
58
56
|
}
|
|
@@ -69,6 +67,13 @@ class Request {
|
|
|
69
67
|
? "/devapi"
|
|
70
68
|
: "/api";
|
|
71
69
|
}
|
|
70
|
+
static getUserUrl(config) {
|
|
71
|
+
const endpoint = config.endpoint || {};
|
|
72
|
+
return !endpoint.noUser &&
|
|
73
|
+
((0, getAttribute_1.getAttribute)(config, "user_id") || this.hasQvToken(config))
|
|
74
|
+
? "/user/:user_id"
|
|
75
|
+
: "";
|
|
76
|
+
}
|
|
72
77
|
static requestConfig(reqData) {
|
|
73
78
|
const cfg = {
|
|
74
79
|
method: reqData.type,
|
|
@@ -7,6 +7,7 @@ export declare class Request {
|
|
|
7
7
|
static getApiKey(config: any): any;
|
|
8
8
|
static makeUrl(config: any, url: any, params?: any): string;
|
|
9
9
|
private static getApiUrl;
|
|
10
|
+
private static getUserUrl;
|
|
10
11
|
static parseUrl: (url: any, config: any) => string;
|
|
11
12
|
static requestConfig(reqData: any): any;
|
|
12
13
|
static resolveRequest(reqData: any): Promise<any>;
|
|
@@ -44,12 +44,10 @@ export class Request {
|
|
|
44
44
|
_url += typeof params === "object" ? serialize(params) : "";
|
|
45
45
|
if (!isEmpty(config.endpoint)) {
|
|
46
46
|
const endpoint = config.endpoint;
|
|
47
|
-
const version = `/v${endpoint.version || 4}`;
|
|
47
|
+
const version = endpoint.noVersion ? "" : `/v${endpoint.version || 4}`;
|
|
48
48
|
const admin = endpoint.admin ? "/admin" : "";
|
|
49
49
|
const api = Request.getApiUrl(config);
|
|
50
|
-
const user =
|
|
51
|
-
? "/user/:user_id"
|
|
52
|
-
: "";
|
|
50
|
+
const user = Request.getUserUrl(config);
|
|
53
51
|
const base = `${admin}${api}${version}${user}`;
|
|
54
52
|
_url = (config.domain || "") + base + endpoint.uri + _url;
|
|
55
53
|
}
|
|
@@ -66,6 +64,13 @@ export class Request {
|
|
|
66
64
|
? "/devapi"
|
|
67
65
|
: "/api";
|
|
68
66
|
}
|
|
67
|
+
static getUserUrl(config) {
|
|
68
|
+
const endpoint = config.endpoint || {};
|
|
69
|
+
return !endpoint.noUser &&
|
|
70
|
+
(getAttribute(config, "user_id") || this.hasQvToken(config))
|
|
71
|
+
? "/user/:user_id"
|
|
72
|
+
: "";
|
|
73
|
+
}
|
|
69
74
|
static requestConfig(reqData) {
|
|
70
75
|
const cfg = {
|
|
71
76
|
method: reqData.type,
|