Throwing caught exceptions during JWT token refresh (#77)

* Bug fix (#71)

- When refreshing JWT token, throw caught exceptions.

* Adding generated files

* Fixing payload types

Author: prashant-shahi

lib/client.js

@@ -54,38 +54,40 @@ var DgraphClient = (function () {
     }
     DgraphClient.prototype.alter = function (op, metadata, options) {
         return __awaiter(this, void 0, void 0, function () {
-            var c, payload, operation, e_1, pl;
+            var c, payload, operation, _a, _b, e_1, _c, _d;
             var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
                         this.debug("Alter request:\n" + util_1.stringifyMessage(op));
                         c = this.anyClient();
                         operation = function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
                             return [2, c.alter(op, metadata, options)];
                         }); }); };
-                        _a.label = 1;
+                        _e.label = 1;
                     case 1:
-                        _a.trys.push([1, 3, , 7]);
+                        _e.trys.push([1, 3, , 8]);
+                        _b = (_a = types).createPayload;
                         return [4, operation()];
                     case 2:
-                        payload = _a.sent();
-                        return [3, 7];
+                        payload = _b.apply(_a, [_e.sent()]);
+                        return [3, 8];
                     case 3:
-                        e_1 = _a.sent();
+                        e_1 = _e.sent();
                         if (!(isJwtExpired(e_1) === true)) return [3, 6];
                         return [4, c.retryLogin(metadata, options)];
                     case 4:
-                        _a.sent();
+                        _e.sent();
+                        _d = (_c = types).createPayload;
                         return [4, operation()];
                     case 5:
-                        payload = _a.sent();
-                        _a.label = 6;
-                    case 6: return [3, 7];
-                    case 7:
-                        pl = types.createPayload(payload);
-                        this.debug("Alter response:\n" + util_1.stringifyMessage(pl));
-                        return [2, pl];
+                        payload = _d.apply(_c, [_e.sent()]);
+                        return [3, 7];
+                    case 6: throw e_1;
+                    case 7: return [3, 8];
+                    case 8:
+                        this.debug("Alter response:\n" + util_1.stringifyMessage(payload));
+                        return [2, payload];
                 }
             });
         });

lib/txn.js

@@ -238,11 +238,11 @@ var Txn = (function () {
                         }); }); };
                         _a.label = 1;
                     case 1:
-                        _a.trys.push([1, 3, , 7]);
+                        _a.trys.push([1, 3, , 8]);
                         return [4, operation()];
                     case 2:
                         _a.sent();
-                        return [3, 7];
+                        return [3, 8];
                     case 3:
                         e_4 = _a.sent();
                         if (!(client_1.isJwtExpired(e_4) === true)) return [3, 6];
@@ -252,9 +252,10 @@ var Txn = (function () {
                         return [4, operation()];
                     case 5:
                         _a.sent();
-                        _a.label = 6;
-                    case 6: return [3, 7];
-                    case 7: return [2];
+                        return [3, 7];
+                    case 6: throw util_1.isAbortedError(e_4) ? errors_1.ERR_ABORTED : e_4;
+                    case 7: return [3, 8];
+                    case 8: return [2];
                 }
             });
         });

src/client.ts

@@ -51,9 +51,11 @@ export class DgraphClient {
             if (isJwtExpired(e) === true) {
                 await c.retryLogin(metadata, options);
                 payload = await operation();
+            } else {
+                throw e;
             }
         }
-        const pl = types.createPayload(payload);
+        const pl: types.Payload = types.createPayload(payload);
         this.debug(`Alter response:\n${stringifyMessage(pl)}`);
 
         return pl;

src/txn.ts

@@ -227,13 +227,15 @@ export class Txn {
 
         this.ctx.setAborted(true);
         const c = this.dc.anyClient();
-        const operation = async() => c.commitOrAbort(this.ctx, metadata, options);
+        const operation = async () => c.commitOrAbort(this.ctx, metadata, options);
         try {
             await operation();
         } catch (e) {
             if (isJwtExpired(e) === true) {
                 await c.retryLogin(metadata, options);
                 await operation();
+            } else {
+                throw isAbortedError(e) ? ERR_ABORTED : e;
             }
         }
     }