Callback is now called when write stream completes

dan-silver · dan-silver · commit 4029dfab44a8 · 2016-10-12T11:39:44.000-07:00
diff --git a/lib/graph-js-sdk-web.js b/lib/graph-js-sdk-web.js
@@ -234,13 +234,20 @@ class GraphRequest {
             }
         });
     }
-    put(stream, errorCallback) {
+    put(stream, callback) {
         this.config.authProvider((err, accessToken) => {
             if (err === null && accessToken !== null) {
                 let url = this.buildFullUrl();
                 let req = this.configureRequest(request.put(url), accessToken);
                 req.type('application/octet-stream');
-                stream.pipe(req).on('error', errorCallback);
+                stream
+                    .pipe(req)
+                    .on('error', function (err) {
+                    callback(err, null);
+                })
+                    .on('end', function () {
+                    callback(null);
+                });
             }
         });
     }
diff --git a/lib/index.d.ts b/lib/index.d.ts
@@ -63,7 +63,7 @@ export declare class GraphRequest {
     private routeResponseToCallback(requestBuilder, callback);
     private sendRequestAndRouteResponse(requestBuilder, callback?);
     getStream(callback: GraphRequestCallback): void;
-    put(stream: any, errorCallback: Function): void;
+    put(stream: any, callback: Function): void;
     private configureRequest(requestBuilder, accessToken);
     getResultIterator(): IterableIterator<(callback: any) => void>;
     query(queryDictionaryOrString: string | {
diff --git a/lib/index.js b/lib/index.js
diff --git a/lib/index.js.map b/lib/index.js.map
diff --git a/samples/node/node-sample.js b/samples/node/node-sample.js
@@ -272,10 +272,14 @@ client
     });
 
 // Update my photo
-let profilePhotoReadStream = fs.createReadStream('../me.jpg');
+let fs = require('fs');
+let profilePhotoReadStream = fs.createReadStream('me.jpg');
 
 client
     .api('/me/photo/$value')
     .put(profilePhotoReadStream, (err) => {
-        console.log(err);
+        if (err) {
+            console.log(err);
+            return;
+        }
     });
diff --git a/src/index.ts b/src/index.ts
@@ -361,13 +361,20 @@ export class GraphRequest {
         });
     }
 
-    put(stream:any, errorCallback:Function) {
+    put(stream:any, callback:Function) {
         this.config.authProvider((err, accessToken) => {
             if (err === null && accessToken !== null) {
                 let url = this.buildFullUrl();
                 let req:request.Request = this.configureRequest(request.put(url), accessToken);
                 req.type('application/octet-stream');
-                stream.pipe(req).on('error', errorCallback);
+                stream
+                    .pipe(req)
+                    .on('error', function(err) {
+                        callback(err, null)
+                    })
+                    .on('end', function() {
+                        callback(null)
+                    });
             }
         });
     }

Original file line number	Diff line number	Diff line change
`@@ -234,13 +234,20 @@ class GraphRequest {`
`234`	`234`	`}`
`235`	`235`	`});`
`236`	`236`	`}`
`237`		`- put(stream, errorCallback) {`
	`237`	`+ put(stream, callback) {`
`238`	`238`	`this.config.authProvider((err, accessToken) => {`
`239`	`239`	`if (err === null && accessToken !== null) {`
`240`	`240`	`let url = this.buildFullUrl();`
`241`	`241`	`let req = this.configureRequest(request.put(url), accessToken);`
`242`	`242`	`req.type('application/octet-stream');`
`243`		`- stream.pipe(req).on('error', errorCallback);`
	`243`	`+ stream`
	`244`	`+ .pipe(req)`
	`245`	`+ .on('error', function (err) {`
	`246`	`+ callback(err, null);`
	`247`	`+ })`
	`248`	`+ .on('end', function () {`
	`249`	`+ callback(null);`
	`250`	`+ });`
`244`	`251`	`}`
`245`	`252`	`});`
`246`	`253`	`}`