@yeepay/client-utils 0.0.20 → 0.0.23

package/dist/client-utils.esm.js

@@ -1 +1 @@
-import t from"axios";import e from"js-cookie";import n from"apollo-boost";import r from"unfetch";function o(t){var e=(t=null==t?window.location.href:t).substring(t.lastIndexOf("?")+1),n={};return e.replace(/([^?&=]+)=([^?&=]*)/g,(function(t,e,r){var o=decodeURIComponent(e),i=decodeURIComponent(r);return i=String(i),n[o]=i,t})),n}var i="";function a(){return i||e.get("TOKEN")}function u(t){if(i=o(window.location.href)[t]){var n=i.indexOf("#");-1!==n&&(i=i.slice(0,n)),i="Bearer "+i,e.set("TOKEN",i),window.history.replaceState(null,null,window.location.pathname+window.location.hash)}}function s(){return e.remove("TOKEN")}function c(e){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:function(){return{}},r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:function(){return{}},o=arguments.length>3&&void 0!==arguments[3]?arguments[3]:function(){return{}},i=arguments.length>4&&void 0!==arguments[4]?arguments[4]:function(){return{}},u=arguments.length>5&&void 0!==arguments[5]?arguments[5]:function(){return{}},s=e.baseUrl,c=void 0===s?"/api-master":s,l=e.timeout,f=void 0===l?12e5:l,d=e.headers,h=t.create({baseURL:c,timeout:f,validateStatus:function(t){return t>=200&&t<300||401===t||403===t||400===t||500===t}});return h.interceptors.request.use((function(t){t.headers.Authorization=a(),t.headers["Content-Type"]="application/json",Object.assign(t.headers,d);var e=t.method,n=t.url;return"get"===e&&(-1!==n.indexOf("?")?t.url="".concat(n,"&_t=").concat((new Date).getTime()):t.url="".concat(n,"?_t=").concat((new Date).getTime())),t}),(function(t){console.log(t),Promise.reject(t)})),h.interceptors.response.use((function(t){return t.status&&401===t.status?o(t.data):t.status&&403===t.status?i(t):!t.status||400!==t.status&&500!==t.status?"0"!==t.data.code&&"000000"!==t.data.code&&200!==t.data.code&&t.data.code?(r(t),Promise.reject(t.data)):(n(t),t.data):(r(t),Promise.reject(t.data))}),(function(t){var e=0;try{e=t.response.status||t.response.data.status}catch(e){if(-1!==t.toString().indexOf("Error: timeout"))return Promise.reject(t)}return e?403===e?i(t):404===e?u(t):r(t.response):r(t.response),Promise.reject(t)})),h}function l(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function f(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){if("undefined"==typeof Symbol||!(Symbol.iterator in Object(t)))return;var n=[],r=!0,o=!1,i=void 0;try{for(var a,u=t[Symbol.iterator]();!(r=(a=u.next()).done)&&(n.push(a.value),!e||n.length!==e);r=!0);}catch(t){o=!0,i=t}finally{try{r||null==u.return||u.return()}finally{if(o)throw i}}return n}(t,e)||function(t,e){if(!t)return;if("string"==typeof t)return d(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);"Object"===n&&t.constructor&&(n=t.constructor.name);if("Map"===n||"Set"===n)return Array.from(t);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return d(t,e)}(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function d(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,r=new Array(e);n<e;n++)r[n]=t[n];return r}var h=function(){function t(e){var o=this,i=e.gqlServer,a=e.requestForRest;!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),this.gql={},this.inject=function(t,e){o.register(t);for(var n=function(){var e=f(i[r],2),n=e[0],a=e[1];if(!["definitions","kind","loc"].includes(n))if("query"===a.definitions[0].operation)"production"===process.env.NODE_ENV?o.gql[t][n]=function(e){return o.restfulReq("/".concat(t,"/").concat(n),e)}:o.gql[t][n]=function(t){return o.query(a,t)};else{if("mutation"!==a.definitions[0].operation)return"continue";"production"===process.env.NODE_ENV?o.gql[t][n]=function(e){return o.restfulReq("/".concat(t,"/").concat(n),e)}:o.gql[t][n]=function(t){return o.mutation(a,t)}}},r=0,i=Object.entries(e);r<i.length;r++)n()},this.gqlServer=i,this.request=a,this.apolloClient=new n({uri:i,fetch:r})}var e,o,i;return e=t,(o=[{key:"register",value:function(t){this.gql[t]||(this.gql[t]={})}},{key:"query",value:function(t,e){return this.apolloClient.query({query:t,variables:e||{}})}},{key:"mutation",value:function(t,e){return this.apolloClient.mutate({mutation:t,variables:e||{}})}},{key:"restfulReq",value:function(t,e){return this.request({url:t,method:"post",data:{variables:e}})}}])&&l(e.prototype,o),i&&l(e,i),t}();export{h as GraphQLClient,o as getQueryObject,a as getToken,s as removeToken,c as serviceFactory,u as setTokenFromUrl};
+import t from"axios";import e from"js-cookie";import r from"apollo-boost";import n from"unfetch";function o(t){var e=(t=null==t?window.location.href:t).substring(t.lastIndexOf("?")+1),r={};return e.replace(/([^?&=]+)=([^?&=]*)/g,(function(t,e,n){var o=decodeURIComponent(e),i=decodeURIComponent(n);return i=String(i),r[o]=i,t})),r}var i="";function a(){return i||e.get("TOKEN")}function u(t){if(i=o(window.location.href)[t]){var r=i.indexOf("#");-1!==r&&(i=i.slice(0,r)),i="Bearer "+i,e.set("TOKEN",i);var n=new RegExp("("+t+"=[^&]+&?)");window.history.replaceState(null,null,window.location.href.replace(n,(function(t){return""})))}}function c(){return e.remove("TOKEN")}function s(e){var r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:function(){return{}},n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:function(){return{}},o=arguments.length>3&&void 0!==arguments[3]?arguments[3]:function(){return{}},i=arguments.length>4&&void 0!==arguments[4]?arguments[4]:function(){return{}},u=arguments.length>5&&void 0!==arguments[5]?arguments[5]:function(){return{}},c=e.baseUrl,s=void 0===c?"/api-master":c,l=e.timeout,f=void 0===l?12e5:l,d=e.headers,p=t.create({baseURL:s,timeout:f,headers:d,validateStatus:function(t){return t>=200&&t<300||401===t||403===t||400===t||500===t}});return p.interceptors.request.use((function(t){t.headers.Authorization=a(),t.headers["Content-Type"]="application/json";var e=t.method,r=t.url;return"get"===e&&(-1!==r.indexOf("?")?t.url="".concat(r,"&_t=").concat((new Date).getTime()):t.url="".concat(r,"?_t=").concat((new Date).getTime())),t}),(function(t){console.log(t),Promise.reject(t)})),p.interceptors.response.use((function(t){return t.status&&401===t.status?o(t.data):t.status&&403===t.status?i(t):!t.status||400!==t.status&&500!==t.status?"0"!==t.data.code&&"000000"!==t.data.code&&200!==t.data.code&&t.data.code?(n(t),Promise.reject(t.data)):(r(t),t.data):(n(t),Promise.reject(t.data))}),(function(t){var e=0;try{e=t.response.status||t.response.data.status}catch(e){if(-1!==t.toString().indexOf("Error: timeout"))return Promise.reject(t)}return e?403===e?i(t):404===e?u(t):n(t.response):n(t.response),Promise.reject(t)})),p}function l(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,n.key,n)}}function f(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){if("undefined"==typeof Symbol||!(Symbol.iterator in Object(t)))return;var r=[],n=!0,o=!1,i=void 0;try{for(var a,u=t[Symbol.iterator]();!(n=(a=u.next()).done)&&(r.push(a.value),!e||r.length!==e);n=!0);}catch(t){o=!0,i=t}finally{try{n||null==u.return||u.return()}finally{if(o)throw i}}return r}(t,e)||function(t,e){if(!t)return;if("string"==typeof t)return d(t,e);var r=Object.prototype.toString.call(t).slice(8,-1);"Object"===r&&t.constructor&&(r=t.constructor.name);if("Map"===r||"Set"===r)return Array.from(t);if("Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r))return d(t,e)}(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function d(t,e){(null==e||e>t.length)&&(e=t.length);for(var r=0,n=new Array(e);r<e;r++)n[r]=t[r];return n}var p=function(){function t(e){var o=this,i=e.gqlServer,a=e.requestForRest;!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),this.gql={},this.inject=function(t,e){o.register(t);for(var r=function(){var e=f(i[n],2),r=e[0],a=e[1];if(!["definitions","kind","loc"].includes(r))if("query"===a.definitions[0].operation)"production"===process.env.NODE_ENV?o.gql[t][r]=function(e){return o.restfulReq("/".concat(t,"/").concat(r),e)}:o.gql[t][r]=function(t){return o.query(a,t)};else{if("mutation"!==a.definitions[0].operation)return"continue";"production"===process.env.NODE_ENV?o.gql[t][r]=function(e){return o.restfulReq("/".concat(t,"/").concat(r),e)}:o.gql[t][r]=function(t){return o.mutation(a,t)}}},n=0,i=Object.entries(e);n<i.length;n++)r()},this.gqlServer=i,this.request=a,this.apolloClient=new r({uri:i,fetch:n})}var e,o,i;return e=t,(o=[{key:"register",value:function(t){this.gql[t]||(this.gql[t]={})}},{key:"query",value:function(t,e){return this.apolloClient.query({query:t,variables:e||{}})}},{key:"mutation",value:function(t,e){return this.apolloClient.mutate({mutation:t,variables:e||{}})}},{key:"restfulReq",value:function(t,e){return this.request({url:t,method:"post",data:{variables:e}})}}])&&l(e.prototype,o),i&&l(e,i),t}();export{p as GraphQLClient,o as getQueryObject,a as getToken,c as removeToken,s as serviceFactory,u as setTokenFromUrl};

package/dist/client-utils.min.js

@@ -1 +1 @@
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("axios"),require("js-cookie"),require("apollo-boost"),require("unfetch")):"function"==typeof define&&define.amd?define(["exports","axios","js-cookie","apollo-boost","unfetch"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).YeepayClientUtils={},e.axios,e.Cookie,e.ApolloClient,e.fetch)}(this,(function(e,t,n,r,o){"use strict";function i(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var a=i(t),u=i(n),s=i(r),c=i(o);function l(e){var t=(e=null==e?window.location.href:e).substring(e.lastIndexOf("?")+1),n={};return t.replace(/([^?&=]+)=([^?&=]*)/g,(function(e,t,r){var o=decodeURIComponent(t),i=decodeURIComponent(r);return i=String(i),n[o]=i,e})),n}var f="TOKEN",d="";function p(){return d||u.default.get(f)}function h(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function v(e,t){return function(e){if(Array.isArray(e))return e}(e)||function(e,t){if("undefined"==typeof Symbol||!(Symbol.iterator in Object(e)))return;var n=[],r=!0,o=!1,i=void 0;try{for(var a,u=e[Symbol.iterator]();!(r=(a=u.next()).done)&&(n.push(a.value),!t||n.length!==t);r=!0);}catch(e){o=!0,i=e}finally{try{r||null==u.return||u.return()}finally{if(o)throw i}}return n}(e,t)||function(e,t){if(!e)return;if("string"==typeof e)return y(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);"Object"===n&&e.constructor&&(n=e.constructor.name);if("Map"===n||"Set"===n)return Array.from(e);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return y(e,t)}(e,t)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function y(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=new Array(t);n<t;n++)r[n]=e[n];return r}var g=function(){function e(t){var n=this,r=t.gqlServer,o=t.requestForRest;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),this.gql={},this.inject=function(e,t){n.register(e);for(var r=function(){var t=v(i[o],2),r=t[0],a=t[1];if(!["definitions","kind","loc"].includes(r))if("query"===a.definitions[0].operation)"production"===process.env.NODE_ENV?n.gql[e][r]=function(t){return n.restfulReq("/".concat(e,"/").concat(r),t)}:n.gql[e][r]=function(e){return n.query(a,e)};else{if("mutation"!==a.definitions[0].operation)return"continue";"production"===process.env.NODE_ENV?n.gql[e][r]=function(t){return n.restfulReq("/".concat(e,"/").concat(r),t)}:n.gql[e][r]=function(e){return n.mutation(a,e)}}},o=0,i=Object.entries(t);o<i.length;o++)r()},this.gqlServer=r,this.request=o,this.apolloClient=new s.default({uri:r,fetch:c.default})}var t,n,r;return t=e,(n=[{key:"register",value:function(e){this.gql[e]||(this.gql[e]={})}},{key:"query",value:function(e,t){return this.apolloClient.query({query:e,variables:t||{}})}},{key:"mutation",value:function(e,t){return this.apolloClient.mutate({mutation:e,variables:t||{}})}},{key:"restfulReq",value:function(e,t){return this.request({url:e,method:"post",data:{variables:t}})}}])&&h(t.prototype,n),r&&h(t,r),e}();e.GraphQLClient=g,e.getQueryObject=l,e.getToken=p,e.removeToken=function(){return u.default.remove(f)},e.serviceFactory=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:function(){return{}},n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:function(){return{}},r=arguments.length>3&&void 0!==arguments[3]?arguments[3]:function(){return{}},o=arguments.length>4&&void 0!==arguments[4]?arguments[4]:function(){return{}},i=arguments.length>5&&void 0!==arguments[5]?arguments[5]:function(){return{}},u=e.baseUrl,s=void 0===u?"/api-master":u,c=e.timeout,l=void 0===c?12e5:c,f=e.headers,d=a.default.create({baseURL:s,timeout:l,validateStatus:function(e){return e>=200&&e<300||401===e||403===e||400===e||500===e}});return d.interceptors.request.use((function(e){e.headers.Authorization=p(),e.headers["Content-Type"]="application/json",Object.assign(e.headers,f);var t=e.method,n=e.url;return"get"===t&&(-1!==n.indexOf("?")?e.url="".concat(n,"&_t=").concat((new Date).getTime()):e.url="".concat(n,"?_t=").concat((new Date).getTime())),e}),(function(e){console.log(e),Promise.reject(e)})),d.interceptors.response.use((function(e){return e.status&&401===e.status?r(e.data):e.status&&403===e.status?o(e):!e.status||400!==e.status&&500!==e.status?"0"!==e.data.code&&"000000"!==e.data.code&&200!==e.data.code&&e.data.code?(n(e),Promise.reject(e.data)):(t(e),e.data):(n(e),Promise.reject(e.data))}),(function(e){var t=0;try{t=e.response.status||e.response.data.status}catch(t){if(-1!==e.toString().indexOf("Error: timeout"))return Promise.reject(e)}return t?403===t?o(e):404===t?i(e):n(e.response):n(e.response),Promise.reject(e)})),d},e.setTokenFromUrl=function(e){if(d=l(window.location.href)[e]){var t=d.indexOf("#");-1!==t&&(d=d.slice(0,t)),d="Bearer "+d,u.default.set(f,d),window.history.replaceState(null,null,window.location.pathname+window.location.hash)}},Object.defineProperty(e,"__esModule",{value:!0})}));
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("axios"),require("js-cookie"),require("apollo-boost"),require("unfetch")):"function"==typeof define&&define.amd?define(["exports","axios","js-cookie","apollo-boost","unfetch"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).YeepayClientUtils={},e.axios,e.Cookie,e.ApolloClient,e.fetch)}(this,(function(e,t,n,r,o){"use strict";function i(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var u=i(t),a=i(n),s=i(r),c=i(o);function l(e){var t=(e=null==e?window.location.href:e).substring(e.lastIndexOf("?")+1),n={};return t.replace(/([^?&=]+)=([^?&=]*)/g,(function(e,t,r){var o=decodeURIComponent(t),i=decodeURIComponent(r);return i=String(i),n[o]=i,e})),n}var f="TOKEN",d="";function p(){return d||a.default.get(f)}function h(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function v(e,t){return function(e){if(Array.isArray(e))return e}(e)||function(e,t){if("undefined"==typeof Symbol||!(Symbol.iterator in Object(e)))return;var n=[],r=!0,o=!1,i=void 0;try{for(var u,a=e[Symbol.iterator]();!(r=(u=a.next()).done)&&(n.push(u.value),!t||n.length!==t);r=!0);}catch(e){o=!0,i=e}finally{try{r||null==a.return||a.return()}finally{if(o)throw i}}return n}(e,t)||function(e,t){if(!e)return;if("string"==typeof e)return y(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);"Object"===n&&e.constructor&&(n=e.constructor.name);if("Map"===n||"Set"===n)return Array.from(e);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return y(e,t)}(e,t)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function y(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=new Array(t);n<t;n++)r[n]=e[n];return r}var g=function(){function e(t){var n=this,r=t.gqlServer,o=t.requestForRest;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),this.gql={},this.inject=function(e,t){n.register(e);for(var r=function(){var t=v(i[o],2),r=t[0],u=t[1];if(!["definitions","kind","loc"].includes(r))if("query"===u.definitions[0].operation)"production"===process.env.NODE_ENV?n.gql[e][r]=function(t){return n.restfulReq("/".concat(e,"/").concat(r),t)}:n.gql[e][r]=function(e){return n.query(u,e)};else{if("mutation"!==u.definitions[0].operation)return"continue";"production"===process.env.NODE_ENV?n.gql[e][r]=function(t){return n.restfulReq("/".concat(e,"/").concat(r),t)}:n.gql[e][r]=function(e){return n.mutation(u,e)}}},o=0,i=Object.entries(t);o<i.length;o++)r()},this.gqlServer=r,this.request=o,this.apolloClient=new s.default({uri:r,fetch:c.default})}var t,n,r;return t=e,(n=[{key:"register",value:function(e){this.gql[e]||(this.gql[e]={})}},{key:"query",value:function(e,t){return this.apolloClient.query({query:e,variables:t||{}})}},{key:"mutation",value:function(e,t){return this.apolloClient.mutate({mutation:e,variables:t||{}})}},{key:"restfulReq",value:function(e,t){return this.request({url:e,method:"post",data:{variables:t}})}}])&&h(t.prototype,n),r&&h(t,r),e}();e.GraphQLClient=g,e.getQueryObject=l,e.getToken=p,e.removeToken=function(){return a.default.remove(f)},e.serviceFactory=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:function(){return{}},n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:function(){return{}},r=arguments.length>3&&void 0!==arguments[3]?arguments[3]:function(){return{}},o=arguments.length>4&&void 0!==arguments[4]?arguments[4]:function(){return{}},i=arguments.length>5&&void 0!==arguments[5]?arguments[5]:function(){return{}},a=e.baseUrl,s=void 0===a?"/api-master":a,c=e.timeout,l=void 0===c?12e5:c,f=e.headers,d=u.default.create({baseURL:s,timeout:l,headers:f,validateStatus:function(e){return e>=200&&e<300||401===e||403===e||400===e||500===e}});return d.interceptors.request.use((function(e){e.headers.Authorization=p(),e.headers["Content-Type"]="application/json";var t=e.method,n=e.url;return"get"===t&&(-1!==n.indexOf("?")?e.url="".concat(n,"&_t=").concat((new Date).getTime()):e.url="".concat(n,"?_t=").concat((new Date).getTime())),e}),(function(e){console.log(e),Promise.reject(e)})),d.interceptors.response.use((function(e){return e.status&&401===e.status?r(e.data):e.status&&403===e.status?o(e):!e.status||400!==e.status&&500!==e.status?"0"!==e.data.code&&"000000"!==e.data.code&&200!==e.data.code&&e.data.code?(n(e),Promise.reject(e.data)):(t(e),e.data):(n(e),Promise.reject(e.data))}),(function(e){var t=0;try{t=e.response.status||e.response.data.status}catch(t){if(-1!==e.toString().indexOf("Error: timeout"))return Promise.reject(e)}return t?403===t?o(e):404===t?i(e):n(e.response):n(e.response),Promise.reject(e)})),d},e.setTokenFromUrl=function(e){if(d=l(window.location.href)[e]){var t=d.indexOf("#");-1!==t&&(d=d.slice(0,t)),d="Bearer "+d,a.default.set(f,d);var n=new RegExp("("+e+"=[^&]+&?)");window.history.replaceState(null,null,window.location.href.replace(n,(function(e){return""})))}},Object.defineProperty(e,"__esModule",{value:!0})}));

package/lib/request.js

@@ -28,7 +28,8 @@ export function serviceFactory(
   // 创建axios实例
   const service = axios.create({
     baseURL: baseUrl,
-    timeout: timeout, // 请求超时时间
+    timeout, // 请求超时时间
+    headers,
     validateStatus: function (status) {
       // 401, 403 在拦截器中 resolve 处理, 由于可能需要其报文
       return (
@@ -46,7 +47,6 @@ export function serviceFactory(
     (config) => {
       config.headers['Authorization'] = getToken()
       config.headers['Content-Type'] = 'application/json'
-      Object.assign(config.headers, headers)
       const { method, url } = config
       if (method === 'get') {
         if (url.indexOf('?') !== -1) {

package/lib/token.js

@@ -13,7 +13,6 @@ export function getToken() {
  * @param {String} key Token key.
  */
 export function setTokenFromUrl(key) {
-
   // url has token ?
   urlToken = getQueryObject(window.location.href)[key]
   if (urlToken) {
@@ -23,7 +22,13 @@ export function setTokenFromUrl(key) {
     }
     urlToken = 'Bearer ' + urlToken
     Cookie.set(TokenKey, urlToken)
-    window.history.replaceState(null, null, window.location.pathname + window.location.hash);
+
+    const reg = new RegExp('(' + key + '=[^&]+&?)')
+    window.history.replaceState(
+      null,
+      null,
+      window.location.href.replace(reg, (matched) => '')
+    )
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeepay/client-utils",
-  "version": "0.0.20",
+  "version": "0.0.23",
   "description": "shared utilities for yeepay client packages",
   "main": "dist/client-utils.min.js",
   "module": "dist/client-utils.esm.js",
@@ -27,6 +27,7 @@
   "homepage": "https://github.com/YeePay-UED/client-utils#readme",
   "devDependencies": {
     "@babel/core": "^7.1.2",
+    "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/preset-env": "^7.1.0",
     "@rollup/plugin-babel": "^5.2.1",
     "@rollup/plugin-commonjs": "^15.1.0",
@@ -37,7 +38,7 @@
   },
   "dependencies": {
     "apollo-boost": "^0.4.9",
-    "axios": "^0.20.0",
+    "axios": "^0.27.2",
     "graphql": "^15.6.0",
     "js-cookie": "^2.2.1",
     "unfetch": "^4.2.0"