From 4583e96a3a462191381e9626debb90341d24c00f Mon Sep 17 00:00:00 2001 From: Tony Meng Date: Fri, 16 Feb 2018 11:04:15 -0800 Subject: [PATCH 1/3] Fix query string parsing --- packages/database/src/core/util/libs/parser.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/database/src/core/util/libs/parser.ts b/packages/database/src/core/util/libs/parser.ts index 0031774bf71..1bbb2fb4e4f 100644 --- a/packages/database/src/core/util/libs/parser.ts +++ b/packages/database/src/core/util/libs/parser.ts @@ -47,11 +47,14 @@ function decodeQuery(queryString: string): { [key: string]: string } { queryString = queryString.substring(1); } for (const segment of queryString.split('&')) { + if (segment.length === 0) { + continue; + } const kv = segment.split('='); if (kv.length === 2) { results[decodeURIComponent(kv[0])] = decodeURIComponent(kv[1]); } else { - warn('Invalid query string segment: ' + segment); + warn('Invalid query string segment: "' + segment + '" in query string: "' + queryString + '"'); } } return results; From 903affd6c1d55d2a46b195786d67283edeaaaaa0 Mon Sep 17 00:00:00 2001 From: Tony Meng Date: Fri, 16 Feb 2018 11:04:34 -0800 Subject: [PATCH 2/3] [AUTOMATED]: Prettier Code Styling --- packages/database/src/core/util/libs/parser.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/database/src/core/util/libs/parser.ts b/packages/database/src/core/util/libs/parser.ts index 1bbb2fb4e4f..464736fe472 100644 --- a/packages/database/src/core/util/libs/parser.ts +++ b/packages/database/src/core/util/libs/parser.ts @@ -54,7 +54,13 @@ function decodeQuery(queryString: string): { [key: string]: string } { if (kv.length === 2) { results[decodeURIComponent(kv[0])] = decodeURIComponent(kv[1]); } else { - warn('Invalid query string segment: "' + segment + '" in query string: "' + queryString + '"'); + warn( + 'Invalid query string segment: "' + + segment + + '" in query string: "' + + queryString + + '"' + ); } } return results; From 33188da8a5e0c04616febae0367b6158e24fe1e2 Mon Sep 17 00:00:00 2001 From: Tony Meng Date: Fri, 16 Feb 2018 13:37:40 -0800 Subject: [PATCH 3/3] Feedback --- packages/database/src/core/util/libs/parser.ts | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/packages/database/src/core/util/libs/parser.ts b/packages/database/src/core/util/libs/parser.ts index 464736fe472..7869926cccc 100644 --- a/packages/database/src/core/util/libs/parser.ts +++ b/packages/database/src/core/util/libs/parser.ts @@ -54,13 +54,7 @@ function decodeQuery(queryString: string): { [key: string]: string } { if (kv.length === 2) { results[decodeURIComponent(kv[0])] = decodeURIComponent(kv[1]); } else { - warn( - 'Invalid query string segment: "' + - segment + - '" in query string: "' + - queryString + - '"' - ); + warn(`Invalid query segment '${segment}' in query '${queryString}'`); } } return results;