uport-core - npm Package Compare versions

Comparing version 0.0.23 to 0.0.24

lib/message/util.js

@@ -56,3 +56,5 @@ 'use strict';
 var getUrlQueryParams = function getUrlQueryParams(url) {
-  return url.match(/[^&?]*?=[^&?]*/g).map(function (param) {
+  var params = url.match(/[^&?]*?=[^&?]*/g);
+  if (!params) return {};
+  return params.map(function (param) {
     return param.split('=');
@@ -65,4 +67,9 @@ }).reduce(function (params, param) {
 
+var getURLJWT = function getURLJWT(url) {
+  return url.replace(/https:\/\/id.uport.me\/req\//, '').replace(/(\#|\?)(.*)/, '');
+};
+
 exports.paramsToUrlFragment = paramsToUrlFragment;
 exports.paramsToQueryString = paramsToQueryString;
-exports.getUrlQueryParams = getUrlQueryParams;
+exports.getUrlQueryParams = getUrlQueryParams;
+exports.getURLJWT = getURLJWT;

lib/transport/chasqui.js

@@ -109,3 +109,3 @@ 'use strict';
 var getCallback = function getCallback(uri) {
-  return (0, _didJwt.decodeJWT)((0, _util.getUrlQueryParams)(uri)['requestToken']).payload.callback;
+  return (0, _didJwt.decodeJWT)((0, _util.getURLJWT)(uri)).payload.callback;
 };
@@ -112,0 +112,0 @@

package.json

 {
   "name": "uport-core",
-  "version": "0.0.23",
+  "version": "0.0.24",
   "description": "",
@@ -5,0 +5,0 @@ "main": "lib/index.js",

src/message/util.js

@@ -39,10 +39,15 @@ /**
   */
-const getUrlQueryParams = (url) => (
-  url.match(/[^&?]*?=[^&?]*/g)
-     .map((param) => param.split('='))
-     .reduce((params, param) => {
-       params[param[0]] = param[1]
-       return params
-     }, {}))
+const getUrlQueryParams = (url) => {
+  const params = url.match(/[^&?]*?=[^&?]*/g)
+  if (!params) return {}
+  return params.map((param) => param.split('='))
+               .reduce((params, param) => {
+                 params[param[0]] = param[1]
+                 return params
+                }, {})
+}
 
-export { paramsToUrlFragment, paramsToQueryString, getUrlQueryParams }
+const getURLJWT = (url) => url.replace(/https:\/\/id.uport.me\/req\//, '').replace(/(\#|\?)(.*)/, '')
+
+
+export { paramsToUrlFragment, paramsToQueryString, getUrlQueryParams, getURLJWT }

src/transport/chasqui.js

@@ -1,2 +0,2 @@
-import { paramsToQueryString, getUrlQueryParams } from './../message/util.js'
+import { paramsToQueryString, getURLJWT } from './../message/util.js'
 import { randomString } from './../crypto/index.js'
@@ -68,3 +68,3 @@ import generalPoll from './poll.js'
 const isChasquiCallback = (uri) => new RegExp(CHASQUI_URL).test(getCallback(uri))
-const getCallback = (uri) => decodeJWT(getUrlQueryParams(uri)['requestToken']).payload.callback
+const getCallback = (uri) => decodeJWT(getURLJWT(uri)).payload.callback
 
@@ -71,0 +71,0 @@ export { URIHandlerSend,

No alert changes

Improved metrics

Total package byte prevSize

1689430

increased by0.02%

Lines of code

21428

increased by0.04%

No dependency changes