gautamsi#180 and gautamsi/ews-javascript-api-auth#2

Author: gautamsi

package.json

@@ -1,6 +1,6 @@
 {
  "name": "ews-javascript-api",
- "version": "0.9.0-dev.6",
+ "version": "0.9.0-dev.7",
  "description": "EWS Managed api in JavaScript",
  "main": "js/ExchangeWebService.js",
  "scripts": {

src/js/Autodiscover/AutodiscoverService.ts

@@ -36,7 +36,6 @@ import { Uri } from "../Uri";
 
 import { IXHROptions } from "../Interfaces";
 import { Promise } from "../Promise";
-import { XHRFactory } from "../XHRFactory";
 
 import { ExchangeServiceBase } from "../Core/ExchangeServiceBase";
 export class AutodiscoverService extends ExchangeServiceBase {
@@ -318,7 +317,7 @@ export class AutodiscoverService extends ExchangeServiceBase {
  type: "GET",
  url: url,
  };
- return this.GetXHRApi.xhr(xhrOptions)
+ return this.XHRApi.xhr(xhrOptions)
  .then<Uri>((response: XMLHttpRequest) => {
  if (response != null) {
 
@@ -882,7 +881,7 @@ export class AutodiscoverService extends ExchangeServiceBase {
 
 
  //todo - optimize code, need to apply logic in failed errors as 401 go to onerror of xhr;
- return this.GetXHRApi.xhr(xhrOptions)
+ return this.XHRApi.xhr(xhrOptions)
  .then<boolean>((response: XMLHttpRequest) => {
  if (response != null) {
  var redirectUrl: any = null;;

src/js/Autodiscover/Requests/AutodiscoverRequest.ts

@@ -13,7 +13,6 @@ import { ServiceResponse } from "../../Core/Responses/ServiceResponse";
 import { ServiceResponseException } from "../../Exceptions/ServiceResponseException";
 import { SoapFaultDetails } from "../../Misc/SoapFaultDetails";
 import { Uri } from "../../Uri";
-import { XHRFactory } from "../../XHRFactory";
 import { XmlElementNames } from "../../Core/XmlElementNames";
 import { XmlNamespace } from "../../Enumerations/XmlNamespace";
 
@@ -106,7 +105,7 @@ export class AutodiscoverRequest {
  return new Promise((successDelegate, errorDelegate) => {
  EwsLogging.DebugLog("sending ews request");
  EwsLogging.DebugLog(xhrOptions, true);
- this.service.GetXHRApi.xhr(xhrOptions)
+ this.service.XHRApi.xhr(xhrOptions)
  .then((xhrResponse: XMLHttpRequest) => {
  var ewsXmlReader = new EwsXmlReader(xhrResponse.responseText || xhrResponse.response);
  //EwsLogging.log(util.inspect(xhrResponse.response, { showHidden: false, depth: null, colors: true }));

src/js/Core/ExchangeServiceBase.ts

@@ -20,7 +20,7 @@ import { Uri } from "../Uri";
 import { XHRFactory } from "../XHRFactory";
 
 export class ExchangeServiceBase {
- 
+
  static AccountIsLocked: any /*System.Net.systemnet.HttpStatusCode*/ = 456;
 
  AcceptGzipEncoding: boolean;
@@ -84,8 +84,13 @@ export class ExchangeServiceBase {
  private static binarySecret: any;//System.Byte[];
  private static defaultUserAgent: string;
 
- public XHRApi: IXHRApi = null;
- get GetXHRApi(): IXHRApi { return this.XHRApi || XHRFactory.XHRApi; }
+ private xhrApi: IXHRApi = null;
+ get XHRApi(): IXHRApi {
+ return this.xhrApi || XHRFactory.XHRApi;
+ }
+ set XHRApi(xhrApi: IXHRApi) {
+ this.xhrApi = xhrApi || XHRFactory.XHRApi;
+ }
 
  constructor();
  constructor(timeZone: TimeZoneInfo);

src/js/Core/Requests/HangingServiceRequestBase.ts

@@ -7,7 +7,6 @@ import { HangingRequestDisconnectEventArgs } from "./HangingRequestDisconnectEve
 import { HangingRequestDisconnectReason } from "../../Enumerations/HangingRequestDisconnectReason";
 import { IXHROptions, IXHRApi, IXHRProgress } from "../../Interfaces";
 import { Promise } from "../../Promise";
-import { XHRFactory } from "../../XHRFactory";
 
 import { ServiceRequestBase } from "./ServiceRequestBase";
 /**
@@ -36,7 +35,6 @@ export class HangingServiceRequestBase extends ServiceRequestBase {
  // * ews-javascript-api: FetchStream object
  // */
  // private stream: FetchStream;
- private xhrApi: IXHRApi;
 
 /**
  * @internal Initializes a new instance of the **HangingServiceRequestBase** class.
@@ -49,7 +47,6 @@ export class HangingServiceRequestBase extends ServiceRequestBase {
  super(service);
  this.responseHandler = handler;
  this.heartbeatFrequencyMilliseconds = heartbeatFrequency;
- this.xhrApi = XHRFactory.XHRApi;
  }
 
  /**
@@ -65,7 +62,7 @@ export class HangingServiceRequestBase extends ServiceRequestBase {
  Disconnect(reason: HangingRequestDisconnectReason, exception: Exception): void;
  Disconnect(reason: HangingRequestDisconnectReason = HangingRequestDisconnectReason.UserInitiated, exception: Exception = null): void {
  if (this.IsConnected) {
- this.xhrApi.disconnect();
+ this.Service.XHRApi.disconnect();
  this.InternalOnDisconnect(reason, exception);
  }
  }
@@ -373,7 +370,7 @@ export class HangingServiceRequestBase extends ServiceRequestBase {
  EwsLogging.DebugLog("sending ews request");
  EwsLogging.DebugLog(request, true);
 
- return this.xhrApi.xhrStream(request, progressDelegate);
+ return this.Service.XHRApi.xhrStream(request, progressDelegate);
  // return new Promise((successDelegate, errorDelegate) => {
  // this.stream = new FetchStream(this.Service.Url.ToString(), request);
 

src/js/Core/Requests/ServiceRequestBase.ts

@@ -7,15 +7,14 @@ import { EwsUtilities } from "../EwsUtilities";
 import { ExchangeServerInfo } from "../ExchangeServerInfo";
 import { ExchangeService } from "../ExchangeService";
 import { ExchangeVersion } from "../../Enumerations/ExchangeVersion";
-import { IXHROptions, IXHRApi } from "../../Interfaces";
+import { IXHROptions } from "../../Interfaces";
 import { Promise } from "../../Promise"
 import { RenderingMode } from "../../Enumerations/RenderingMode";
 import { ServiceResponse } from "../Responses/ServiceResponse";
 import { ServiceVersionException } from "../../Exceptions/ServiceVersionException";
 import { SoapFaultDetails } from "../../Misc/SoapFaultDetails";
 import { StringHelper } from "../../ExtensionMethods";
 import { Strings } from "../../Strings";
-import { XHRFactory } from "../../XHRFactory"
 import { XmlAttributeNames } from "../XmlAttributeNames";
 import { XmlElementNames } from "../XmlElementNames";
 import { XmlNamespace } from "../../Enumerations/XmlNamespace";
@@ -221,7 +220,7 @@ export abstract class ServiceRequestBase {
  }
  }
  //EndGetEwsHttpWebResponse(request: IEwsHttpWebRequest, asyncResult: any /*System.IAsyncResult*/): IEwsHttpWebResponse { throw new Error("Could not implemented."); }
- GetEwsHttpWebResponse(request: IXHROptions /*IEwsHttpWebRequest*/): Promise<XMLHttpRequest> { return this.service.GetXHRApi.xhr(request); }
+ GetEwsHttpWebResponse(request: IXHROptions /*IEwsHttpWebRequest*/): Promise<XMLHttpRequest> { return this.service.XHRApi.xhr(request); }
 
  /**
  * Gets string representation of requested server version.
@@ -490,7 +489,7 @@ export abstract class ServiceRequestBase {
  EwsLogging.DebugLog("sending ews request");
  EwsLogging.DebugLog(request, true);
 
- return this.service.GetXHRApi.xhr(request);
+ return this.service.XHRApi.xhr(request);
 
  //try
  //{