@thelllabs/winehaus-sdk 0.0.4 → 0.0.7

package/dist/cjs/sdk.js

@@ -150,13 +150,13 @@ var WinehausSDK = /** @class */ (function () {
                     case 0:
                         if (!(((_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.status) === 401 &&
                             this.authToken &&
-                            this.refreshToken &&
+                            // ToDO: Uncomment this this.refreshToken &&
                             !refreshTokenUsed.has(this.refreshToken))) return [3 /*break*/, 4];
                         refreshTokenUsed.add(this.refreshToken);
                         _c.label = 1;
                     case 1:
                         _c.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, this.refreshTokens()];
+                        return [4 /*yield*/, this.refreshTokens({ throwError: true })];
                     case 2:
                         _c.sent();
                         return [3 /*break*/, 4];
@@ -184,10 +184,22 @@ var WinehausSDK = /** @class */ (function () {
                     case 0:
                         if (!(opts === null || opts === void 0 ? void 0 : opts.avoidEvents))
                             this.emitter.emit('connecting');
+                        if (!((credential === null || credential === void 0 ? void 0 : credential.email) && (credential === null || credential === void 0 ? void 0 : credential.password))) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.authenticateAsUser(credential)];
                     case 1:
                         _a.sent();
-                        this.credential = credential;
+                        this.signInCredential = credential;
+                        return [3 /*break*/, 5];
+                    case 2:
+                        if (!(credential === null || credential === void 0 ? void 0 : credential.authToken)) return [3 /*break*/, 4];
+                        // ToDO add && (credential as any)?.refreshToken after refreshToken is ready
+                        return [4 /*yield*/, this.authenticateAsToken(credential)];
+                    case 3:
+                        // ToDO add && (credential as any)?.refreshToken after refreshToken is ready
+                        _a.sent();
+                        return [3 /*break*/, 5];
+                    case 4: throw new Error("Invalid auth credential type format");
+                    case 5:
                         if (!(opts === null || opts === void 0 ? void 0 : opts.avoidEvents))
                             this.emitter.emit('connected');
                         this.hookTimer();
@@ -196,14 +208,17 @@ var WinehausSDK = /** @class */ (function () {
             });
         });
     };
-    WinehausSDK.prototype.reAuthenticate = function () {
+    WinehausSDK.prototype.reAuthenticate = function (opts) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!this.credential)
-                            throw new Error('No credential found');
-                        return [4 /*yield*/, this.authenticate(this.credential)];
+                        if (!this.signInCredential) {
+                            if (opts === null || opts === void 0 ? void 0 : opts.throwError)
+                                new Error("No SignIn set to make re-auth");
+                            return [2 /*return*/];
+                        }
+                        return [4 /*yield*/, this.authenticate(this.signInCredential, { avoidEvents: true })];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -232,7 +247,8 @@ var WinehausSDK = /** @class */ (function () {
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        if (!this.authToken || !this.refreshToken) {
+                        //Todo: add || !this.refreshToken after implementing it here
+                        if (!this.authToken) {
                             return [2 /*return*/, this.clearTokens()];
                         }
                         if (!((_a = this.authTokenDecoded) === null || _a === void 0 ? void 0 : _a.exp)) {
@@ -277,14 +293,14 @@ var WinehausSDK = /** @class */ (function () {
     WinehausSDK.prototype.getRefreshToken = function () {
         return this.refreshToken.toString();
     };
-    WinehausSDK.prototype.refreshTokens = function () {
+    WinehausSDK.prototype.refreshTokens = function (opts) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         // ToDo: Refresh token is not implemented under this version. For a while, lets just re-auth
                         this.clearTokens();
-                        return [4 /*yield*/, this.reAuthenticate()];
+                        return [4 /*yield*/, this.reAuthenticate(opts)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -310,6 +326,14 @@ var WinehausSDK = /** @class */ (function () {
             });
         });
     };
+    WinehausSDK.prototype.authenticateAsToken = function (credential) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                this.setTokens({ token: credential.authToken, refreshToken: credential.refreshToken });
+                return [2 /*return*/];
+            });
+        });
+    };
     WinehausSDK.prototype.setTokens = function (data) {
         this.setAuthToken(data.token);
         this.setRefreshToken(data.refreshToken);