@sambath999/localize-token 12.4.6 → 12.4.8

package/bundles/sambath999-localize-token.umd.js

@@ -668,8 +668,11 @@
         };
         LocalizeTokenService.prototype.tokensValid = function () {
             var _a, _b;
-            return !!((_a = this.refreshToken) === null || _a === void 0 ? void 0 : _a.length)
-                && (!this.config.tenantToken || !!((_b = this.tenantToken) === null || _b === void 0 ? void 0 : _b.length));
+            if (!((_a = this.refreshToken) === null || _a === void 0 ? void 0 : _a.length))
+                return false;
+            if (this.config.requiredTenant && !((_b = this.tenantToken) === null || _b === void 0 ? void 0 : _b.length))
+                return false;
+            return true;
         };
         Object.defineProperty(LocalizeTokenService.prototype, "decodeRefreshToken", {
             get: function () {
@@ -1069,8 +1072,8 @@
                 });
             });
         };
-        LocalizeApiHelper.prototype.createRequest = function (instance, method, url, body, options) {
-            var request$ = instance.client.request(method, url, Object.assign(Object.assign({}, options), { body: body, observe: 'response' })).pipe(rxjs.takeUntil(instance.destroy$()), rxjs.catchError(function (error) {
+        LocalizeApiHelper.prototype.createRequest = function (instance, method, url, body, options, onInvalidResponseBody) {
+            var request$ = instance.client.request(method, url, Object.assign(Object.assign({}, options), { body: body })).pipe(rxjs.takeUntil(instance.destroy$()), rxjs.map(function (body) { return extractJsonFromResponse(body, onInvalidResponseBody); }), rxjs.catchError(function (error) {
                 // Convert to a non-observable error to handle in the promise
                 return rxjs.throwError(function () { return error; });
             }));
@@ -1145,6 +1148,27 @@
         };
         return LocalizeApiHelper;
     }());
+    function extractJsonFromResponse(body, onError) {
+        // If already an object, just return
+        if (typeof body === 'object' && body !== null)
+            return body;
+        // If it's a string, try to extract JSON portion
+        if (typeof body === 'string') {
+            var firstBrace = body.indexOf('{');
+            if (firstBrace !== -1) {
+                var jsonString = body.substring(firstBrace);
+                try {
+                    return JSON.parse(jsonString);
+                }
+                catch (e) {
+                    // If parsing fails, return original string
+                    onError === null || onError === void 0 ? void 0 : onError(body);
+                    return body;
+                }
+            }
+        }
+        return body;
+    }
     var ApiHelper = new LocalizeApiHelper();
 
     var SCHEMES = LocalizeToken.httpHeaders;
@@ -1251,7 +1275,7 @@
                 var _this = this;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
-                        case 0: return [4 /*yield*/, waitUntil(function () { return !_this.isResolvingStartup; }, 100)];
+                        case 0: return [4 /*yield*/, waitUntil(function () { return !_this.isResolvingStartup; }, 500)];
                         case 1:
                             _e.sent();
                             return [4 /*yield*/, ApiHelper.invokeHook(this.config.onPrepareRequest)];
@@ -1313,6 +1337,7 @@
             });
         };
         LocalizeApiService.prototype.performRequest = function (options) {
+            var _a;
             return __awaiter(this, void 0, void 0, function () {
                 var buildOptions, request$, response;
                 var _this = this;
@@ -1323,10 +1348,10 @@
                             request$ = ApiHelper.createRequest({
                                 client: this.httpClient,
                                 destroy$: function () { return _this.destroy$; }
-                            }, options.method, options.requestUrl, options.requestBody, buildOptions);
+                            }, options.method, options.requestUrl, options.requestBody, buildOptions, (_a = this.config.onResponseBodyInvalid) === null || _a === void 0 ? void 0 : _a.bind(this));
                             // Set the isRequesting state to true before making the request
                             this.isRequestingSubject.next(true);
-                            return [4 /*yield*/, new Promise(function (resolve, reject) { return request$.subscribe({ next: function (res) { return resolve(res.body); }, error: reject }); })];
+                            return [4 /*yield*/, new Promise(function (resolve, reject) { return request$.subscribe({ next: resolve, error: reject }); })];
                         case 1:
                             response = _e.sent();
                             // Reset the isRequesting state after the request completes
@@ -1364,7 +1389,7 @@
                         case 5:
                             // Handle the error, log it
                             _e.sent();
-                            return [3 /*break*/, 7];
+                            throw error_2;
                         case 6:
                             // Reset the revoking token state
                             this.isRevokingToken = false;
@@ -1397,10 +1422,8 @@
                     switch (_e.label) {
                         case 0:
                             if (!this.isRevokingToken) return [3 /*break*/, 2];
-                            // console.warn('A token refresh is in progress. Request is waiting.');
                             return [4 /*yield*/, waitUntil(function () { return !_this.isRevokingToken; })];
                         case 1:
-                            // console.warn('A token refresh is in progress. Request is waiting.');
                             _e.sent();
                             _e.label = 2;
                         case 2:
@@ -1462,7 +1485,7 @@
         };
         LocalizeApiService.prototype.validateConfig = function () {
             var _a, _b, _c, _d;
-            if (this.localizeTokenService.config.tenantToken
+            if (this.localizeTokenService.config.requiredTenant
                 && !((_b = (_a = this.localizeTokenService.config.tenantToken) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.trim().length)) {
                 throw Error('Tenant token is required but tenantTokenName is not configured');
             }