iOS: Update export signatures

Author: Chris Thompson

ios/RCTCrypto/RCTSha.m

@@ -5,37 +5,25 @@ @implementation RCTSha
 
 RCT_EXPORT_MODULE()
 
-RCT_EXPORT_METHOD(sha1:(NSString *)text
+RCT_EXPORT_METHOD(shaBase64:(NSString *)text :(NSString *)algorithm
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
     NSError *error = nil;
-    NSString *data = [Sha sha1:text];
+    NSString *data = [Sha shaBase64:text :algorithm];
     if (data == nil) {
-        reject(@"sha1_fail", @"Hash error", error);
+        reject(@"shaBase64_fail", @"Hash error", error);
     } else {
         resolve(data);
     }
 }
 
-RCT_EXPORT_METHOD(sha256:(NSString *)text
+RCT_EXPORT_METHOD(shaUtf8:(NSString *)text :(NSString *)algorithm
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
     NSError *error = nil;
-    NSString *data = [Sha sha256:text];
+    NSString *data = [Sha shaUtf8:text :algorithm];
     if (data == nil) {
-        reject(@"sha256_fail", @"Hash error", error);
-    } else {
-        resolve(data);
-    }
-}
-
-RCT_EXPORT_METHOD(sha512:(NSString *)text
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject) {
-    NSError *error = nil;
-    NSString *data = [Sha sha512:text];
-    if (data == nil) {
-        reject(@"sha512_fail", @"Hash error", error);
+        reject(@"shaUtf8_fail", @"Hash error", error);
     } else {
         resolve(data);
     }

ios/RCTCrypto/RNRandomBytes.h

@@ -9,10 +9,10 @@
 #import <Foundation/Foundation.h>
 #if __has_include(<React/RCTBridgeModule.h>)
 #import <React/RCTBridgeModule.h>
-#elif __has_include(“RCTBridgeModule.h”)
-#import “RCTBridgeModule.h”
+#elif __has_include("RCTBridgeModule.h")
+#import "RCTBridgeModule.h"
 #else
-#import “React/RCTBridgeModule.h” // Required when used as a Pod in a Swift project
+#import "React/RCTBridgeModule.h" // Required when used as a Pod in a Swift project
 #endif
 
 

ios/RCTCrypto/RNRandomBytes.m

@@ -9,10 +9,10 @@
 #import "RNRandomBytes.h"
 #if __has_include(<React/RCTBridgeModule.h>)
 #import <React/RCTBridgeModule.h>
-#elif __has_include(“RCTBridgeModule.h”)
-#import “RCTBridgeModule.h”
+#elif __has_include("RCTBridgeModule.h")
+#import "RCTBridgeModule.h"
 #else
-#import “React/RCTBridgeModule.h” // Required when used as a Pod in a Swift project
+#import "React/RCTBridgeModule.h" // Required when used as a Pod in a Swift project
 #endif
 
 @implementation RNRandomBytes
@@ -22,22 +22,29 @@ @implementation RNRandomBytes
 @synthesize bridge = _bridge;
 
 RCT_EXPORT_METHOD(randomBytes:(NSUInteger)length
-                  callback:(RCTResponseSenderBlock)callback)
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
-    callback(@[[NSNull null], [self randomBytes:length]]);
+    NSError *error = nil;
+    NSString *base64 = [RNRandomBytes randomBytes:length];
+    if (base64 == nil) {
+        reject(@"random_bytes failed", @"Random bytes error", error);
+    } else {
+        resolve(base64);
+    }
 }
 
-- (NSString *) randomBytes:(NSUInteger)length
++ (NSString *) randomBytes:(NSUInteger)length
 {
     NSMutableData* bytes = [NSMutableData dataWithLength:length];
     SecRandomCopyBytes(kSecRandomDefault, length, [bytes mutableBytes]);
     return [bytes base64EncodedStringWithOptions:0];
 }
 
-- (NSDictionary *)constantsToExport
++ (NSDictionary *)constantsToExport
 {
     return @{
-        @"seed": [self randomBytes:4096]
+        @"seed": [RNRandomBytes randomBytes:4096]
     };
 };