Merge pull request #85 from lolgear/master

RS algorithms hierarchy refactoring

Classes/Algorithms/HSFamily/JWTAlgorithmHSBase.m

@@ -10,7 +10,13 @@
 #import <Base64/MF_Base64Additions.h>
 #import <CommonCrypto/CommonCrypto.h>
 #import <CommonCrypto/CommonHMAC.h>
+#import "JWTAlgorithmHS256.h"
+#import "JWTAlgorithmHS384.h"
+#import "JWTAlgorithmHS512.h"
 
+// TODO:
+// 1. hide algorithms as it was done in RSBase.
+// 2. remove remain headers.
 @interface JWTAlgorithmHSBase ()
 
 @end
@@ -79,14 +85,18 @@ - (BOOL)verifySignedInput:(NSString *)input withSignature:(NSString *)signature
 
 @end
 
+@interface JWTAlgorithmHSFamilyMember : JWTAlgorithmHSBase @end
+@implementation JWTAlgorithmHSFamilyMember @end
 
-@interface JWTAlgorithmHSBaseTest : JWTAlgorithmHSBase
+/* JWTAlgorithmHS256 : JWTAlgorithmHSFamilyMember and others */
+
+@interface JWTAlgorithmHSFamilyMemberMutable : JWTAlgorithmHSFamilyMember
 @property (assign, nonatomic, readwrite) size_t ccSHANumberDigestLength;
 @property (assign, nonatomic, readwrite) uint32_t ccHmacAlgSHANumber;
 @property (copy, nonatomic, readwrite) NSString *name;
 @end
 
-@implementation JWTAlgorithmHSBaseTest
+@implementation JWTAlgorithmHSFamilyMemberMutable
 
 @synthesize ccSHANumberDigestLength = _ccSHANumberDigestLength;
 @synthesize ccHmacAlgSHANumber = _ccHmacAlgSHANumber;
@@ -105,27 +115,30 @@ - (uint32_t)ccHmacAlgSHANumber {
 @implementation JWTAlgorithmHSBase (Create)
 
 + (instancetype)algorithm256 {
-    JWTAlgorithmHSBaseTest *base = [JWTAlgorithmHSBaseTest new];
-    base.ccSHANumberDigestLength = CC_SHA256_DIGEST_LENGTH;
-    base.ccHmacAlgSHANumber = kCCHmacAlgSHA256;
-    base.name = @"HS256";
-    return base;
+//    JWTAlgorithmHSBaseTest *base = [JWTAlgorithmHSBaseTest new];
+//    base.ccSHANumberDigestLength = CC_SHA256_DIGEST_LENGTH;
+//    base.ccHmacAlgSHANumber = kCCHmacAlgSHA256;
+//    base.name = @"HS256";
+//    return base;
+    return [JWTAlgorithmHS256 new];
 }
 
 + (instancetype)algorithm384 {
-    JWTAlgorithmHSBaseTest *base = [JWTAlgorithmHSBaseTest new];
-    base.ccSHANumberDigestLength = CC_SHA384_DIGEST_LENGTH;
-    base.ccHmacAlgSHANumber = kCCHmacAlgSHA384;
-    base.name = @"HS384";
-    return base;
+//    JWTAlgorithmHSBaseTest *base = [JWTAlgorithmHSBaseTest new];
+//    base.ccSHANumberDigestLength = CC_SHA384_DIGEST_LENGTH;
+//    base.ccHmacAlgSHANumber = kCCHmacAlgSHA384;
+//    base.name = @"HS384";
+//    return base;
+    return [JWTAlgorithmHS384 new];
 }
 
 + (instancetype)algorithm512 {
-    JWTAlgorithmHSBaseTest *base = [JWTAlgorithmHSBaseTest new];
-    base.ccSHANumberDigestLength = CC_SHA512_DIGEST_LENGTH;
-    base.ccHmacAlgSHANumber = kCCHmacAlgSHA512;
-    base.name = @"HS512";
-    return base;
+//    JWTAlgorithmHSBaseTest *base = [JWTAlgorithmHSBaseTest new];
+//    base.ccSHANumberDigestLength = CC_SHA512_DIGEST_LENGTH;
+//    base.ccHmacAlgSHANumber = kCCHmacAlgSHA512;
+//    base.name = @"HS512";
+//    return base;
+    return [JWTAlgorithmHS512 new];
 }
 
 @end

Classes/Algorithms/RSFamily/JWTAlgorithmRSBase.h

@@ -22,5 +22,11 @@
 + (instancetype)algorithm256;
 + (instancetype)algorithm384;
 + (instancetype)algorithm512;
++ (instancetype)mutableAlgorithm __deprecated;
 
-@end
+@end
+
+/*
+ // when you can't live without mutability, uncomment.
+ @class JWTAlgorithmRSFamilyMemberMutable;
+*/