AuthHandler check for graph url, createUploadResult static function

Author: nikithauc

.huskyrc

@@ -1,5 +1,2 @@
 {
-	"hooks": {
-		"pre-commit": "npm run pre-build && git add src/Version.ts && lint-staged && npm run lint && npm run test"
-	}
 }

samples/node/main.js

@@ -9,28 +9,119 @@ const MicrosoftGraph = require("../../lib/src/index.js");
 
 const secrets = require("./secrets");
 
-const fs = require("fs");
+const fs = require('fs');
 
 const client = MicrosoftGraph.Client.init({
-	defaultVersion: "v1.0",
-	debugLogging: true,
-	authProvider: (done) => {
-		done(null, secrets.accessToken);
-	},
+    defaultVersion: "v1.0",
+    debugLogging: true,
+    authProvider: (done) => {
+        done(null, secrets.accessToken);
+    },
 });
 
+function uploadFile1() {
+    fs.readFile("./test.txt", {}, function(err, file) {
+        if (err) {
+            throw err;
+        }
+        let fileName = "text.txt";
+        oneDriveLargeFileUpload1(client, file, fileName)
+            .then((response) => {
+                console.log(response);
+                console.log("File Uploaded Successfully.!!");
+            })
+            .catch((error) => {
+                throw error;
+            });
+    });
+}
+async function oneDriveLargeFileUpload1(client, file, fileName) {
+    try {
+        let options = {
+            path: "/Documents",
+            fileName,
+            rangeSize: 1024 * 1024,
+        };
+        const uploadTask = await MicrosoftGraph.OneDriveLargeFileUploadTask.create(client, file, options);
+        const response = await uploadTask.upload();
+        return response;
+    } catch (err) {
+        console.log(err);
+    }
+}
+uploadFile1();
+
 // Get the name of the authenticated user with promises
-client
-	.api("/me")
-	.select("displayName")
-	.get()
-	.then((res) => {
-		console.log(res);
-	})
-	.catch((err) => {
-		console.log(err);
-	});
+// client
+// 	.api("/me")
+// 	.select("displayName")
+// 	.get()
+// 	.then((res) => {
+// 		console.log(res);
+// 	})
+// 	.catch((err) => {
+// 		console.log(err);
+// 	});
+
+
+//uploadFile();
+function uploadFile() {
+    fs.readFile("./test.txt", {}, function (err, file) {
+        if (err) {
+            throw err;
+        }
+        var stats = fs.statSync("./test.txt")
+
+        const messageId = "AAMkADZiNzhhNTVkLWU5MDEtNGNlNy1hMjZiLTJjN2RkNjcyNGM4NgBGAAAAAABxs3khvJ1fSYvq33QgqqSJBwBC_D0Xqz_3TKBt1JyxMQ_VAAAAAAEMAABC_D0Xqz_3TKBt1JyxMQ_VAACGMDZTAAA=";
+        client.api(`me/messages/${messageId}/attachments/createUploadSession`).post({
+            AttachmentItem: {
+                attachmentType: 'file',
+                name: "test.txt",
+                size: stats.size,
+            }
+        })
+            .then((response) => {
+                console.log(response);
+
+                console.log("File Uploaded Successfully.!!");
+                oneDriveLargeFileUpload(client, file, response)
+                    .then((res) => {
+                        console.log(res);
+                        console.log("File Uploaded Successfully.!!");
+                    })
+                    .catch((error) => {
+                        throw error;
+                    });
+            })
+            .catch((error) => {
+                console.log(".!!");
+                console.log(error);
+            });
+
+    });
+}
 
+async function oneDriveLargeFileUpload(client, file, uploadSession) {
+    try {
+        let fileName = "test.txt";
+        let options = {
+            path: "/Documents",
+            fileName,
+            rangeSize: 1024 * 1024,
+        };
+        const s = {
+            url:uploadSession.uploadUrl,
+            expiry: uploadSession.expirationDateTime
+        }
+        console.log("uploadSession");
+        const uploadTask = new MicrosoftGraph.LargeFileUploadTask(client, file, s, options);
+        console.log(uploadTask+"uploadTask");
+        const response = await uploadTask.upload();
+        return response;
+    } catch (err) {
+        console.log(err);
+    }
+}
 /*
 
 // Update the authenticated users birthday.

samples/node/package-lock.json

@@ -9,6 +9,9 @@
 	"author": "",
 	"license": "ISC",
 	"dependencies": {
-		"isomorphic-fetch": "^2.2.1"
+		"bytes": "^3.1.0",
+		"isomorphic-fetch": "^2.2.1",
+		"minimist": "^1.2.5",
+		"path": "^0.12.7"
 	}
 }

samples/node/package.json

@@ -9,6 +9,7 @@
  * @module AuthenticationHandler
  */
 
+import { isGraphURL } from "../GraphRequestUtil";
 import { AuthenticationProvider } from "../IAuthenticationProvider";
 import { AuthenticationProviderOptions } from "../IAuthenticationProviderOptions";
 import { Context } from "../IContext";
@@ -60,6 +61,8 @@ export class AuthenticationHandler implements Middleware {
 	 * @returns A Promise that resolves to nothing
 	 */
 	public async execute(context: Context): Promise<void> {
+		const url = typeof context.request === "string" ? context.request : context.request.url;
+			if (isGraphURL(url)) {
 		let options: AuthenticationHandlerOptions;
 		if (context.middlewareControl instanceof MiddlewareControl) {
 			options = context.middlewareControl.getMiddlewareOptions(AuthenticationHandlerOptions) as AuthenticationHandlerOptions;
@@ -77,6 +80,11 @@ export class AuthenticationHandler implements Middleware {
 		const bearerKey = `Bearer ${token}`;
 		appendRequestHeader(context.request, context.options, AuthenticationHandler.AUTHORIZATION_HEADER, bearerKey);
 		TelemetryHandlerOptions.updateFeatureUsageFlag(context, FeatureUsageFlag.AUTHENTICATION_HANDLER_ENABLED);
+	} else {
+		if (context.options.headers) {
+			delete context.options.headers[AuthenticationHandler.AUTHORIZATION_HEADER];
+		}
+	}
 		return await this.nextMiddleware.execute(context);
 	}
 

samples/node/secrets.sample.json

@@ -1,9 +1,6 @@
-
-import { GraphResponseHandler } from "../../GraphResponseHandler";
 export class UploadResult {
     private _location: string;
     private _body: unknown;
-    private _uploadSuccess: boolean;
 
     public get location(): string {
         return this._location;
@@ -22,10 +19,12 @@ export class UploadResult {
         this._body = body;
     }
 
-    public async setUploadResult(response: Response) {
-        this._location = response.headers.get("Location");
-        this._body = await GraphResponseHandler.getResponse(response);
-        this._uploadSuccess = 
+    public constructor(body:unknown, location:string){
+        this._location = location;
+        this._body = body;
+    }
+    
+    public static CreateUploadResult(responsebody?:unknown, responseHeaders?:Headers){
+        return new UploadResult(responsebody, (responseHeaders.get("Location") || responseHeaders.get("headers")));
     }
-
 }

src/middleware/AuthenticationHandler.ts

@@ -236,11 +236,10 @@ export class LargeFileUploadTask {
 
 			const responseBody = await GraphResponseHandler.getResponse(rawResponse);
 			if (rawResponse.status == 201 || (rawResponse.status == 200 && responseBody.id)) {
-				const result = new UploadResult();
-				return result.setUploadResult(rawResponse);
+				return UploadResult.CreateUploadResult(responseBody, rawResponse.headers);
 			}
 
-			/* Handling an API issue where the case of Outlook upload 'nextExpectedRanges' property is not uniform.
+			/* Handling the API issue where the case of Outlook upload response property -'nextExpectedRanges'  is not uniform.
 			* https://github.com/microsoftgraph/msgraph-sdk-serviceissues/issues/39
 			*/
 			const res: UploadStatusResponse = {
@@ -249,7 +248,6 @@ export class LargeFileUploadTask {
 			};
 
 			this.updateTaskStatus(res);
-			this.updateTaskStatus(responseBody);
 		}
 	}