Added Base64UrlEncoded variance

Signed-off-by: Dave Poirier <[email protected]>

.gitignore

@@ -0,0 +1,3 @@
+Base64.xcodeproj/xcuserdata
+.DS_Store
+Base64.xcodeproj/project.xcworkspace/xcuserdata

Base64/MF_AppDelegate.h

@@ -9,10 +9,6 @@
 #import <Cocoa/Cocoa.h>
 
 @interface MF_AppDelegate : NSObject <NSApplicationDelegate>
-
 @property (assign) IBOutlet NSWindow *window;
 @property (assign) IBOutlet NSTextField *textField;
-
--(IBAction)encode:(id)sender;
--(IBAction)decode:(id)sender;
 @end

Base64/MF_AppDelegate.m

@@ -11,9 +11,6 @@
 
 @implementation MF_AppDelegate
 
-@synthesize window = _window;
-@synthesize textField = _textField;
-
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
 {
     for( int i = 0; i < 300; i++ ) {
@@ -40,14 +37,14 @@ -(NSData *)randomDataBlock
     return [[NSData alloc] initWithBytes:bytes length:dataLength];
 }
 
--(void)encode:(id)sender
+-(IBAction)encode:(id)sender
 {
     NSString *raw = [_textField stringValue];
     NSString *encoded = [raw base64String];
     [_textField setStringValue:encoded];
 }
 
--(void)decode:(id)sender
+-(IBAction)decode:(id)sender
 {
     NSString *encoded = [_textField stringValue];
     NSData *data = [NSData dataWithBase64String:encoded];
@@ -62,4 +59,26 @@ -(void)decode:(id)sender
     }
 }
 
+-(IBAction)encodeBase64UrlEncoding:(id)sender
+{
+    NSString *raw = [_textField stringValue];
+    NSString *encoded = [raw base64UrlEncodedString];
+    [_textField setStringValue:encoded];
+}
+
+-(IBAction)decodeBase64UrlEncoding:(id)sender
+{
+    NSString *encoded = [_textField stringValue];
+    NSData *data = [NSData dataWithBase64UrlEncodedString:encoded];
+    NSString *raw = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+    if( raw )
+    {
+        [_textField setStringValue:raw];
+    }
+    else
+    {
+        [_textField setStringValue:[NSString stringWithFormat:@"WARNING: data could not be converted to a NSString, dumping decoded binary data: %@", data]];
+    }
+}
+
 @end

Base64/MF_Base64Additions.h

@@ -13,15 +13,21 @@
 
 @interface NSString (Base64Addition)
 +(NSString *)stringFromBase64String:(NSString *)base64String;
++(NSString *)stringFromBase64UrlEncodedString:(NSString *)base64UrlEncodedString;
 -(NSString *)base64String;
+-(NSString *)base64UrlEncodedString;
 @end
 
 @interface NSData (Base64Addition)
 +(NSData *)dataWithBase64String:(NSString *)base64String;
++(NSData *)dataWithBase64UrlEncodedString:(NSString *)base64UrlEncodedString;
 -(NSString *)base64String;
+-(NSString *)base64UrlEncodedString;
 @end
 
 @interface MF_Base64Codec : NSObject 
 +(NSData *)dataFromBase64String:(NSString *)base64String;
 +(NSString *)base64StringFromData:(NSData *)data;
++(NSString *)base64UrlEncodedStringFromBase64String:(NSString *)base64String;
++(NSString *)base64StringFromBase64UrlEncodedString:(NSString *)base64UrlEncodedString;
 @end

Base64/MF_Base64Additions.m

@@ -12,6 +12,34 @@
 #import "MF_Base64Additions.h"
 
 @implementation MF_Base64Codec
+
++(NSString *)base64StringFromBase64UrlEncodedString:(NSString *)base64UrlEncodedString
+{
+    NSString *s = base64UrlEncodedString;
+    s = [s stringByReplacingOccurrencesOfString:@"-" withString:@"+"];
+    s = [s stringByReplacingOccurrencesOfString:@"_" withString:@"/"];
+    switch (s.length % 4) {
+        case 2:
+            s = [s stringByAppendingString:@"=="];
+            break;
+        case 3:
+            s = [s stringByAppendingString:@"="];
+            break;
+        default:
+            break;
+    }
+    return s;
+}
+
++(NSString *)base64UrlEncodedStringFromBase64String:(NSString *)base64String
+{
+    NSString *s = base64String;
+    s = [s stringByReplacingOccurrencesOfString:@"=" withString:@""];
+    s = [s stringByReplacingOccurrencesOfString:@"+" withString:@"-"];
+    s = [s stringByReplacingOccurrencesOfString:@"/" withString:@"_"];
+    return s;
+}
+
 +(NSData *)dataFromBase64String:(NSString *)encoding
 {
     NSData *data = nil;
@@ -186,20 +214,36 @@ -(NSString *)base64String
     NSData *utf8encoding = [self dataUsingEncoding:NSUTF8StringEncoding];
     return [MF_Base64Codec base64StringFromData:utf8encoding];
 }
+-(NSString *)base64UrlEncodedString
+{
+    return [MF_Base64Codec base64UrlEncodedStringFromBase64String:[self base64String]];
+}
 +(NSString *)stringFromBase64String:(NSString *)base64String
 {
     NSData *utf8encoding = [MF_Base64Codec dataFromBase64String:base64String];
     return [[NSString alloc] initWithData:utf8encoding encoding:NSUTF8StringEncoding];
 }
++(NSString *)stringFromBase64UrlEncodedString:(NSString *)base64UrlEncodedString
+{
+    return [self stringFromBase64String:[MF_Base64Codec base64StringFromBase64UrlEncodedString:base64UrlEncodedString]];
+}
 @end
 
 @implementation NSData (Base64Addition)
 +(NSData *)dataWithBase64String:(NSString *)base64String
 {
     return [MF_Base64Codec dataFromBase64String:base64String];
 }
++(NSData *)dataWithBase64UrlEncodedString:(NSString *)base64UrlEncodedString
+{
+    return [self dataWithBase64String:[MF_Base64Codec base64StringFromBase64UrlEncodedString:base64UrlEncodedString]];
+}
 -(NSString *)base64String
 {
     return [MF_Base64Codec base64StringFromData:self];
 }
+-(NSString *)base64UrlEncodedString
+{
+    return [MF_Base64Codec base64UrlEncodedStringFromBase64String:[self base64String]];
+}
 @end