prevent double encoding

appirio-tech · Jul 8, 2017 · 2385bd1 · 2385bd1 · birdofpreyru · Jul 8, 2017
1 parent c3e7451
commit 2385bd1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/app/profile/profile.routes.js b/app/profile/profile.routes.js
@@ -25,9 +25,6 @@ import angular from 'angular'
         controller: 'ProfileCtrl as profileVm',
         resolve: {
           userHandle: ['$stateParams', function($stateParams) {
-            if (decodeURIComponent($stateParams.userHandle) !== $stateParams.userHandle) {
-              return decodeURIComponent($stateParams.userHandle)
-            }
             return $stateParams.userHandle
           }],
           profile: ['userHandle', 'ProfileService', function(userHandle, ProfileService) {

diff --git a/app/topcoder.routes.js b/app/topcoder.routes.js
@@ -28,7 +28,14 @@ import moment from 'moment'
       if (path.indexOf('?') > -1) {
         return path.replace('?', '/?')
       }
-      $location.replace().path(path + '/')
+      // prevent double encoding
+      path = path.split('/')
+      for (var i = 0; i < path.length; i++) {
+        while (decodeURIComponent(path[i]) !== path[i]) {
+          path[i] = decodeURIComponent(path[i])
+        }
+      }
+      $location.replace().path(path.join('/') + '/')
     })
 
     var states = {