Skip to content

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit f39cf14

Browse filesBrowse files
author
Duc Nguyen
committed
Ensure api.ts uses axios instead of request
1 parent 48d498b commit f39cf14
Copy full SHA for f39cf14

File tree

2 files changed

+16
-40
lines changed
Filter options

2 files changed

+16
-40
lines changed

‎lib/MessageApiClient.ts

Copy file name to clipboardExpand all lines: lib/MessageApiClient.ts
+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import * as CMTypes from "../typescript-node-client/api";
2+
import axios = require('axios');
23

34
export type Channel = "SMS" | "Viber" | "RCS" | "Apple Messages for Business" | "WhatsApp" | "Telegram Messenger" | "Twitter" | "MobilePush" | "Facebook Messenger" | "Google Business Messages" | "Instagram";
45
export type RichMessage = CMTypes.RichMessage;
@@ -153,7 +154,7 @@ export class Message extends CMTypes.MessageEnvelope {
153154
/**
154155
* Sends the message to the CM.com Platform
155156
*/
156-
public send(): Promise<{ body: MessagesResponse; response: http.IncomingMessage }> {
157+
public send(): Promise<axios.AxiosResponse<any, any>> {
157158
return this.api.messagesSendMessage(this);
158159
}
159160

‎typescript-node-client/api.ts

Copy file name to clipboardExpand all lines: typescript-node-client/api.ts
+14-39
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
* Do not edit the class manually.
1111
*/
1212

13+
import axios = require('axios');
14+
1315
let defaultBasePath = 'https://gw.cmtelecom.com';
1416

1517
// ===============================================
@@ -2254,14 +2256,14 @@ export interface Authentication {
22542256
/**
22552257
* Apply authentication settings to header and query params.
22562258
*/
2257-
applyToRequest(requestOptions: localVarRequest.Options): void;
2259+
applyToRequest(requestOptions: axios.AxiosRequestConfig): void;
22582260
}
22592261

22602262
export class HttpBasicAuth implements Authentication {
22612263
public username: string = '';
22622264
public password: string = '';
22632265

2264-
applyToRequest(requestOptions: localVarRequest.Options): void {
2266+
applyToRequest(requestOptions: axios.AxiosRequestConfig): void {
22652267
requestOptions.auth = {
22662268
username: this.username, password: this.password
22672269
}
@@ -2274,9 +2276,9 @@ export class ApiKeyAuth implements Authentication {
22742276
constructor(private location: string, private paramName: string) {
22752277
}
22762278

2277-
applyToRequest(requestOptions: localVarRequest.Options): void {
2279+
applyToRequest(requestOptions: axios.AxiosRequestConfig): void {
22782280
if (this.location == "query") {
2279-
(<any>requestOptions.qs)[this.paramName] = this.apiKey;
2281+
(<any>requestOptions.params)[this.paramName] = this.apiKey;
22802282
} else if (this.location == "header" && requestOptions && requestOptions.headers) {
22812283
requestOptions.headers[this.paramName] = this.apiKey;
22822284
}
@@ -2286,7 +2288,7 @@ export class ApiKeyAuth implements Authentication {
22862288
export class OAuth implements Authentication {
22872289
public accessToken: string = '';
22882290

2289-
applyToRequest(requestOptions: localVarRequest.Options): void {
2291+
applyToRequest(requestOptions: axios.AxiosRequestConfig): void {
22902292
if (requestOptions && requestOptions.headers) {
22912293
requestOptions.headers["Authorization"] = "Bearer " + this.accessToken;
22922294
}
@@ -2297,7 +2299,7 @@ export class VoidAuth implements Authentication {
22972299
public username: string = '';
22982300
public password: string = '';
22992301

2300-
applyToRequest(_: localVarRequest.Options): void {
2302+
applyToRequest(_: axios.AxiosRequestConfig): void {
23012303
// Do nothing
23022304
}
23032305
}
@@ -2353,11 +2355,9 @@ export class MessagesApi {
23532355
* @param message
23542356
* @param {*} [options] Override http request options.
23552357
*/
2356-
public messagesSendMessage (message: MessageEnvelope, options: any = {}) : Promise<{ response: http.IncomingMessage; body: MessagesResponse; }> {
2358+
public messagesSendMessage (message: MessageEnvelope, options: any = {}) : Promise<axios.AxiosResponse<any, any>> {
23572359
const localVarPath = this.basePath + '/v1.0/message';
2358-
let localVarQueryParameters: any = {};
23592360
let localVarHeaderParams: any = (<any>Object).assign({}, this.defaultHeaders);
2360-
let localVarFormParams: any = {};
23612361

23622362
// verify required parameter 'message' is not null or undefined
23632363
if (message === null || message === undefined) {
@@ -2366,40 +2366,15 @@ export class MessagesApi {
23662366

23672367
(<any>Object).assign(localVarHeaderParams, options.headers);
23682368

2369-
let localVarUseFormData = false;
2370-
2371-
let localVarRequestOptions: localVarRequest.Options = {
2369+
let axiosRequestOptions: axios.AxiosRequestConfig = {
23722370
method: 'POST',
2373-
qs: localVarQueryParameters,
23742371
headers: localVarHeaderParams,
2375-
uri: localVarPath,
2376-
useQuerystring: this._useQuerystring,
2377-
json: true,
2378-
body: ObjectSerializer.serialize(message, "MessageEnvelope")
2372+
url: localVarPath,
2373+
data: ObjectSerializer.serialize(message, "MessageEnvelope")
23792374
};
23802375

2381-
this.authentications.default.applyToRequest(localVarRequestOptions);
2376+
this.authentications.default.applyToRequest(axiosRequestOptions);
23822377

2383-
if (Object.keys(localVarFormParams).length) {
2384-
if (localVarUseFormData) {
2385-
(<any>localVarRequestOptions).formData = localVarFormParams;
2386-
} else {
2387-
localVarRequestOptions.form = localVarFormParams;
2388-
}
2389-
}
2390-
return new Promise<{ response: http.IncomingMessage; body: MessagesResponse; }>((resolve, reject) => {
2391-
localVarRequest(localVarRequestOptions, (error, response, body) => {
2392-
if (error) {
2393-
reject(error);
2394-
} else {
2395-
body = ObjectSerializer.deserialize(body, "MessagesResponse");
2396-
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
2397-
resolve({ response: response, body: body });
2398-
} else {
2399-
reject({ response: response, body: body });
2400-
}
2401-
}
2402-
});
2403-
});
2378+
return axios.default.request(axiosRequestOptions);
24042379
}
24052380
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.