Merge pull request #11 from jhkuperus/patch-1

Added support for multiple URL-safe chars in base64 tokens
lopsided · Nov 22, 2014 · 91d16ae · 91d16ae
2 parents e18814b + 4c2fcb4
commit 91d16ae
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/angularJwt/services/jwt.js b/src/angularJwt/services/jwt.js
@@ -2,7 +2,7 @@
   .service('jwtHelper', function() {
 
     this.urlBase64Decode = function(str) {
-      var output = str.replace('-', '+').replace('_', '/');
+      var output = str.replace(/-/g, '+').replace(/_/g, '/');
       switch (output.length % 4) {
         case 0: { break; }
         case 2: { output += '=='; break; }

diff --git a/test/unit/angularJwt/services/jwtSpec.js b/test/unit/angularJwt/services/jwtSpec.js
@@ -14,6 +14,13 @@ describe('jwt', function() {
       expect(token.name).to.equal('John Doe');
     }));
 
+    var multipleUrlCharactersToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOjEyMzQ1Njc4OTAsIm5hbWUiOiJKb2huIERvZWxsbO-jv2xsbO-jvyIsImFkbWluIjp0cnVlfQ.NCPM3vNwuvJGMIjR0csEFQDrSLcjm5P7ORumVq4ezmo';
+    it('should correctly decode tokens with multiple URL-safe characters', inject(function (jwtHelper) {
+      var token = jwtHelper.decodeToken(multipleUrlCharactersToken);
+
+      expect(token.name).to.equal('John Doelllï£¿lllï£¿');
+    }));
+
     it('should return no expiration', inject(function (jwtHelper) {
         var date = jwtHelper.getTokenExpirationDate(infiniteToken);