Merge pull request #628 from bigmontz/update_uri-js

Update uri-js

Author: bigmontz

package-lock.json

@@ -107,6 +107,6 @@
     "@babel/runtime": "^7.5.5",
     "rxjs": "^6.6.3",
     "text-encoding-utf-8": "^1.0.2",
-    "uri-js": "^4.2.2"
+    "uri-js": "^4.4.0"
   }
 }

package.json

@@ -77,11 +77,22 @@ function parseDatabaseUrl (url) {
   const formattedHost = formatHost(host) // has square brackets for IPv6
   const port = extractPort(parsedUrl.port, scheme)
   const hostAndPort = `${formattedHost}:${port}`
-  const query = extractQuery(parsedUrl.query, url)
+  const query = extractQuery(
+    parsedUrl.query || extractResourceQueryString(parsedUrl.resourceName),
+    url
+  )
 
   return new Url(scheme, host, port, hostAndPort, query)
 }
 
+function extractResourceQueryString (resource) {
+  if (typeof resource !== 'string') {
+    return null
+  }
+  const [_, query] = resource.split('?')
+  return query
+}
+
 function sanitizeUrl (url) {
   url = url.trim()