Merge pull request #181 from WieserSoftware/anwieser/MiddlewareMapChange

muthurathinam · web-flow · commit f150d0fa2a66 · 2019-06-08T04:57:14.000Z
Anwieser/middleware map change
diff --git a/spec/content/BatchRequestContent.ts b/spec/content/BatchRequestContent.ts
@@ -48,13 +48,13 @@ describe("BatchRequestContent.ts", () => {
 		this.timeout(20 * 1000);
 		it("Should Create BatchRequestContent instance with no requests", (done) => {
 			const batchReq = new BatchRequestContent();
-			assert.equal(batchReq.constructor.name, "BatchRequestContent");
+			assert(batchReq instanceof BatchRequestContent);
 			done();
 		});
 
 		it("Should create BatchRequestContent instance with empty array", (done) => {
 			const batchReq = new BatchRequestContent([]);
-			assert.equal(batchReq.constructor.name, "BatchRequestContent");
+			assert(batchReq instanceof BatchRequestContent);
 			done();
 		});
 
diff --git a/spec/middleware/MiddlewareControl.ts b/spec/middleware/MiddlewareControl.ts
@@ -36,14 +36,14 @@ describe("MiddlewareControl.ts", () => {
 	describe("getMiddlewareOption", () => {
 		it("Should return the middleware option for a given class name", () => {
 			const middlewareControl = new MiddlewareControl([dummyHandlerOption]);
-			const retryOptions: DummyHandlerOptions = middlewareControl.getMiddlewareOptions(dummyHandlerOption.constructor.name) as DummyHandlerOptions;
+			const retryOptions: DummyHandlerOptions = middlewareControl.getMiddlewareOptions(dummyHandlerOption.constructor as () => any) as DummyHandlerOptions;
 			assert.isDefined(retryOptions);
 			assert.equal(dummyHandlerOption, retryOptions);
 		});
 
 		it("Should return undefined for unknown class name", () => {
 			const middlewareControl = new MiddlewareControl([dummyHandlerOption]);
-			const retryOptions = middlewareControl.getMiddlewareOptions("NotAvailableHandlerOption");
+			const retryOptions = middlewareControl.getMiddlewareOptions(() => "NotAvailableHandlerOption");
 			assert.isUndefined(retryOptions);
 		});
 	});
diff --git a/spec/middleware/TelemetryHandlerOptions.ts b/spec/middleware/TelemetryHandlerOptions.ts
@@ -27,7 +27,7 @@ describe("TelemetryHandlerOptions.ts", () => {
 				middlewareControl: new MiddlewareControl(),
 			};
 			TelemetryHandlerOptions.updateFeatureUsageFlag(context, FeatureUsageFlag.AUTHENTICATION_HANDLER_ENABLED);
-			const options: TelemetryHandlerOptions = context.middlewareControl.getMiddlewareOptions(TelemetryHandlerOptions.name) as TelemetryHandlerOptions;
+			const options: TelemetryHandlerOptions = context.middlewareControl.getMiddlewareOptions(TelemetryHandlerOptions) as TelemetryHandlerOptions;
 			assert.equal(options["featureUsage"], FeatureUsageFlag.AUTHENTICATION_HANDLER_ENABLED);
 		});
 
@@ -37,7 +37,7 @@ describe("TelemetryHandlerOptions.ts", () => {
 				middlewareControl: new MiddlewareControl([new TelemetryHandlerOptions()]),
 			};
 			TelemetryHandlerOptions.updateFeatureUsageFlag(context, FeatureUsageFlag.AUTHENTICATION_HANDLER_ENABLED);
-			const options: TelemetryHandlerOptions = context.middlewareControl.getMiddlewareOptions(TelemetryHandlerOptions.name) as TelemetryHandlerOptions;
+			const options: TelemetryHandlerOptions = context.middlewareControl.getMiddlewareOptions(TelemetryHandlerOptions) as TelemetryHandlerOptions;
 			assert.equal(options["featureUsage"], FeatureUsageFlag.AUTHENTICATION_HANDLER_ENABLED);
 		});
 
@@ -46,7 +46,7 @@ describe("TelemetryHandlerOptions.ts", () => {
 				request: "url",
 			};
 			TelemetryHandlerOptions.updateFeatureUsageFlag(context, FeatureUsageFlag.AUTHENTICATION_HANDLER_ENABLED);
-			const options: TelemetryHandlerOptions = context.middlewareControl.getMiddlewareOptions(TelemetryHandlerOptions.name) as TelemetryHandlerOptions;
+			const options: TelemetryHandlerOptions = context.middlewareControl.getMiddlewareOptions(TelemetryHandlerOptions) as TelemetryHandlerOptions;
 			assert.equal(options["featureUsage"], FeatureUsageFlag.AUTHENTICATION_HANDLER_ENABLED);
 		});
 	});
diff --git a/spec/tasks/PageIterator.ts b/spec/tasks/PageIterator.ts
@@ -61,12 +61,12 @@ describe("PageIterator.ts", () => {
 	describe("Constructor", () => {
 		it("Should create instance without nextLink", () => {
 			const pageIterator = new PageIterator(client, getPageCollection(), truthyCallback);
-			assert.equal(pageIterator.constructor.name, "PageIterator");
+			assert(pageIterator instanceof PageIterator);
 		});
 
 		it("Should create instance with nextLink", () => {
 			const pageIterator = new PageIterator(client, getPageCollectionWithNext(), truthyCallback);
-			assert.equal(pageIterator.constructor.name, "PageIterator");
+			assert(pageIterator instanceof PageIterator);
 		});
 	});
 
diff --git a/src/GraphErrorHandler.ts b/src/GraphErrorHandler.ts
@@ -89,7 +89,7 @@ export class GraphErrorHandler {
 		let gError: GraphError;
 		if (error && error.error) {
 			gError = GraphErrorHandler.constructErrorFromResponse(error, statusCode);
-		} else if (error && error.constructor.name === "Error") {
+		} else if (error instanceof Error) {
 			gError = GraphErrorHandler.constructError(error, statusCode);
 		} else {
 			gError = new GraphError(statusCode);
diff --git a/src/GraphRequest.ts b/src/GraphRequest.ts
@@ -551,7 +551,7 @@ export class GraphRequest {
 			method: RequestMethod.POST,
 			body: serializeContent(content),
 			headers:
-				content.constructor !== undefined && content.constructor.name === "FormData"
+				content instanceof FormData
 					? {}
 					: {
 							"Content-Type": "application/json",
diff --git a/src/middleware/AuthenticationHandler.ts b/src/middleware/AuthenticationHandler.ts
@@ -64,7 +64,7 @@ export class AuthenticationHandler implements Middleware {
 		try {
 			let options: AuthenticationHandlerOptions;
 			if (context.middlewareControl instanceof MiddlewareControl) {
-				options = context.middlewareControl.getMiddlewareOptions(AuthenticationHandlerOptions.name) as AuthenticationHandlerOptions;
+				options = context.middlewareControl.getMiddlewareOptions(AuthenticationHandlerOptions) as AuthenticationHandlerOptions;
 			}
 			let authenticationProvider: AuthenticationProvider;
 			let authenticationProviderOptions: AuthenticationProviderOptions;
diff --git a/src/middleware/MiddlewareControl.ts b/src/middleware/MiddlewareControl.ts
@@ -20,7 +20,8 @@ export class MiddlewareControl {
 	 * @private
 	 * A member holding map of MiddlewareOptions
 	 */
-	private middlewareOptions: Map<string, MiddlewareOptions>;
+	// tslint:disable-next-line:ban-types
+	private middlewareOptions: Map<Function, MiddlewareOptions>;
 
 	/**
 	 * @public
@@ -30,31 +31,38 @@ export class MiddlewareControl {
 	 * @returns The instance of MiddlewareControl
 	 */
 	public constructor(middlewareOptions: MiddlewareOptions[] = []) {
-		this.middlewareOptions = new Map<string, MiddlewareOptions>();
+		// tslint:disable-next-line:ban-types
+		this.middlewareOptions = new Map<Function, MiddlewareOptions>();
 		for (const option of middlewareOptions) {
-			const name = option.constructor.name;
-			this.middlewareOptions.set(name, option);
+			const fn = option.constructor;
+			this.middlewareOptions.set(fn, option);
 		}
 	}
 
 	/**
 	 * @public
-	 * To get the middleware option using the class name of the option
-	 * @param {string} name - The class name of the strongly typed option class
+	 * To get the middleware option using the class of the option
+	 * @param {Function} fn - The class of the strongly typed option class
 	 * @returns The middleware option
+	 * @example
+	 * // if you wanted to return the middleware option associated with this class (MiddlewareControl)
+	 * // call this function like this:
+	 * getMiddlewareOptions(MiddlewareControl)
 	 */
-	public getMiddlewareOptions(name: string): MiddlewareOptions {
-		return this.middlewareOptions.get(name);
+	// tslint:disable-next-line:ban-types
+	public getMiddlewareOptions(fn: Function): MiddlewareOptions {
+		return this.middlewareOptions.get(fn);
 	}
 
 	/**
 	 * @public
-	 * To set the middleware options using the class name of the option
-	 * @param {string} name - The class name of the strongly typed option class
+	 * To set the middleware options using the class of the option
+	 * @param {Function} fn - The class of the strongly typed option class
 	 * @param {MiddlewareOptions} option - The strongly typed middleware option
 	 * @returns nothing
 	 */
-	public setMiddlewareOptions(name: string, option: MiddlewareOptions): void {
-		this.middlewareOptions.set(name, option);
+	// tslint:disable-next-line:ban-types
+	public setMiddlewareOptions(fn: Function, option: MiddlewareOptions): void {
+		this.middlewareOptions.set(fn, option);
 	}
 }
diff --git a/src/middleware/RedirectHandler.ts b/src/middleware/RedirectHandler.ts
@@ -173,7 +173,7 @@ export class RedirectHandler implements Middleware {
 	private getOptions(context: Context): RedirectHandlerOptions {
 		let options: RedirectHandlerOptions;
 		if (context.middlewareControl instanceof MiddlewareControl) {
-			options = context.middlewareControl.getMiddlewareOptions(this.options.constructor.name) as RedirectHandlerOptions;
+			options = context.middlewareControl.getMiddlewareOptions(RedirectHandlerOptions) as RedirectHandlerOptions;
 		}
 		if (typeof options === "undefined") {
 			options = Object.assign(new RedirectHandlerOptions(), this.options);
diff --git a/src/middleware/RetryHandler.ts b/src/middleware/RetryHandler.ts
@@ -155,7 +155,7 @@ export class RetryHandler implements Middleware {
 	private getOptions(context: Context): RetryHandlerOptions {
 		let options: RetryHandlerOptions;
 		if (context.middlewareControl instanceof MiddlewareControl) {
-			options = context.middlewareControl.getMiddlewareOptions(this.options.constructor.name) as RetryHandlerOptions;
+			options = context.middlewareControl.getMiddlewareOptions(this.options.constructor) as RetryHandlerOptions;
 		}
 		if (typeof options === "undefined") {
 			options = Object.assign(new RetryHandlerOptions(), this.options);
diff --git a/src/middleware/TelemetryHandler.ts b/src/middleware/TelemetryHandler.ts
@@ -74,7 +74,7 @@ export class TelemetryHandler implements Middleware {
 			let sdkVersionValue: string = `${TelemetryHandler.PRODUCT_NAME}/${PACKAGE_VERSION}`;
 			let options: TelemetryHandlerOptions;
 			if (context.middlewareControl instanceof MiddlewareControl) {
-				options = context.middlewareControl.getMiddlewareOptions(TelemetryHandlerOptions.name) as TelemetryHandlerOptions;
+				options = context.middlewareControl.getMiddlewareOptions(TelemetryHandlerOptions) as TelemetryHandlerOptions;
 			}
 			if (typeof options !== "undefined") {
 				const featureUsage: string = options.getFeatureUsage();
diff --git a/src/middleware/options/TelemetryHandlerOptions.ts b/src/middleware/options/TelemetryHandlerOptions.ts
@@ -52,13 +52,13 @@ export class TelemetryHandlerOptions implements MiddlewareOptions {
 	public static updateFeatureUsageFlag(context: Context, flag: FeatureUsageFlag): void {
 		let options: TelemetryHandlerOptions;
 		if (context.middlewareControl instanceof MiddlewareControl) {
-			options = context.middlewareControl.getMiddlewareOptions(TelemetryHandlerOptions.name) as TelemetryHandlerOptions;
+			options = context.middlewareControl.getMiddlewareOptions(TelemetryHandlerOptions) as TelemetryHandlerOptions;
 		} else {
 			context.middlewareControl = new MiddlewareControl();
 		}
 		if (typeof options === "undefined") {
 			options = new TelemetryHandlerOptions();
-			context.middlewareControl.setMiddlewareOptions(TelemetryHandlerOptions.name, options);
+			context.middlewareControl.setMiddlewareOptions(TelemetryHandlerOptions, options);
 		}
 		options.setFeatureUsage(flag);
 	}
diff --git a/src/tasks/OneDriveLargeFileUploadTask.ts b/src/tasks/OneDriveLargeFileUploadTask.ts
@@ -76,21 +76,18 @@ export class OneDriveLargeFileUploadTask extends LargeFileUploadTask {
 		const name: string = options.fileName;
 		let content;
 		let size;
-		switch (file.constructor.name) {
-			case "Blob":
-				content = new File([file as Blob], name);
-				size = content.size;
-				break;
-			case "File":
-				content = file as File;
-				size = content.size;
-				break;
-			case "Buffer":
-				const b = file as Buffer;
-				size = b.byteLength - b.byteOffset;
-				content = b.buffer.slice(b.byteOffset, b.byteOffset + b.byteLength);
-				break;
+		if (file instanceof Blob) {
+			content = new File([file as Blob], name);
+			size = content.size;
+		} else if (file instanceof File) {
+			content = file as File;
+			size = content.size;
+		} else if (file instanceof Buffer) {
+			const b = file as Buffer;
+			size = b.byteLength - b.byteOffset;
+			content = b.buffer.slice(b.byteOffset, b.byteOffset + b.byteLength);
 		}
+
 		try {
 			const requestUrl = OneDriveLargeFileUploadTask.constructCreateSessionUrl(options.fileName, options.path);
 			const session = await OneDriveLargeFileUploadTask.createUploadSession(client, requestUrl, options.fileName);

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ export class AuthenticationHandler implements Middleware {`
`64`	`64`	`try {`
`65`	`65`	`let options: AuthenticationHandlerOptions;`
`66`	`66`	`if (context.middlewareControl instanceof MiddlewareControl) {`
`67`		`- options = context.middlewareControl.getMiddlewareOptions(AuthenticationHandlerOptions.name) as AuthenticationHandlerOptions;`
	`67`	`+ options = context.middlewareControl.getMiddlewareOptions(AuthenticationHandlerOptions) as AuthenticationHandlerOptions;`
`68`	`68`	`}`
`69`	`69`	`let authenticationProvider: AuthenticationProvider;`
`70`	`70`	`let authenticationProviderOptions: AuthenticationProviderOptions;`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ export class RedirectHandler implements Middleware {`
`173`	`173`	`private getOptions(context: Context): RedirectHandlerOptions {`
`174`	`174`	`let options: RedirectHandlerOptions;`
`175`	`175`	`if (context.middlewareControl instanceof MiddlewareControl) {`
`176`		`- options = context.middlewareControl.getMiddlewareOptions(this.options.constructor.name) as RedirectHandlerOptions;`
	`176`	`+ options = context.middlewareControl.getMiddlewareOptions(RedirectHandlerOptions) as RedirectHandlerOptions;`
`177`	`177`	`}`
`178`	`178`	`if (typeof options === "undefined") {`
`179`	`179`	`options = Object.assign(new RedirectHandlerOptions(), this.options);`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ export class RetryHandler implements Middleware {`
`155`	`155`	`private getOptions(context: Context): RetryHandlerOptions {`
`156`	`156`	`let options: RetryHandlerOptions;`
`157`	`157`	`if (context.middlewareControl instanceof MiddlewareControl) {`
`158`		`- options = context.middlewareControl.getMiddlewareOptions(this.options.constructor.name) as RetryHandlerOptions;`
	`158`	`+ options = context.middlewareControl.getMiddlewareOptions(this.options.constructor) as RetryHandlerOptions;`
`159`	`159`	`}`
`160`	`160`	`if (typeof options === "undefined") {`
`161`	`161`	`options = Object.assign(new RetryHandlerOptions(), this.options);`