Fixed issue with '_' and '-' characters in Base64.

auth0 · Oct 16, 2014 · 6b9eb75 · 6b9eb75
1 parent 8b25554
commit 6b9eb75
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/Example/Tests/A0JWTDecoderSpec.m b/Example/Tests/A0JWTDecoderSpec.m
@@ -23,6 +23,7 @@
 #import "Specta.h"
 #import "A0JWTDecoder.h"
 
+#define kJWTWithSpecialChars @"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJfaWQiOiI1M2VjNjdkODI1NDIyMzE3MDAzNGYxNzciLCJlbWFpbCI6Im15ZW1haWxAZ21haWwuY29tIiwicHJvZmlsZV9waWN0dXJlIjoiaHR0cDovL2Nkbi51YnVidWJ0ZXN0ZXIuaW8vN2Q4MjU0MjIzMTcwMDM0ZjE3Ny5wbmc_dD0xNDEzNDQyMTI4OTAwIiwiaWF0IjoxNDEzNDcyNzUyfQ.WEELiFZqavfxPcnZ7vz44gbPMbEc0xeCaaS53btTYXY"
 
 NSString *A0TokenJWTCreate(NSDate *expireDate) {
     NSString *claims = [NSString stringWithFormat:@"{\"exp\": %f}", expireDate.timeIntervalSince1970];
@@ -136,6 +137,21 @@
             });
         });
 
+        context(@"valid id_token with special chars", ^{
+
+            beforeEach(^{
+                payload = [A0JWTDecoder payloadOfJWT:kJWTWithSpecialChars error:&error];
+            });
+
+            specify(@"payload", ^{
+                expect(payload).notTo.beEmpty();
+            });
+
+            specify(@"no error", ^{
+                expect(error).to.beNil();
+            });
+        });
+
         sharedExamplesFor(@"invalid id_token", ^(NSDictionary *data) {
 
             beforeEach(^{
@@ -150,13 +166,13 @@
             specify(@"an error", ^{
                 expect(error).toNot.beNil();
             });
-
+            
         });
-
+        
         itShouldBehaveLike(@"invalid id_token", @{ @"id_token": @"NOPARTS" });
         itShouldBehaveLike(@"invalid id_token", @{ @"id_token": @"NOTENOUGH.PARTS" });
         itShouldBehaveLike(@"invalid id_token", @{ @"id_token": @"HEADER.INVALIDCLAIM.SIGNATURE" });
     });
 });
 
-SpecEnd
+SpecEnd
diff --git a/Pod/Classes/A0JWTDecoder.m b/Pod/Classes/A0JWTDecoder.m
@@ -61,6 +61,9 @@ + (NSDictionary *)payloadOfJWT:(NSString *)jwt error:(NSError *__autoreleasing *
         NSInteger requiredLength = (4 * ceil((double)claimsLength / 4.0));
         NSInteger paddingCount = requiredLength - claimsLength;
 
+        claimsBase64 = [claimsBase64 stringByReplacingOccurrencesOfString:@"-" withString:@"+"];
+        claimsBase64 = [claimsBase64 stringByReplacingOccurrencesOfString:@"_" withString:@"/"];
+
         if (paddingCount > 0) {
             NSString *padding =
             [[NSString string] stringByPaddingToLength:paddingCount