Merge pull request #9 from VirgilSecurity/fix-hash

Fixes to `calculateHash` and `HEADER_SEARCH_PATHS`
VirgilSecurity · Oct 4, 2019 · 86636aa · 86636aa
2 parents 7d45a5d + 0f83098
commit 86636aa
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 7 deletions.
diff --git a/ios/RNVirgilCrypto.xcodeproj/project.pbxproj b/ios/RNVirgilCrypto.xcodeproj/project.pbxproj
@@ -281,7 +281,8 @@
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../../react-native/React/**",
-					"$(SRCROOT)/../../../ios/Pods/Headers/**",
+					"$(SRCROOT)/../../../ios/Pods/Headers/Public",
+					"$(SRCROOT)/../../../ios/Pods/Headers/Public/React-Core",
 					"${BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/VirgilCrypto/VirgilCrypto.framework/Headers",
           "${BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/VirgilCryptoFoundation/VirgilCryptoFoundation.framework/Headers",
 					"${BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/VirgilCryptoPythia/VirgilCryptoPythia.framework/Headers",
@@ -307,7 +308,8 @@
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../../react-native/React/**",
-					"$(SRCROOT)/../../../ios/Pods/Headers/**",
+					"$(SRCROOT)/../../../ios/Pods/Headers/Public",
+					"$(SRCROOT)/../../../ios/Pods/Headers/Public/React-Core",
 					"${BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/VirgilCrypto/VirgilCrypto.framework/Headers",
           "${BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/VirgilCryptoFoundation/VirgilCryptoFoundation.framework/Headers",
 					"${BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/VirgilCryptoPythia/VirgilCryptoPythia.framework/Headers",

diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "typings": "index.d.ts",
   "scripts": {
-    "test": "jest src",
+    "test": "jest index.spec.js src",
     "lint": "eslint ."
   },
   "keywords": [

diff --git a/src/virgil-crypto.js b/src/virgil-crypto.js
@@ -29,13 +29,16 @@ export const virgilCrypto = {
 
   calculateHash(data, algorithm) {
     const dataBase64 = dataToBase64(data, 'utf8', 'data');
+    let response;
     if (algorithm == null) {
-      return unwrapResponse(RNVirgilCrypto.computeHash(dataBase64));
+      response = RNVirgilCrypto.computeHash(dataBase64);
+    } else {
+      const nativeAlg = checkedGetHashAlgorithm(algorithm);
+      response = RNVirgilCrypto.computeHashWithAlgorithm(dataBase64, nativeAlg);
     }
-
-    const nativeAlg = checkedGetHashAlgorithm(algorithm);
+
     return base64ToBuffer(
-      unwrapResponse(RNVirgilCrypto.computeHashWithAlgorithm(dataBase64, nativeAlg))
+      unwrapResponse(response)
     );
   },
 

diff --git a/src/virgil-crypto.spec.js b/src/virgil-crypto.spec.js
@@ -0,0 +1,40 @@
+import { NativeModules } from 'react-native';
+import { Buffer } from 'buffer';
+import { virgilCrypto } from './virgil-crypto';
+import { HashAlgorithm } from './hash-algorithm';
+
+jest.mock('react-native', () => ({
+  NativeModules: {
+    RNVirgilCrypto: {
+      HashAlgorithm: { SHA256: 'SHA256'},
+      computeHash: jest.fn(),
+      computeHashWithAlgorithm: jest.fn()
+    },
+  },
+  Platform: {
+    OS: 'ios',
+  },
+}));
+
+describe('virgilCrypto', () => {
+  beforeEach(() => {
+    NativeModules.RNVirgilCrypto.computeHash.mockReset();
+    NativeModules.RNVirgilCrypto.computeHashWithAlgorithm.mockReset();
+  });
+  describe('calculateHash', () => {
+    it('returns Buffer when algorithm is not specified', () => {
+      const expectedResultBase64 = Buffer.from('hash_of_data').toString('base64');
+      NativeModules.RNVirgilCrypto.computeHash.mockReturnValue({ result: expectedResultBase64 });
+      const result = virgilCrypto.calculateHash('data');
+      expect(Buffer.isBuffer(result)).toBe(true);
+      expect(result.toString('utf8')).toBe('hash_of_data');
+    });
+    it('returns Buffer when algorithm is specified', () => {
+      const expectedResultBase64 = Buffer.from('hash_of_data').toString('base64');
+      NativeModules.RNVirgilCrypto.computeHashWithAlgorithm.mockReturnValue({ result: expectedResultBase64 });
+      const result = virgilCrypto.calculateHash('data', HashAlgorithm.SHA256);
+      expect(Buffer.isBuffer(result)).toBe(true);
+      expect(result.toString('utf8')).toBe('hash_of_data');
+    });
+  });
+});