Skip to content

Commit

Permalink
feat: Rename config properties
Browse files Browse the repository at this point in the history
  • Loading branch information
Derek Finlinson committed Feb 11, 2019
1 parent cce41f4 commit aa07ee2
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion src/models.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export interface WebApiRequestConfig {
contentType: string;
body?: any;
queryString: string;
config: WebApiConfig;
apiConfig: WebApiConfig;
queryOptions?: QueryOptions
}

Expand Down
10 changes: 5 additions & 5 deletions src/webapi-browser.ts
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { Guid, QueryOptions, Entity, RetrieveMultipleResponse, FunctionInput, ChangeSet, WebApiConfig, WebApiRequestConfig, WebApiRequestResult } from './models';
import * as webApi from "./webapi";

function submitRequest(config: WebApiRequestConfig,
function submitRequest(requestConfig: WebApiRequestConfig,
callback: (result: WebApiRequestResult) => void): void {
const req: XMLHttpRequest = new XMLHttpRequest();

req.open(config.method, encodeURI(`${config.config.url}/${config.queryString}`), true);
req.open(requestConfig.method, encodeURI(`${requestConfig.apiConfig.url}/${requestConfig.queryString}`), true);

const headers: any = webApi.getHeaders(config);
const headers: any = webApi.getHeaders(requestConfig);

for (let header in headers) {
if (headers.hasOwnProperty(header)) {
Expand All @@ -27,8 +27,8 @@ function submitRequest(config: WebApiRequestConfig,
}
};

if (config.body != null) {
req.send(config.body);
if (requestConfig.body != null) {
req.send(requestConfig.body);
} else {
req.send();
}
Expand Down
16 changes: 8 additions & 8 deletions src/webapi-node.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@ import { Guid, QueryOptions, Entity, RetrieveMultipleResponse, FunctionInput, Ch
import * as webApi from "./webapi";
import { request } from "https";

function submitRequest(config: WebApiRequestConfig,
function submitRequest(requestConfig: WebApiRequestConfig,
callback: (result: WebApiRequestResult) => void): void {
const url: URL = new URL(`${config.config.url}/${config.queryString}`);
const url: URL = new URL(`${requestConfig.apiConfig.url}/${requestConfig.queryString}`);

const headers: any = webApi.getHeaders(config);
const headers: any = webApi.getHeaders(requestConfig);

const options = {
hostname: url.hostname,
path: `${url.pathname}${url.search}`,
method: config.method,
method: requestConfig.method,
headers: headers
};

if (config.body) {
options.headers['Content-Length'] = config.body.length;
if (requestConfig.body) {
options.headers['Content-Length'] = requestConfig.body.length;
}

const req = request(options,
Expand All @@ -43,8 +43,8 @@ function submitRequest(config: WebApiRequestConfig,
callback({ error: true, response: error });
});

if (config.body != null) {
req.write(config.body);
if (requestConfig.body != null) {
req.write(requestConfig.body);
}

req.end();
Expand Down
38 changes: 19 additions & 19 deletions src/webapi.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ export function getHeaders(config: WebApiRequestConfig): any {
headers['OData-Version'] = '4.0';
headers['Content-Type'] = config.contentType;

if (config.config.accessToken != null) {
headers.Authorization = `Bearer ${config.config.accessToken}`;
if (config.apiConfig.accessToken != null) {
headers.Authorization = `Bearer ${config.apiConfig.accessToken}`;
}

if (config.queryOptions != null && typeof(config.queryOptions) !== 'undefined') {
Expand Down Expand Up @@ -109,7 +109,7 @@ export function retrieve(apiConfig: WebApiConfig, entitySet: string, id: Guid,
method: 'GET',
contentType: 'application/json; charset=utf-8',
queryString: query,
config: apiConfig,
apiConfig: apiConfig,
queryOptions: queryOptions
};

Expand Down Expand Up @@ -146,7 +146,7 @@ export function retrieveMultiple(apiConfig: WebApiConfig, entitySet: string,
method: 'GET',
contentType: 'application/json; charset=utf-8',
queryString: query,
config: apiConfig,
apiConfig: apiConfig,
queryOptions: queryOptions
};

Expand Down Expand Up @@ -178,7 +178,7 @@ export function retrieveMultipleNextPage(apiConfig: WebApiConfig, url: string,
method: 'GET',
contentType: 'application/json; charset=utf-8',
queryString: '',
config: apiConfig,
apiConfig: apiConfig,
queryOptions: queryOptions
};

Expand Down Expand Up @@ -210,7 +210,7 @@ export function create(apiConfig: WebApiConfig, entitySet: string, entity: Entit
contentType: 'application/json; charset=utf-8',
queryString: entitySet,
body: JSON.stringify(entity),
config: apiConfig,
apiConfig: apiConfig,
queryOptions: queryOptions
};

Expand Down Expand Up @@ -254,7 +254,7 @@ export function createWithReturnData(apiConfig: WebApiConfig, entitySet: string,
contentType: 'application/json; charset=utf-8',
queryString: entitySet + select,
body: JSON.stringify(entity),
config: apiConfig,
apiConfig: apiConfig,
queryOptions: queryOptions
};

Expand Down Expand Up @@ -287,7 +287,7 @@ export function update(apiConfig: WebApiConfig, entitySet: string, id: Guid, ent
contentType: 'application/json; charset=utf-8',
queryString: `${entitySet}(${id.value})`,
body: JSON.stringify(entity),
config: apiConfig,
apiConfig: apiConfig,
queryOptions: queryOptions
};

Expand Down Expand Up @@ -332,7 +332,7 @@ export function updateWithReturnData(apiConfig: WebApiConfig, entitySet: string,
contentType: 'application/json; charset=utf-8',
queryString: `${entitySet}(${id.value})${select}`,
body: JSON.stringify(entity),
config: apiConfig,
apiConfig: apiConfig,
queryOptions: queryOptions
};

Expand Down Expand Up @@ -365,7 +365,7 @@ export function updateProperty(apiConfig: WebApiConfig, entitySet: string, id: G
contentType: 'application/json; charset=utf-8',
queryString: `${entitySet}(${id.value})/${attribute}`,
body: JSON.stringify({ value: value }),
config: apiConfig,
apiConfig: apiConfig,
queryOptions: queryOptions
};

Expand Down Expand Up @@ -394,7 +394,7 @@ export function deleteRecord(apiConfig: WebApiConfig, entitySet: string, id: Gui
method: 'DELETE',
contentType: 'application/json; charset=utf-8',
queryString: `${entitySet}(${id.value})`,
config: apiConfig
apiConfig: apiConfig
};

return new Promise((resolve, reject) => {
Expand Down Expand Up @@ -425,7 +425,7 @@ export function deleteProperty(apiConfig: WebApiConfig, entitySet: string, id: G
method: 'DELETE',
contentType: 'application/json; charset=utf-8',
queryString: `${entitySet}(${id.value})${queryString}`,
config: apiConfig
apiConfig: apiConfig
};

return new Promise((resolve, reject) => {
Expand Down Expand Up @@ -463,7 +463,7 @@ export function associate(apiConfig: WebApiConfig, entitySet: string, id: Guid,
contentType: 'application/json; charset=utf-8',
queryString: `${entitySet}(${id.value})/${relationship}/$ref`,
body: JSON.stringify(related),
config: apiConfig,
apiConfig: apiConfig,
queryOptions: queryOptions
};

Expand Down Expand Up @@ -503,7 +503,7 @@ export function disassociate(apiConfig: WebApiConfig, entitySet: string, id: Gui
method: 'DELETE',
contentType: 'application/json; charset=utf-8',
queryString: `${entitySet}(${id.value})/${queryString}`,
config: apiConfig
apiConfig: apiConfig
};

return new Promise((resolve, reject) => {
Expand Down Expand Up @@ -536,7 +536,7 @@ export function boundAction(apiConfig: WebApiConfig, entitySet: string, id: Guid
method: 'POST',
contentType: 'application/json; charset=utf-8',
queryString: `${entitySet}(${id.value})/Microsoft.Dynamics.CRM.${actionName}`,
config: apiConfig,
apiConfig: apiConfig,
queryOptions: queryOptions
};

Expand Down Expand Up @@ -575,7 +575,7 @@ export function unboundAction(apiConfig: WebApiConfig, actionName: string,
method: 'POST',
contentType: 'application/json; charset=utf-8',
queryString: actionName,
config: apiConfig,
apiConfig: apiConfig,
queryOptions: queryOptions
};

Expand Down Expand Up @@ -619,7 +619,7 @@ export function boundFunction(apiConfig: WebApiConfig, entitySet: string, id: Gu
method: 'GET',
contentType: 'application/json; charset=utf-8',
queryString: queryString,
config: apiConfig,
apiConfig: apiConfig,
queryOptions: queryOptions
};

Expand Down Expand Up @@ -657,7 +657,7 @@ export function unboundFunction(apiConfig: WebApiConfig, functionName: string,
method: 'GET',
contentType: 'application/json; charset=utf-8',
queryString: queryString,
config: apiConfig,
apiConfig: apiConfig,
queryOptions: queryOptions
};

Expand Down Expand Up @@ -740,7 +740,7 @@ export function batchOperation(apiConfig: WebApiConfig, batchId: string, changeS
contentType: `multipart/mixed;boundary=batch_${batchId}`,
queryString: '$batch',
body: body.join('\r\n'),
config: apiConfig,
apiConfig: apiConfig,
queryOptions: queryOptions
};

Expand Down

0 comments on commit aa07ee2

Please sign in to comment.