@byu-oit/nuxt-common 3.0.3 → 3.0.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.ts +1 -1
- package/dist/index.js.map +1 -1
- package/dist/plugins/axios.js +6 -7
- package/dist/plugins/axios.js.map +1 -1
- package/package.json +4 -1
package/dist/index.d.ts
CHANGED
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,CAAA;AACtB,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAE9B,aAAa;AACb,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,CAAA;AACtB,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAE9B,aAAa;AACb,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AA+BtC,MAAM,gBAAgB,GAAW,KAAK,WAAW,aAAa;IAC5D,MAAM,eAAe,GAAG,CAAC,aAAa,IAAI,aAAa,CAAC,eAAe,CAAC,IAAI,EAAE,CAAA;IAC9E,MAAM,eAAe,GAAG,CAAC,aAAa,IAAI,aAAa,CAAC,eAAe,CAAC,IAAI,EAAE,CAAA;IAC9E,MAAM,oBAAoB,GAAG,CAAC,aAAa,IAAI,aAAa,CAAC,oBAAoB,CAAC,IAAI,EAAE,CAAA;IAExF,MAAM,OAAO,GAAG,CAAC,eAAe,EAAE,qBAAqB,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;IAC9G,MAAM,OAAO,GAAG,CAAC,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,aAAa,EAAE,eAAe,EAAE,gBAAgB,CAAC,CAAC,MAAM,CAC7G,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAC9C,CAAA;IAED,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;QACzB,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG,EAAE,CAAA;KAC1B;IAED,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QACzB,IAAI,CAAC,OAAO,CAAC,OAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACpC,CAAC,CAAC,CAAA;IAEF,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QACzB,IAAI,CAAC,SAAS,CAAC;YACb,GAAG,EAAE,OAAO,CAAC,SAAS,EAAE,WAAW,MAAM,KAAK,CAAC;YAC/C,OAAO,EAAE,CAAC,aAAa,IAAI,aAAa,CAAC,aAAa,IAAI,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE;SACrG,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,kHAAkH;IAClH,MAAM,YAAY,GAAG,CAAC,wBAAwB,EAAE,iBAAiB,CAAC,CAAC,MAAM,CACvE,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,oBAAoB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAC7D,CAAA;IACD,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC3C,MAAM,QAAQ,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;AACzC,CAAC,CAAA;AAED,eAAe,gBAAgB,CAAA;AAE/B,MAAM,CAAC,MAAM,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA"}
|
package/dist/plugins/axios.js
CHANGED
|
@@ -6,11 +6,7 @@ let refreshDialogVisible = false;
|
|
|
6
6
|
const errorMessages = [];
|
|
7
7
|
export default (context) => {
|
|
8
8
|
context.$axios.onResponseError((error) => {
|
|
9
|
-
if (
|
|
10
|
-
// Explicit cancellation, so do not show "error" message
|
|
11
|
-
return;
|
|
12
|
-
}
|
|
13
|
-
if (error.config && error.response?.status === 401) {
|
|
9
|
+
if (error?.config && error.response?.status === 401) {
|
|
14
10
|
// @ts-ignore Internal var added to config, so we can tell if this is a second automated attempt
|
|
15
11
|
if (!error.config.insideRetry) {
|
|
16
12
|
return retryWithRefreshedToken(error);
|
|
@@ -35,7 +31,10 @@ export default (context) => {
|
|
|
35
31
|
// Caller has declared that it will handle unknown errors instead of using auto-popup
|
|
36
32
|
return;
|
|
37
33
|
}
|
|
38
|
-
|
|
34
|
+
if (!axios.isCancel(error)) {
|
|
35
|
+
// Do not show error message if this was an explicit cancellation
|
|
36
|
+
context.$axios.defaultErrorPopup(error);
|
|
37
|
+
}
|
|
39
38
|
});
|
|
40
39
|
context.$axios.defaultErrorPopup = (error) => {
|
|
41
40
|
const text = get(error, 'response.data.errorMessage') ||
|
|
@@ -65,7 +64,7 @@ export default (context) => {
|
|
|
65
64
|
}
|
|
66
65
|
return refreshPromise.then((tokenInfo) => {
|
|
67
66
|
const config = Object.assign({ insideRetry: true }, error.config);
|
|
68
|
-
if (tokenInfo?.state === authn.STATE_AUTHENTICATED && tokenInfo.token?.authorizationHeader) {
|
|
67
|
+
if (tokenInfo?.state === authn.STATE_AUTHENTICATED && tokenInfo.token?.authorizationHeader && config.headers) {
|
|
69
68
|
config.headers.Authorization = tokenInfo.token.authorizationHeader;
|
|
70
69
|
}
|
|
71
70
|
return context.$axios.request(config);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"axios.js","sourceRoot":"","sources":["../../src/plugins/axios.ts"],"names":[],"mappings":"AACA,OAAO,KAAqB,MAAM,OAAO,CAAA;AACzC,OAAO,KAAK,KAAK,MAAM,uBAAuB,CAAA;AAE9C,aAAa;AACb,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAA;AAE5B,IAAI,oBAAoB,GAAG,KAAK,CAAA;AAChC,MAAM,aAAa,GAAa,EAAE,CAAA;AAElC,eAAe,CAAC,OAAgB,EAAE,EAAE;IAClC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,KAAK,EAAE,EAAE;QACvC,IAAI,KAAK,
|
|
1
|
+
{"version":3,"file":"axios.js","sourceRoot":"","sources":["../../src/plugins/axios.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@byu-oit/nuxt-common",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.4",
|
|
4
4
|
"description": "BYU Front End common module for Nuxt.js",
|
|
5
5
|
"author": "BYU Apps Custom",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -116,6 +116,9 @@
|
|
|
116
116
|
"@nuxt/vue-app": "npm:@neverendingsupport/nuxt2@2.18.1-vue-app-2.18.6",
|
|
117
117
|
"@nuxt/vue-renderer": "npm:@neverendingsupport/nuxt2@2.18.1-vue-renderer-2.18.6",
|
|
118
118
|
"@nuxt/webpack": "npm:@neverendingsupport/nuxt2@2.18.1-webpack-2.18.6",
|
|
119
|
+
"@nuxtjs/axios": {
|
|
120
|
+
"axios": "0.28.0"
|
|
121
|
+
},
|
|
119
122
|
"@nuxtjs/youch": "npm:@neverendingsupport/nuxt-youch@4.2.3-nuxtjs-youch-4.2.5",
|
|
120
123
|
"nuxt-start": "npm:@neverendingsupport/nuxt2@2.18.1-nuxt-start-2.18.6",
|
|
121
124
|
"vue": "npm:@neverendingsupport/vue2@2.7.22",
|