@sambath999/localize-token 12.4.9 → 12.4.11

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

@@ -334,6 +334,16 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(LocalizeTokenService.prototype, "clientId", {
+            get: function () { var _a; return LocalizeToken.storage.get(((_a = this.config.thirdPartyConfig) === null || _a === void 0 ? void 0 : _a.clientId) || ''); },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(LocalizeTokenService.prototype, "clientSecret", {
+            get: function () { var _a; return LocalizeToken.storage.get(((_a = this.config.thirdPartyConfig) === null || _a === void 0 ? void 0 : _a.clientSecret) || ''); },
+            enumerable: false,
+            configurable: true
+        });
         LocalizeTokenService.prototype.storageGet = function () {
             var _a;
             try {
@@ -927,18 +937,8 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(LocalizeApiService.prototype, "isThirdPartyMode", {
-            get: function () { return this.localizeTokenService.config.isThirdPartyMode; },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(LocalizeApiService.prototype, "clientId", {
-            get: function () { var _a; return (_a = this.localizeTokenService.config.thirdPartyConfig) === null || _a === void 0 ? void 0 : _a.clientId; },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(LocalizeApiService.prototype, "clientSecret", {
-            get: function () { var _a; return (_a = this.localizeTokenService.config.thirdPartyConfig) === null || _a === void 0 ? void 0 : _a.clientSecret; },
+        Object.defineProperty(LocalizeApiService.prototype, "thirdPartyConfig", {
+            get: function () { var _a; return (_a = this.localizeTokenService.config) === null || _a === void 0 ? void 0 : _a.thirdPartyConfig; },
             enumerable: false,
             configurable: true
         });
@@ -1016,9 +1016,11 @@
                                     callback: function () { return tslib.__awaiter(_this, void 0, void 0, function () {
                                         return tslib.__generator(this, function (_e) {
                                             switch (_e.label) {
-                                                case 0: 
-                                                // Only handle 401 Unauthorized errors
-                                                return [4 /*yield*/, this.revokeToken()];
+                                                case 0:
+                                                    // Handle third party API unauthorized error when request 
+                                                    this.handleThirdPartyAuthError(error, options.requestUrl);
+                                                    // Only handle 401 Unauthorized errors
+                                                    return [4 /*yield*/, this.revokeToken()];
                                                 case 1:
                                                     // Only handle 401 Unauthorized errors
                                                     _e.sent();
@@ -1035,6 +1037,21 @@
                 });
             });
         };
+        LocalizeApiService.prototype.handleThirdPartyAuthError = function (error, requestUrl) {
+            var _a, _b, _c;
+            if (!((_a = this.thirdPartyConfig) === null || _a === void 0 ? void 0 : _a.isThirdPartyMode))
+                return;
+            if (error.status === 401) {
+                if (this.thirdPartyConfig.lastUnauthorizedUrl === requestUrl) {
+                    this.thirdPartyConfig.lastUnauthorizedUrl = "";
+                    throw (_c = (_b = this.config).onException) === null || _c === void 0 ? void 0 : _c.call(_b, Object.assign(Object.assign({}, error), { status: 405, message: "Unauthorized request url " + requestUrl + ". Please contact administrator." }));
+                }
+                this.thirdPartyConfig.lastUnauthorizedUrl = requestUrl;
+            }
+            else {
+                this.thirdPartyConfig.lastUnauthorizedUrl = "";
+            }
+        };
         LocalizeApiService.prototype.performRequest = function (options) {
             var _a;
             return tslib.__awaiter(this, void 0, void 0, function () {
@@ -1061,46 +1078,35 @@
             });
         };
         LocalizeApiService.prototype.revokeToken = function () {
-            var _a;
+            var _a, _b;
             return tslib.__awaiter(this, void 0, void 0, function () {
-                var apiOptions, thirdPartyConfig, clientSecret, revokeToken, error_2;
-                var _e;
-                return tslib.__generator(this, function (_f) {
-                    switch (_f.label) {
+                var defaultApiOptions, thirdParyApiOptions, apiOptions, revokeToken, error_2;
+                return tslib.__generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
-                            _f.trys.push([0, 4, 6, 7]);
+                            _e.trys.push([0, 4, 6, 7]);
                             return [4 /*yield*/, this.interceptRevokeToken()];
                         case 1:
-                            if (_f.sent())
+                            if (_e.sent())
                                 return [2 /*return*/];
                             this.isRevokingToken = true;
-                            apiOptions = Object.assign(Object.assign({}, this.buildApiOptions(((_a = this.localizeTokenService.config.refreshToken) === null || _a === void 0 ? void 0 : _a.requestUrl) || '')), { refreshToken: true });
-                            // If in third party mode, use the third party token refresh endpoint and options
-                            if (this.isThirdPartyMode) {
-                                thirdPartyConfig = this.localizeTokenService.config.thirdPartyConfig;
-                                if (thirdPartyConfig) {
-                                    // Add the request URL, method and body
-                                    apiOptions.requestUrl = thirdPartyConfig.refreshTokenUrl;
-                                    apiOptions.method = (thirdPartyConfig === null || thirdPartyConfig === void 0 ? void 0 : thirdPartyConfig.method) || exports.EMethod.GET;
-                                    apiOptions.requestBody = (thirdPartyConfig === null || thirdPartyConfig === void 0 ? void 0 : thirdPartyConfig.body) || {};
-                                    clientSecret = (_e = {}, _e[SCHEMES.X_SECRET] = "" + this.clientSecret, _e);
-                                    apiOptions.headers = Object.assign(Object.assign({}, apiOptions.headers), clientSecret);
-                                }
-                            }
+                            defaultApiOptions = Object.assign(Object.assign({}, this.buildApiOptions(((_a = this.localizeTokenService.config.refreshToken) === null || _a === void 0 ? void 0 : _a.requestUrl) || '')), { refreshToken: true });
+                            thirdParyApiOptions = this.buildThirdPartyApiOption(defaultApiOptions);
+                            apiOptions = ((_b = this.thirdPartyConfig) === null || _b === void 0 ? void 0 : _b.isThirdPartyMode) ? thirdParyApiOptions : defaultApiOptions;
                             return [4 /*yield*/, ApiHelper.performRequestWithRetry(apiOptions, this.config, this.performRequest.bind(this))];
                         case 2:
-                            revokeToken = _f.sent();
+                            revokeToken = _e.sent();
                             return [4 /*yield*/, this.handleOnTokenRevoked(revokeToken)];
                         case 3:
-                            _f.sent();
+                            _e.sent();
                             return [3 /*break*/, 7];
                         case 4:
-                            error_2 = _f.sent();
+                            error_2 = _e.sent();
                             // Handle the error, log it
                             return [4 /*yield*/, ApiHelper.invokeHook(this.config.onAutoLogout)];
                         case 5:
                             // Handle the error, log it
-                            _f.sent();
+                            _e.sent();
                             throw error_2;
                         case 6:
                             // Reset the revoking token state
@@ -1111,12 +1117,16 @@
                 });
             });
         };
-        LocalizeApiService.prototype.apiOptionsForThirdParty = function () {
+        LocalizeApiService.prototype.buildThirdPartyApiOption = function (apiOptions) {
+            var _e;
+            var _a, _b, _c;
+            return Object.assign(Object.assign({}, apiOptions), { requestUrl: ((_a = this.thirdPartyConfig) === null || _a === void 0 ? void 0 : _a.refreshToken.requestUrl) || '', method: ((_b = this.thirdPartyConfig) === null || _b === void 0 ? void 0 : _b.refreshToken.method) || exports.EMethod.GET, requestBody: ((_c = this.thirdPartyConfig) === null || _c === void 0 ? void 0 : _c.refreshToken.body) || {}, headers: Object.assign(Object.assign({}, apiOptions.headers), (_e = {}, _e[SCHEMES.X_SECRET] = "" + this.localizeTokenService.clientSecret, _e)) });
         };
         /** default http request options */
         LocalizeApiService.prototype.buildHeaderOptions = function (options) {
             var _e, _f, _g, _h, _j;
-            var headers = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (options.refreshToken && (_e = {}, _e[SCHEMES.X_REFRESH_TOKEN] = "" + this.refreshToken, _e))), (!options.isFormData && (_f = {}, _f[SCHEMES.CONTENT_TYPE] = 'application/json', _f))), (_g = {}, _g[SCHEMES.AUTHORIZATION] = "Bearer " + this.accessToken, _g)), (this.needTenant && (_h = {}, _h[SCHEMES.X_TENANT] = "" + this.tenantToken, _h))), (this.isThirdPartyMode && (_j = {}, _j[SCHEMES.X_CLIENT] = "" + this.clientId, _j)));
+            var _a;
+            var headers = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (options.refreshToken && (_e = {}, _e[SCHEMES.X_REFRESH_TOKEN] = "" + this.refreshToken, _e))), (!options.isFormData && (_f = {}, _f[SCHEMES.CONTENT_TYPE] = 'application/json', _f))), (_g = {}, _g[SCHEMES.AUTHORIZATION] = "Bearer " + this.accessToken, _g)), (this.needTenant && (_h = {}, _h[SCHEMES.X_TENANT] = "" + this.tenantToken, _h))), (((_a = this.thirdPartyConfig) === null || _a === void 0 ? void 0 : _a.isThirdPartyMode) && (_j = {}, _j[SCHEMES.X_CLIENT] = "" + this.localizeTokenService.clientId, _j)));
             return new i1.HttpHeaders(Object.assign(Object.assign({}, headers), options.headers));
         };
         LocalizeApiService.prototype.buildApiOptions = function (baseUrl, path, method, requestBody, headers) {
@@ -1159,23 +1169,18 @@
                 return tslib.__generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
-                            if (!(this.isThirdPartyMode && (response === null || response === void 0 ? void 0 : response.token))) return [3 /*break*/, 1];
-                            // If request third party token refresh, the new access token will be in response.token.
-                            this.accessToken = response.token;
-                            return [3 /*break*/, 4];
-                        case 1:
-                            if (!(response === null || response === void 0 ? void 0 : response.status)) return [3 /*break*/, 2];
+                            if (!((response === null || response === void 0 ? void 0 : response.status) || (response === null || response === void 0 ? void 0 : response.token))) return [3 /*break*/, 1];
                             // If the response is successful, update the access token
-                            this.accessToken = response.message;
-                            return [3 /*break*/, 4];
-                        case 2:
+                            this.accessToken = response.message || response.token; // response.token for third party revoke
+                            return [3 /*break*/, 3];
+                        case 1:
                             // If the response indicates an error, invoke the onRevokeUnauthorized hook
                             console.warn('Token revocation failed, refresh token is expired.', response.message);
                             return [4 /*yield*/, ApiHelper.invokeHook(this.config.onRevokeUnauthorized)];
-                        case 3:
+                        case 2:
                             _e.sent();
-                            _e.label = 4;
-                        case 4: return [2 /*return*/];
+                            _e.label = 3;
+                        case 3: return [2 /*return*/];
                     }
                 });
             });