Lint samples, eslint remove comments

Author: nikithauc

.eslintignore

@@ -4,5 +4,4 @@
 
 node_modules
 lib
-samples
 spec/development

.eslintrc.json

@@ -4,10 +4,6 @@
 	"plugins": ["@typescript-eslint", "prettier", "simple-import-sort"],
 	"extends": ["eslint:recommended", "plugin:@typescript-eslint/eslint-recommended", "plugin:@typescript-eslint/recommended", "prettier"],
 	"rules": {
-		"no-useless-catch": "error", //TODO- Remove the unnecessary try-catch lines used and enable no-useless-catch rule.
-		"prefer-rest-params": "off",
-		"no-constant-condition": "error",
-		// @typescript-eslint rules
 		"@typescript-eslint/no-empty-interface": "warn",
 		"@typescript-eslint/ban-types": "off",
 		"@typescript-eslint/no-unused-vars": "error",
@@ -155,7 +151,9 @@
 		"@typescript-eslint/no-namespace": "off",
 		"@typescript-eslint/no-parameter-properties": "off",
 		"@typescript-eslint/no-array-constructor": "error",
-		// eslint rules
+		"no-useless-catch": "error",
+		"prefer-rest-params": "off",
+		"no-constant-condition": "error",
 		"simple-import-sort/imports": "error",
 		"brace-style": "error",
 		"constructor-super": "error",

samples/tokenCredentialSamples/AuthenticationCodeFlow/src/index.ts

@@ -8,16 +8,17 @@
 /**
  * This sample is referenced from - https://github.com/Azure/azure-sdk-for-js/blob/master/sdk/identity/identity/samples/manual/authorizationCodeSample.ts
  */
+import "isomorphic-fetch";
+
 import { AuthorizationCodeCredential } from "@azure/identity";
+import { Client } from "@microsoft/microsoft-graph-client";
+import { TokenCredentialAuthenticationProvider } from "@microsoft/microsoft-graph-client/authProviders/azureTokenCredentials";
 import express from "express";
 import { Server } from "http";
-import "isomorphic-fetch";
 import open from "open";
 import qs from "qs";
 
-import { TokenCredentialAuthenticationProvider } from "@microsoft/microsoft-graph-client/authProviders/azureTokenCredentials";
-import { Client } from "@microsoft/microsoft-graph-client";
-import { port, tenantId, clientSecret, clientId, scopes, authorityHost, redirectUri } from "./secrets";
+import { authorityHost, clientId, clientSecret, port, redirectUri, scopes, tenantId } from "./secrets";
 
 if (tenantId === undefined || clientId === undefined) {
 	console.error("AZURE_TENANT_ID and AZURE_CLIENT_ID environment variables must be set");
@@ -40,8 +41,7 @@ async function getCredential(): Promise<AuthorizationCodeCredential> {
 	// authentication redirect to be sent to the local redirect URI.
 	const authCodePromise = new Promise<string>((resolve, reject) => {
 		const app = express();
-		let server: Server | undefined = undefined;
-
+		const server: Server = app.listen(port, () => console.log(`Authorization code redirect server listening on port ${port}`));
 		app.get("/authresponse", (req, res) => {
 			// Close the temporary server once we've received the redirect.
 			res.sendStatus(200);
@@ -57,14 +57,12 @@ async function getCredential(): Promise<AuthorizationCodeCredential> {
 				reject(new Error(`Authentication Error "${req.query["error"]}":\n\n${req.query["error_description"]}`));
 			}
 		});
-
-		server = app.listen(port, () => console.log(`Authorization code redirect server listening on port ${port}`));
 	});
 
 	// Direct the user to the authentication URI either by opening a
 	// browser (desktop and mobile apps) or redirecting their browser
 	// using a Location header (web apps and APIs).
-	const authorizeUrl = getAuthorizeUrl(tenantId!, clientId!, scopes);
+	const authorizeUrl = getAuthorizeUrl(tenantId, clientId, scopes);
 	console.log("Opening user's browser to URL:", authorizeUrl);
 	await open(authorizeUrl);
 
@@ -77,8 +75,8 @@ async function getCredential(): Promise<AuthorizationCodeCredential> {
 	// refreshing the access token from this point forward.
 	if (clientSecret) {
 		return new AuthorizationCodeCredential(
-			tenantId!,
-			clientId!,
+			tenantId,
+			clientId,
 			clientSecret,
 			authorizationCode,
 			redirectUri,
@@ -92,8 +90,8 @@ async function getCredential(): Promise<AuthorizationCodeCredential> {
 		// NOTE: If there is no client secret, we can construct an auth code credential
 		// using this method.
 		return new AuthorizationCodeCredential(
-			tenantId!,
-			clientId!,
+			tenantId,
+			clientId,
 			authorizationCode,
 			redirectUri,
 			// NOTE: It is not necessary to explicitly pass the authorityHost when using

samples/tokenCredentialSamples/ClientCredentialFlow/typescript/index.ts

@@ -1,9 +1,9 @@
-import { ClientSecretCredential } from "@azure/identity";
-
 import "isomorphic-fetch";
 
-import { TokenCredentialAuthenticationProvider } from "@microsoft/microsoft-graph-client/authProviders/azureTokenCredentials";
+import { ClientSecretCredential } from "@azure/identity";
 import { Client } from "@microsoft/microsoft-graph-client";
+import { TokenCredentialAuthenticationProvider } from "@microsoft/microsoft-graph-client/authProviders/azureTokenCredentials";
+
 import { clientId, clientSecret, scopes, tenantId } from "./secrets";
 
 async function runExample() {

src/GraphRequest.ts

@@ -655,8 +655,7 @@ export class GraphRequest {
 			this.setHeaderContentType();
 			options.headers = this._headers;
 		}
-		const response = await this.send(url, options, callback);
-		return response;
+		return await this.send(url, options, callback);
 	}
 
 	/**
@@ -686,8 +685,7 @@ export class GraphRequest {
 			method: RequestMethod.PUT,
 			body: serializeContent(content),
 		};
-		const response = await this.send(url, options, callback);
-		return response;
+		return await this.send(url, options, callback);
 	}
 
 	/**
@@ -705,8 +703,7 @@ export class GraphRequest {
 			method: RequestMethod.PATCH,
 			body: serializeContent(content),
 		};
-		const response = await this.send(url, options, callback);
-		return response;
+		return await this.send(url, options, callback);
 	}
 
 	/**
@@ -733,8 +730,7 @@ export class GraphRequest {
 		const options: FetchOptions = {
 			method: RequestMethod.DELETE,
 		};
-		const response = await this.send(url, options, callback);
-		return response;
+		return await this.send(url, options, callback);
 	}
 
 	/**
@@ -761,8 +757,7 @@ export class GraphRequest {
 			method: RequestMethod.GET,
 		};
 		this.responseType(ResponseType.STREAM);
-		const stream = await this.send(url, options, callback);
-		return stream;
+		return await this.send(url, options, callback);
 	}
 
 	/**
@@ -782,7 +777,6 @@ export class GraphRequest {
 			},
 			body: stream,
 		};
-		const response = await this.send(url, options, callback);
-		return response;
+		return await this.send(url, options, callback);
 	}
 }

src/middleware/HTTPMessageHandler.ts

@@ -27,6 +27,5 @@ export class HTTPMessageHandler implements Middleware {
 	 */
 	public async execute(context: Context): Promise<void> {
 		context.response = await fetch(context.request, context.options);
-		return;
 	}
 }