test merge
This commit is contained in:
commit
4fc96b39ca
|
@ -17,7 +17,11 @@ async function plutioApiRequestToken(this: IExecuteFunctions | ILoadOptionsFunct
|
||||||
const clientId = `${credentials.clientId}`;
|
const clientId = `${credentials.clientId}`;
|
||||||
const clientSecret = `${credentials.clientSecret}`;
|
const clientSecret = `${credentials.clientSecret}`;
|
||||||
const business = `${credentials.business}`;
|
const business = `${credentials.business}`;
|
||||||
|
<<<<<<< HEAD
|
||||||
const endpoint = 'api.plutio.com/v1.10';
|
const endpoint = 'api.plutio.com/v1.10';
|
||||||
|
=======
|
||||||
|
const endpoint = 'api.plutio.com/v1.9';
|
||||||
|
>>>>>>> master
|
||||||
const returnData: IDataObject[] = [];
|
const returnData: IDataObject[] = [];
|
||||||
|
|
||||||
let responseData;
|
let responseData;
|
||||||
|
@ -58,7 +62,11 @@ async function plutioApiRequestToken(this: IExecuteFunctions | ILoadOptionsFunct
|
||||||
|
|
||||||
// Rest API function for plutio node.
|
// Rest API function for plutio node.
|
||||||
export async function plutioApiRequest(this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, query: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
|
export async function plutioApiRequest(this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, query: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
|
||||||
|
<<<<<<< HEAD
|
||||||
const endpoint = 'api.plutio.com/v1.10';
|
const endpoint = 'api.plutio.com/v1.10';
|
||||||
|
=======
|
||||||
|
const endpoint = 'api.plutio.com/v1.9';
|
||||||
|
>>>>>>> master
|
||||||
const credentials = await this.getCredentials('plutioApi');
|
const credentials = await this.getCredentials('plutioApi');
|
||||||
const plutioApiToken = await plutioApiRequestToken.call(this);
|
const plutioApiToken = await plutioApiRequestToken.call(this);
|
||||||
const business = `${credentials.business}`;
|
const business = `${credentials.business}`;
|
||||||
|
|
Loading…
Reference in New Issue