laravel-request 1.1.17 → 1.1.19
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 +1 -1
- package/src/Api.js +40 -8
package/package.json
CHANGED
package/src/Api.js
CHANGED
|
@@ -3,13 +3,18 @@ import axios from "axios";
|
|
|
3
3
|
|
|
4
4
|
export default class Api {
|
|
5
5
|
|
|
6
|
+
/**
|
|
7
|
+
*
|
|
8
|
+
* @type {ApiRequest}
|
|
9
|
+
*/
|
|
10
|
+
static debug = false;
|
|
6
11
|
/**
|
|
7
12
|
*
|
|
8
13
|
* @type {ApiRequest}
|
|
9
14
|
*/
|
|
10
15
|
static requestClass = ApiRequest;
|
|
11
16
|
|
|
12
|
-
static tokenResolver = () =>
|
|
17
|
+
static tokenResolver = async () =>
|
|
13
18
|
{
|
|
14
19
|
return localStorage.getItem('api_token');
|
|
15
20
|
}
|
|
@@ -142,6 +147,22 @@ export default class Api {
|
|
|
142
147
|
return flatParams.join('&');
|
|
143
148
|
}
|
|
144
149
|
|
|
150
|
+
/**
|
|
151
|
+
*
|
|
152
|
+
* @param request
|
|
153
|
+
*/
|
|
154
|
+
static logRequest(request)
|
|
155
|
+
{
|
|
156
|
+
if(Api.debug)
|
|
157
|
+
{
|
|
158
|
+
console.log('Url: ' + request.url)
|
|
159
|
+
console.log('Method: ' + request.method)
|
|
160
|
+
console.log('Data: ' + JSON.stringify(request.data ?? '').replace(/\"([^(\")"]+)\":/g,"$1:"))
|
|
161
|
+
console.log('Params: ' + JSON.stringify(request.params ?? '').replace(/\"([^(\")"]+)\":/g,"$1:"))
|
|
162
|
+
console.log('Headers: ' + JSON.stringify(request.headers ?? '').replace(/\"([^(\")"]+)\":/g,"$1:"))
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
|
|
145
166
|
/**
|
|
146
167
|
*
|
|
147
168
|
* @param obj
|
|
@@ -152,7 +173,7 @@ export default class Api {
|
|
|
152
173
|
try {
|
|
153
174
|
headers['Content-Type'] = 'application/json';
|
|
154
175
|
|
|
155
|
-
let api_token = Api.tokenResolver();
|
|
176
|
+
let api_token = await Api.tokenResolver();
|
|
156
177
|
if (api_token)
|
|
157
178
|
{
|
|
158
179
|
headers["Authorization"] = api_token;
|
|
@@ -169,22 +190,29 @@ export default class Api {
|
|
|
169
190
|
//replace to POST if GET url is too long
|
|
170
191
|
data._method = 'GET';
|
|
171
192
|
|
|
172
|
-
|
|
193
|
+
let request = {
|
|
173
194
|
url: url,
|
|
174
195
|
method: 'PUT',//post не будет работать
|
|
175
196
|
data: data,
|
|
176
197
|
headers: headers
|
|
177
|
-
}
|
|
198
|
+
}
|
|
199
|
+
|
|
200
|
+
Api.logRequest(request);
|
|
201
|
+
response = await axios.request(request);
|
|
178
202
|
|
|
179
203
|
}else{
|
|
180
204
|
data.timestamp = new Date().getTime();
|
|
181
205
|
|
|
182
|
-
|
|
206
|
+
let request = {
|
|
183
207
|
url: url,
|
|
184
208
|
method: method,
|
|
185
209
|
params: data,
|
|
186
210
|
headers: headers
|
|
187
|
-
}
|
|
211
|
+
}
|
|
212
|
+
|
|
213
|
+
Api.logRequest(request);
|
|
214
|
+
|
|
215
|
+
response = await axios.request(request);
|
|
188
216
|
}
|
|
189
217
|
|
|
190
218
|
|
|
@@ -192,13 +220,17 @@ export default class Api {
|
|
|
192
220
|
default:
|
|
193
221
|
params.timestamp = new Date().getTime();
|
|
194
222
|
|
|
195
|
-
|
|
223
|
+
let request = {
|
|
196
224
|
url: url,
|
|
197
225
|
method: method,
|
|
198
226
|
data: data,
|
|
199
227
|
params: params,
|
|
200
228
|
headers: headers
|
|
201
|
-
}
|
|
229
|
+
}
|
|
230
|
+
|
|
231
|
+
Api.logRequest(request);
|
|
232
|
+
|
|
233
|
+
response = await axios.request(request);
|
|
202
234
|
break;
|
|
203
235
|
}
|
|
204
236
|
|