From bdb7db1f754a54d1d6facbe73995493833dd11e5 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Wed, 5 Jan 2022 21:24:36 +0800 Subject: [PATCH 1/3] Enhance handleAbpErrorResponse --- npm/packs/jquery/src/abp.jquery.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/npm/packs/jquery/src/abp.jquery.js b/npm/packs/jquery/src/abp.jquery.js index 81ebf1e2e1..4ae0d8cf64 100644 --- a/npm/packs/jquery/src/abp.jquery.js +++ b/npm/packs/jquery/src/abp.jquery.js @@ -204,15 +204,23 @@ var abp = abp || {}; handleAbpErrorResponse: function (jqXHR, userOptions, $dfd) { var messagePromise = null; + var responseJSON = null; + + if (jqXHR.responseJSON) { + responseJSON = jqXHR.responseJSON; + } + else { + responseJSON = JSON.parse(jqXHR.responseText) + } if (userOptions.abpHandleError !== false) { - messagePromise = abp.ajax.showError(jqXHR.responseJSON.error); + messagePromise = abp.ajax.showError(responseJSON.error); } - abp.ajax.logError(jqXHR.responseJSON.error); + abp.ajax.logError(responseJSON.error); - $dfd && $dfd.reject(jqXHR.responseJSON.error, jqXHR); - userOptions.error && userOptions.error(jqXHR.responseJSON.error, jqXHR); + $dfd && $dfd.reject(responseJSON.error, jqXHR); + userOptions.error && userOptions.error(responseJSON.error, jqXHR); if (jqXHR.status === 401 && userOptions.abpHandleError !== false) { abp.ajax.handleUnAuthorizedRequest(messagePromise); From 411cbe2aaec76eaa5274f410a403de27c32d5016 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Thu, 6 Jan 2022 11:32:07 +0800 Subject: [PATCH 2/3] Update abp.jquery.js --- npm/packs/jquery/src/abp.jquery.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/npm/packs/jquery/src/abp.jquery.js b/npm/packs/jquery/src/abp.jquery.js index 4ae0d8cf64..b0af0c2582 100644 --- a/npm/packs/jquery/src/abp.jquery.js +++ b/npm/packs/jquery/src/abp.jquery.js @@ -204,14 +204,8 @@ var abp = abp || {}; handleAbpErrorResponse: function (jqXHR, userOptions, $dfd) { var messagePromise = null; - var responseJSON = null; - if (jqXHR.responseJSON) { - responseJSON = jqXHR.responseJSON; - } - else { - responseJSON = JSON.parse(jqXHR.responseText) - } + var responseJSON = jqXHR.responseJSON ?? JSON.parse(jqXHR.responseText); if (userOptions.abpHandleError !== false) { messagePromise = abp.ajax.showError(responseJSON.error); From 99b5c703f060e92d1a9514a95b678ae7d63aff7a Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Thu, 6 Jan 2022 11:56:39 +0800 Subject: [PATCH 3/3] Update abp.jquery.js --- npm/packs/jquery/src/abp.jquery.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/packs/jquery/src/abp.jquery.js b/npm/packs/jquery/src/abp.jquery.js index b0af0c2582..76dfd3897f 100644 --- a/npm/packs/jquery/src/abp.jquery.js +++ b/npm/packs/jquery/src/abp.jquery.js @@ -205,7 +205,7 @@ var abp = abp || {}; handleAbpErrorResponse: function (jqXHR, userOptions, $dfd) { var messagePromise = null; - var responseJSON = jqXHR.responseJSON ?? JSON.parse(jqXHR.responseText); + var responseJSON = jqXHR.responseJSON ? jqXHR.responseJSON : JSON.parse(jqXHR.responseText); if (userOptions.abpHandleError !== false) { messagePromise = abp.ajax.showError(responseJSON.error);