From 7090b4f3e03b0ede92cf7b370f745b6d71ae2b9d Mon Sep 17 00:00:00 2001
From: Erik Ziegler <erik.sweed@gmail.com>
Date: Wed, 4 Jul 2018 15:43:34 +0200
Subject: [PATCH] fix(WADOuri) Properly escape characters when building WADO
 URI (closes #133)

---
 .../imports/server/services/wado/retrieveMetadata.js       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Packages/ohif-studies/imports/server/services/wado/retrieveMetadata.js b/Packages/ohif-studies/imports/server/services/wado/retrieveMetadata.js
index f374aa065..5a458e198 100644
--- a/Packages/ohif-studies/imports/server/services/wado/retrieveMetadata.js
+++ b/Packages/ohif-studies/imports/server/services/wado/retrieveMetadata.js
@@ -63,10 +63,13 @@ function buildInstanceWadoUrl(server, studyInstanceUid, seriesInstanceUid, sopIn
     params.push(`studyUID=${studyInstanceUid}`);
     params.push(`seriesUID=${seriesInstanceUid}`);
     params.push(`objectUID=${sopInstanceUid}`);
-    params.push('contentType=application%2Fdicom');
+    params.push('contentType=application/dicom');
     params.push('transferSyntax=*');
 
-    return `${server.wadoUriRoot}?${params.join('&')}`;
+    const paramString = params.join('&');
+    const uri = encodeURIComponent(paramString);
+
+    return `${server.wadoUriRoot}?${uri}`;
 }
 
 function buildInstanceWadoRsUri(server, studyInstanceUid, seriesInstanceUid, sopInstanceUid) {