react-native-security-suite 0.5.17 → 0.5.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/android/src/main/java/com/securitysuite/SecuritySuiteModule.java +8 -8
- package/ios/SecuritySuite.swift +2 -2
- package/ios/SecuritySuite.xcodeproj/project.xcworkspace/xcuserdata/Navabi.xcuserdatad/UserInterfaceState.xcuserstate +0 -0
- package/lib/commonjs/index.js +4 -7
- package/lib/commonjs/index.js.map +1 -1
- package/lib/module/index.js +4 -7
- package/lib/module/index.js.map +1 -1
- package/lib/typescript/index.d.ts.map +1 -1
- package/package.json +1 -3
- package/src/index.tsx +3 -6
|
@@ -41,8 +41,8 @@ public class SecuritySuiteModule extends ReactContextBaseJavaModule {
|
|
|
41
41
|
public static final String NAME = "SecuritySuite";
|
|
42
42
|
private ReactApplicationContext context;
|
|
43
43
|
|
|
44
|
-
KeyPairGenerator
|
|
45
|
-
KeyPair
|
|
44
|
+
KeyPairGenerator keyPairGenerator;
|
|
45
|
+
KeyPair keyPair;
|
|
46
46
|
PublicKey publicKey;
|
|
47
47
|
PublicKey serverPublicKey;
|
|
48
48
|
PrivateKey privateKey;
|
|
@@ -57,12 +57,12 @@ public class SecuritySuiteModule extends ReactContextBaseJavaModule {
|
|
|
57
57
|
|
|
58
58
|
private void generateKeyPair() {
|
|
59
59
|
try {
|
|
60
|
-
|
|
60
|
+
keyPairGenerator = KeyPairGenerator.getInstance("EC");
|
|
61
61
|
ECGenParameterSpec prime256v1ParamSpec = new ECGenParameterSpec("secp256r1");
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
publicKey =
|
|
65
|
-
privateKey =
|
|
62
|
+
keyPairGenerator.initialize(prime256v1ParamSpec);
|
|
63
|
+
keyPair = keyPairGenerator.genKeyPair();
|
|
64
|
+
publicKey = keyPair.getPublic();
|
|
65
|
+
privateKey = keyPair.getPrivate();
|
|
66
66
|
} catch (Exception e) {
|
|
67
67
|
Log.e("generateKeyPair Error: ", String.valueOf(e));
|
|
68
68
|
}
|
|
@@ -96,7 +96,7 @@ public class SecuritySuiteModule extends ReactContextBaseJavaModule {
|
|
|
96
96
|
X509EncodedKeySpec keySpec = new X509EncodedKeySpec(Base64.decode(serverPK.getBytes(), Base64.DEFAULT)); // Change ASN1 to publicKey
|
|
97
97
|
KeyFactory keyFactory = KeyFactory.getInstance("EC");
|
|
98
98
|
serverPublicKey = keyFactory.generatePublic(keySpec);
|
|
99
|
-
secretKey = agreeSecretKey(
|
|
99
|
+
secretKey = agreeSecretKey(keyPair.getPrivate(), serverPublicKey, true);
|
|
100
100
|
sharedKey = Base64.encodeToString(secretKey.getEncoded(), Base64.DEFAULT);
|
|
101
101
|
promise.resolve(sharedKey);
|
|
102
102
|
} catch (Exception e) {
|
package/ios/SecuritySuite.swift
CHANGED
|
@@ -18,7 +18,7 @@ class SecuritySuite: NSObject {
|
|
|
18
18
|
do {
|
|
19
19
|
privateKey = P256.KeyAgreement.PrivateKey().rawRepresentation.base64EncodedString()
|
|
20
20
|
keyData = Data(base64Encoded: privateKey as! String)!
|
|
21
|
-
publicKey = try? (ASN1.
|
|
21
|
+
publicKey = try? (ASN1.ec384 + [0x04] + P256.KeyAgreement.PrivateKey(rawRepresentation: keyData).publicKey.rawRepresentation).base64EncodedString()
|
|
22
22
|
|
|
23
23
|
resolve(publicKey)
|
|
24
24
|
} catch {
|
|
@@ -33,7 +33,7 @@ class SecuritySuite: NSObject {
|
|
|
33
33
|
guard let serverPublicKeyData = Data(base64Encoded: serverPK as String),
|
|
34
34
|
let privateKeyData = Data(base64Encoded: privateKey as String) else { return }
|
|
35
35
|
|
|
36
|
-
sharedKey = try? P256.KeyAgreement.PrivateKey(rawRepresentation: privateKeyData).sharedSecretFromKeyAgreement(with: .init(rawRepresentation: serverPublicKeyData.dropFirst(ASN1.
|
|
36
|
+
sharedKey = try? P256.KeyAgreement.PrivateKey(rawRepresentation: privateKeyData).sharedSecretFromKeyAgreement(with: .init(rawRepresentation: serverPublicKeyData.dropFirst(ASN1.ec384.count + 1)))
|
|
37
37
|
.withUnsafeBytes({ Data(buffer: $0.bindMemory(to: UInt8.self)) })
|
|
38
38
|
.base64EncodedString()
|
|
39
39
|
|
|
Binary file
|
package/lib/commonjs/index.js
CHANGED
|
@@ -10,7 +10,6 @@ exports.fetch = fetch;
|
|
|
10
10
|
exports.getSharedKey = exports.getPublicKey = exports.getDeviceId = void 0;
|
|
11
11
|
var _reactNative = require("react-native");
|
|
12
12
|
var _asyncStorage = _interopRequireDefault(require("@react-native-async-storage/async-storage"));
|
|
13
|
-
var _lodash = _interopRequireDefault(require("lodash"));
|
|
14
13
|
var _helpers = require("./helpers");
|
|
15
14
|
var _events = require("events");
|
|
16
15
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
@@ -89,7 +88,7 @@ const SecureStorage = {
|
|
|
89
88
|
const encryptedData = await _asyncStorage.default.getItem(encryptedKey);
|
|
90
89
|
const data = await decrypt(encryptedData ?? '');
|
|
91
90
|
if (!(0, _helpers.isJsonString)(data) || !(0, _helpers.isJsonString)(value)) return;
|
|
92
|
-
const mergedData = await JSON.stringify(
|
|
91
|
+
const mergedData = await JSON.stringify(Object.assign(JSON.parse(data), JSON.parse(value)));
|
|
93
92
|
const encryptedValue = await encrypt(mergedData);
|
|
94
93
|
return _asyncStorage.default.setItem(encryptedKey, encryptedValue);
|
|
95
94
|
} catch (e) {
|
|
@@ -154,7 +153,7 @@ const SecureStorage = {
|
|
|
154
153
|
const encryptedData = await _asyncStorage.default.getItem(item[0]);
|
|
155
154
|
const data = await decrypt(encryptedData ?? '');
|
|
156
155
|
if (!(0, _helpers.isJsonString)(data) || !(0, _helpers.isJsonString)(item[1])) return null;
|
|
157
|
-
const mergedData = await JSON.stringify(
|
|
156
|
+
const mergedData = await JSON.stringify(Object.assign(JSON.parse(data), JSON.parse(item[1])));
|
|
158
157
|
const encryptedValue = await encrypt(mergedData, false);
|
|
159
158
|
return _asyncStorage.default.setItem(encryptedKey, encryptedValue);
|
|
160
159
|
}
|
|
@@ -199,12 +198,10 @@ function fetch(url, options) {
|
|
|
199
198
|
reject({
|
|
200
199
|
json: () => errorJson,
|
|
201
200
|
error: error === null || error === void 0 ? void 0 : error.error,
|
|
202
|
-
path: errorJson === null || errorJson === void 0 ? void 0 : errorJson.path,
|
|
203
|
-
message: errorJson === null || errorJson === void 0 ? void 0 : errorJson.message,
|
|
204
|
-
code: errorJson === null || errorJson === void 0 ? void 0 : errorJson.code,
|
|
205
201
|
status: error === null || error === void 0 ? void 0 : error.status,
|
|
206
202
|
url: error === null || error === void 0 ? void 0 : error.url,
|
|
207
|
-
curl: error === null || error === void 0 ? void 0 : error.curl
|
|
203
|
+
curl: error === null || error === void 0 ? void 0 : error.curl,
|
|
204
|
+
...errorJson
|
|
208
205
|
});
|
|
209
206
|
}
|
|
210
207
|
} catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_reactNative","require","_asyncStorage","_interopRequireDefault","
|
|
1
|
+
{"version":3,"names":["_reactNative","require","_asyncStorage","_interopRequireDefault","_helpers","_events","obj","__esModule","default","LINKING_ERROR","Platform","select","ios","SecuritySuite","NativeModules","Proxy","get","Error","getPublicKey","exports","getSharedKey","serverPublicKey","encryptBySharedKey","input","encrypt","decryptBySharedKey","decrypt","getDeviceId","Promise","resolve","reject","result","error","hardEncryption","arguments","length","undefined","secretKey","storageEncrypt","storageDecrypt","SecureStorage","setItem","key","value","encryptedKey","encryptedValue","AsyncStorage","e","console","getItem","encryptedData","mergeItem","data","isJsonString","mergedData","JSON","stringify","Object","assign","parse","removeItem","getAllKeys","encryptedKeys","all","map","item","decryptedKey","multiSet","keyValuePairs","encryptedKeyValuePairs","multiGet","keys","Array","isArray","encryptedItems","decryptedalue","multiMerge","multiRemove","clear","fetch","url","options","SSEventEmitter","emit","response","json","jsonParse","errorJson","status","curl","deviceHasSecurityRisk","EventEmitter","_default"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,aAAA,GAAAC,sBAAA,CAAAF,OAAA;AACA,IAAAG,QAAA,GAAAH,OAAA;AACA,IAAAI,OAAA,GAAAJ,OAAA;AAAsC,SAAAE,uBAAAG,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAEtC;AACA;AACA;;AAmDA,MAAMG,aAAa,GAChB,sFAAqF,GACtFC,qBAAQ,CAACC,MAAM,CAAC;EAAEC,GAAG,EAAE,gCAAgC;EAAEJ,OAAO,EAAE;AAAG,CAAC,CAAC,GACvE,sDAAsD,GACtD,6CAA6C;AAE/C,MAAMK,aAAa,GAAGC,0BAAa,CAACD,aAAa,GAC7CC,0BAAa,CAACD,aAAa,GAC3B,IAAIE,KAAK,CACP,CAAC,CAAC,EACF;EACEC,GAAGA,CAAA,EAAG;IACJ,MAAM,IAAIC,KAAK,CAACR,aAAa,CAAC;EAChC;AACF,CACF,CAAC;AAEE,MAAMS,YAAY,GAAGA,CAAA,KAAuBL,aAAa,CAACK,YAAY,CAAC,CAAC;AAACC,OAAA,CAAAD,YAAA,GAAAA,YAAA;AAEzE,MAAME,YAAY,GAAIC,eAAuB,IAClDR,aAAa,CAACO,YAAY,CAACC,eAAe,CAAC;AAACF,OAAA,CAAAC,YAAA,GAAAA,YAAA;AAEvC,MAAME,kBAAkB,GAAIC,KAAa,IAC9CA,KAAK,IAAI,OAAOA,KAAK,KAAK,QAAQ,GAAGV,aAAa,CAACW,OAAO,CAACD,KAAK,CAAC,GAAG,EAAE;AAACJ,OAAA,CAAAG,kBAAA,GAAAA,kBAAA;AAElE,MAAMG,kBAAkB,GAAIF,KAAa,IAC9CA,KAAK,IAAI,OAAOA,KAAK,KAAK,QAAQ,GAAGV,aAAa,CAACa,OAAO,CAACH,KAAK,CAAC,GAAG,EAAE;AAACJ,OAAA,CAAAM,kBAAA,GAAAA,kBAAA;AAElE,MAAME,WAAW,GAAGA,CAAA,KACzB,IAAIC,OAAO,CAAC,CAACC,OAAY,EAAEC,MAAW,KAAK;EACzCjB,aAAa,CAACc,WAAW,CAAC,CAACI,MAAqB,EAAEC,KAAoB,KAAK;IACzE,IAAIA,KAAK,KAAK,IAAI,EAAEF,MAAM,CAACE,KAAK,CAAC,CAAC,KAC7BH,OAAO,CAACE,MAAM,CAAC;EACtB,CAAC,CAAC;AACJ,CAAC,CAAC;AAACZ,OAAA,CAAAQ,WAAA,GAAAA,WAAA;AAEE,MAAMH,OAAO,GAAG,SAAAA,CACrBD,KAAa;EAAA,IACbU,cAAc,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,IAAI;EAAA,IACrBG,SAAS,GAAAH,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,IAAI;EAAA,OAEhB,IAAIN,OAAO,CAAC,CAACC,OAAY,EAAEC,MAAW,KAAK;IACzC,IAAI,CAACP,KAAK,EAAEM,OAAO,CAACN,KAAK,CAAC;IAE1BV,aAAa,CAACyB,cAAc,CAC1Bf,KAAK,EACLc,SAAS,EACTJ,cAAc,EACd,CAACF,MAAqB,EAAEC,KAAoB,KAAK;MAC/C,IAAIA,KAAK,KAAK,IAAI,EAAEF,MAAM,CAACE,KAAK,CAAC,CAAC,KAC7BH,OAAO,CAACE,MAAM,CAAC;IACtB,CACF,CAAC;EACH,CAAC,CAAC;AAAA;AAACZ,OAAA,CAAAK,OAAA,GAAAA,OAAA;AAEE,MAAME,OAAO,GAAG,SAAAA,CACrBH,KAAa;EAAA,IACbU,cAAc,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,IAAI;EAAA,IACrBG,SAAS,GAAAH,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,IAAI;EAAA,OAEhB,IAAIN,OAAO,CAAC,CAACC,OAAY,EAAEC,MAAW,KAAK;IACzC,IAAI,CAACP,KAAK,EAAEM,OAAO,CAACN,KAAK,CAAC;IAE1BV,aAAa,CAAC0B,cAAc,CAC1BhB,KAAK,EACLc,SAAS,EACTJ,cAAc,EACd,CAACF,MAAqB,EAAEC,KAAoB,KAAK;MAC/C,IAAIA,KAAK,KAAK,IAAI,EAAEF,MAAM,CAACE,KAAK,CAAC,CAAC,KAC7BH,OAAO,CAACE,MAAM,CAAC;IACtB,CACF,CAAC;EACH,CAAC,CAAC;AAAA;AAACZ,OAAA,CAAAO,OAAA,GAAAA,OAAA;AAEE,MAAMc,aAAa,GAAG;EAC3BC,OAAO,EAAE,MAAAA,CAAOC,GAAW,EAAEC,KAAa,KAAoB;IAC5D,IAAI;MACF,MAAMC,YAAY,GAAG,MAAMpB,OAAO,CAACkB,GAAG,EAAE,KAAK,CAAC;MAC9C,MAAMG,cAAc,GAAG,MAAMrB,OAAO,CAACmB,KAAK,CAAC;MAC3C,OAAOG,qBAAY,CAACL,OAAO,CAACG,YAAY,EAAEC,cAAc,CAAC;IAC3D,CAAC,CAAC,OAAOE,CAAC,EAAE;MACVC,OAAO,CAAChB,KAAK,CAAC,iBAAiB,EAAEe,CAAC,CAAC;IACrC;EACF,CAAC;EACDE,OAAO,EAAE,MAAOP,GAAW,IAA6B;IACtD,IAAI;MACF,MAAME,YAAY,GAAG,MAAMpB,OAAO,CAACkB,GAAG,EAAE,KAAK,CAAC;MAC9C,MAAMQ,aAAa,GAAG,MAAMJ,qBAAY,CAACG,OAAO,CAACL,YAAY,CAAC;MAC9D,OAAOlB,OAAO,CAACwB,aAAa,IAAI,EAAE,CAAC;IACrC,CAAC,CAAC,OAAOH,CAAC,EAAE;MACVC,OAAO,CAAChB,KAAK,CAAC,iBAAiB,EAAEe,CAAC,CAAC;MACnC,OAAO,EAAE;IACX;EACF,CAAC;EACDI,SAAS,EAAE,MAAAA,CAAOT,GAAW,EAAEC,KAAa,KAAoB;IAC9D,IAAI;MACF,MAAMC,YAAY,GAAG,MAAMpB,OAAO,CAACkB,GAAG,EAAE,KAAK,CAAC;MAC9C,MAAMQ,aAAa,GAAG,MAAMJ,qBAAY,CAACG,OAAO,CAACL,YAAY,CAAC;MAC9D,MAAMQ,IAAI,GAAG,MAAM1B,OAAO,CAACwB,aAAa,IAAI,EAAE,CAAC;MAC/C,IAAI,CAAC,IAAAG,qBAAY,EAACD,IAAI,CAAC,IAAI,CAAC,IAAAC,qBAAY,EAACV,KAAK,CAAC,EAAE;MACjD,MAAMW,UAAU,GAAG,MAAMC,IAAI,CAACC,SAAS,CACrCC,MAAM,CAACC,MAAM,CAACH,IAAI,CAACI,KAAK,CAACP,IAAI,CAAC,EAAEG,IAAI,CAACI,KAAK,CAAChB,KAAK,CAAC,CACnD,CAAC;MACD,MAAME,cAAc,GAAG,MAAMrB,OAAO,CAAC8B,UAAU,CAAC;MAChD,OAAOR,qBAAY,CAACL,OAAO,CAACG,YAAY,EAAEC,cAAc,CAAC;IAC3D,CAAC,CAAC,OAAOE,CAAC,EAAE;MACVC,OAAO,CAAChB,KAAK,CAAC,mBAAmB,EAAEe,CAAC,CAAC;IACvC;EACF,CAAC;EACDa,UAAU,EAAE,MAAOlB,GAAW,IAAoB;IAChD,IAAI;MACF,MAAME,YAAY,GAAG,MAAMpB,OAAO,CAACkB,GAAG,EAAE,KAAK,CAAC;MAC9C,OAAOI,qBAAY,CAACc,UAAU,CAAChB,YAAY,CAAC;IAC9C,CAAC,CAAC,OAAOG,CAAC,EAAE;MACVC,OAAO,CAAChB,KAAK,CAAC,oBAAoB,EAAEe,CAAC,CAAC;IACxC;EACF,CAAC;EACDc,UAAU,EAAE,MAAAA,CAAA,KAAwC;IAClD,IAAI;MACF,MAAMC,aAAa,GAAG,MAAMhB,qBAAY,CAACe,UAAU,CAAC,CAAC;MACrD,OAAO,MAAMjC,OAAO,CAACmC,GAAG,CACtBD,aAAa,CAACE,GAAG,CAAC,MAAOC,IAAY,IAAsB;QACzD,MAAMC,YAAY,GAAG,MAAMxC,OAAO,CAACuC,IAAI,EAAE,KAAK,CAAC;QAC/C,OAAOC,YAAY,GAAGA,YAAY,GAAGD,IAAI;MAC3C,CAAC,CACH,CAAC;IACH,CAAC,CAAC,OAAOlB,CAAC,EAAE;MACVC,OAAO,CAAChB,KAAK,CAAC,oBAAoB,EAAEe,CAAC,CAAC;MACtC,OAAO,EAAE;IACX;EACF,CAAC;EACDoB,QAAQ,EAAE,MAAOC,aAAmC,IAAoB;IACtE,IAAI;MACF,MAAMC,sBAA2B,GAAG,MAAMzC,OAAO,CAACmC,GAAG,CACnDK,aAAa,CAACJ,GAAG,CAAC,MAAOC,IAAmB,IAAK;QAC/C,IAAIA,IAAI,CAAC9B,MAAM,KAAK,CAAC,IAAI8B,IAAI,CAAC,CAAC,CAAC,IAAIA,IAAI,CAAC,CAAC,CAAC,EAAE;UAC3C,MAAMrB,YAAY,GAAG,MAAMpB,OAAO,CAACyC,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC;UAClD,MAAMpB,cAAc,GAAG,MAAMrB,OAAO,CAACyC,IAAI,CAAC,CAAC,CAAC,CAAC;UAC7C,OAAO,CAACrB,YAAY,EAAEC,cAAc,CAAC;QACvC;QAEA,OAAO,IAAI;MACb,CAAC,CACH,CAAC;MACDC,qBAAY,CAACqB,QAAQ,CAACE,sBAAsB,CAAC;IAC/C,CAAC,CAAC,OAAOtB,CAAC,EAAE;MACVC,OAAO,CAAChB,KAAK,CAAC,kBAAkB,EAAEe,CAAC,CAAC;IACtC;EACF,CAAC;EACDuB,QAAQ,EAAE,MACRC,IAAmB,IAC6B;IAChD,IAAI;MACF,IAAI,CAACC,KAAK,CAACC,OAAO,CAACF,IAAI,CAAC,EAAE,OAAO,EAAE;MACnC,MAAMT,aAAa,GAAG,MAAMlC,OAAO,CAACmC,GAAG,CACrCQ,IAAI,CAACP,GAAG,CACN,MAAOC,IAAY,IAAsB,MAAMzC,OAAO,CAACyC,IAAI,EAAE,KAAK,CACpE,CACF,CAAC;MACD,MAAMS,cAAc,GAAG,MAAM5B,qBAAY,CAACwB,QAAQ,CAACR,aAAa,CAAC;MACjE,OAAO,MAAMlC,OAAO,CAACmC,GAAG,CACtBW,cAAc,IAAIA,cAAc,CAACvC,MAAM,GACnCuC,cAAc,CAACV,GAAG,CAAC,MAAOC,IAAS,IAAgC;QACjE,MAAMC,YAAY,GAAG,MAAMxC,OAAO,CAACuC,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC;QAClD,MAAMU,aAAa,GAAG,MAAMjD,OAAO,CAACuC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC5C,OAAO,CAACC,YAAY,EAAES,aAAa,CAAC;MACtC,CAAC,CAAC,GACF,EACN,CAAC;IACH,CAAC,CAAC,OAAO5B,CAAC,EAAE;MACVC,OAAO,CAAChB,KAAK,CAAC,kBAAkB,EAAEe,CAAC,CAAC;MACpC,OAAO,EAAE;IACX;EACF,CAAC;EACD6B,UAAU,EAAE,MAAOR,aAAmC,IAAoB;IACxE,IAAI;MACFA,aAAa,CAACJ,GAAG,CAAC,MAAOC,IAAmB,IAAK;QAC/C,IAAIA,IAAI,CAAC9B,MAAM,KAAK,CAAC,IAAI8B,IAAI,CAAC,CAAC,CAAC,IAAIA,IAAI,CAAC,CAAC,CAAC,EAAE;UAC3C,MAAMrB,YAAY,GAAG,MAAMpB,OAAO,CAACyC,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC;UAClD,MAAMf,aAAa,GAAG,MAAMJ,qBAAY,CAACG,OAAO,CAACgB,IAAI,CAAC,CAAC,CAAC,CAAC;UACzD,MAAMb,IAAI,GAAG,MAAM1B,OAAO,CAACwB,aAAa,IAAI,EAAE,CAAC;UAC/C,IAAI,CAAC,IAAAG,qBAAY,EAACD,IAAI,CAAC,IAAI,CAAC,IAAAC,qBAAY,EAACY,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,IAAI;UAC9D,MAAMX,UAAU,GAAG,MAAMC,IAAI,CAACC,SAAS,CACrCC,MAAM,CAACC,MAAM,CAACH,IAAI,CAACI,KAAK,CAACP,IAAI,CAAC,EAAEG,IAAI,CAACI,KAAK,CAACM,IAAI,CAAC,CAAC,CAAC,CAAC,CACrD,CAAC;UACD,MAAMpB,cAAc,GAAG,MAAMrB,OAAO,CAAC8B,UAAU,EAAE,KAAK,CAAC;UACvD,OAAOR,qBAAY,CAACL,OAAO,CAACG,YAAY,EAAEC,cAAc,CAAC;QAC3D;QAEA,OAAO,IAAI;MACb,CAAC,CAAC;IACJ,CAAC,CAAC,OAAOE,CAAC,EAAE;MACVC,OAAO,CAAChB,KAAK,CAAC,oBAAoB,EAAEe,CAAC,CAAC;IACxC;EACF,CAAC;EACD8B,WAAW,EAAE,MAAON,IAAmB,IAAoB;IACzD,IAAI;MACF,IAAI,CAACC,KAAK,CAACC,OAAO,CAACF,IAAI,CAAC,EAAE,OAAOA,IAAI;MACrC,MAAMT,aAAa,GAAG,MAAMlC,OAAO,CAACmC,GAAG,CACrCQ,IAAI,CAACP,GAAG,CACN,MAAOC,IAAY,IAAsB,MAAMzC,OAAO,CAACyC,IAAI,EAAE,KAAK,CACpE,CACF,CAAC;MACD,OAAOnB,qBAAY,CAAC+B,WAAW,CAACf,aAAa,CAAC;IAChD,CAAC,CAAC,OAAOf,CAAC,EAAE;MACVC,OAAO,CAAChB,KAAK,CAAC,qBAAqB,EAAEe,CAAC,CAAC;IACzC;EACF,CAAC;EACD+B,KAAK,EAAE,MAAAA,CAAA,KAA2B;IAChC,IAAI;MACF,OAAOhC,qBAAY,CAACgC,KAAK,CAAC,CAAC;IAC7B,CAAC,CAAC,OAAO/B,CAAC,EAAE;MACVC,OAAO,CAAChB,KAAK,CAAC,eAAe,EAAEe,CAAC,CAAC;IACnC;EACF;AACF,CAAC;AAAC5B,OAAA,CAAAqB,aAAA,GAAAA,aAAA;AAEK,SAASuC,KAAKA,CACnBC,GAAW,EACXC,OAAgB,EAC0B;EAC1C,OAAO,IAAIrD,OAAO,CAAC,CAACC,OAAO,EAAEC,MAAM,KAAK;IACtCjB,aAAa,CAACkE,KAAK,CACjBC,GAAG,EACHC,OAAO,EACP,CAAClD,MAAuB,EAAEC,KAAoB,KAAK;MACjDkD,cAAc,CAACC,IAAI,CAAC,OAAO,EAAE;QAC3BH,GAAG;QACHC,OAAO;QACPG,QAAQ,EAAErD,MAAM,IAAIC;MACtB,CAAC,CAAC;MAEF,IAAI;QACF,IAAIA,KAAK,KAAK,IAAI,EAAE;UAClBD,MAAM,CAACsD,IAAI,GAAG,MAAM,IAAAC,kBAAS,EAACvD,MAAM,CAACqD,QAAQ,CAAC;UAC9CvD,OAAO,CAACE,MAAM,CAAC;QACjB,CAAC,MAAM;UACL,MAAMwD,SAAS,GAAG,IAAAD,kBAAS,EAACtD,KAAK,CAACA,KAAK,CAAC;UACxCF,MAAM,CAAC;YACLuD,IAAI,EAAEA,CAAA,KAAME,SAAS;YACrBvD,KAAK,EAAEA,KAAK,aAALA,KAAK,uBAALA,KAAK,CAAEA,KAAK;YACnBwD,MAAM,EAAExD,KAAK,aAALA,KAAK,uBAALA,KAAK,CAAEwD,MAAM;YACrBR,GAAG,EAAEhD,KAAK,aAALA,KAAK,uBAALA,KAAK,CAAEgD,GAAG;YACfS,IAAI,EAAEzD,KAAK,aAALA,KAAK,uBAALA,KAAK,CAAEyD,IAAI;YACjB,GAAGF;UACL,CAAC,CAAC;QACJ;MACF,CAAC,CAAC,OAAOxC,CAAC,EAAE;QACVC,OAAO,CAAChB,KAAK,CAAC,4BAA4B,EAAEe,CAAC,CAAC;MAChD;IACF,CACF,CAAC;EACH,CAAC,CAAC;AACJ;AAEO,SAAS2C,qBAAqBA,CAAA,EAAqB;EACxD,OAAO7E,aAAa,CAAC6E,qBAAqB,CAAC,CAAC;AAC9C;AAEO,MAAMR,cAAc,GAAG,IAAIS,oBAAY,CAAC,CAAC;AAACxE,OAAA,CAAA+D,cAAA,GAAAA,cAAA;AAAA,IAAAU,QAAA,GAElC/E,aAAa;AAAAM,OAAA,CAAAX,OAAA,GAAAoF,QAAA"}
|
package/lib/module/index.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { NativeModules, Platform } from 'react-native';
|
|
2
2
|
import AsyncStorage from '@react-native-async-storage/async-storage';
|
|
3
|
-
import _ from 'lodash';
|
|
4
3
|
import { isJsonString, jsonParse } from './helpers';
|
|
5
4
|
import { EventEmitter } from 'events';
|
|
6
5
|
|
|
@@ -72,7 +71,7 @@ export const SecureStorage = {
|
|
|
72
71
|
const encryptedData = await AsyncStorage.getItem(encryptedKey);
|
|
73
72
|
const data = await decrypt(encryptedData ?? '');
|
|
74
73
|
if (!isJsonString(data) || !isJsonString(value)) return;
|
|
75
|
-
const mergedData = await JSON.stringify(
|
|
74
|
+
const mergedData = await JSON.stringify(Object.assign(JSON.parse(data), JSON.parse(value)));
|
|
76
75
|
const encryptedValue = await encrypt(mergedData);
|
|
77
76
|
return AsyncStorage.setItem(encryptedKey, encryptedValue);
|
|
78
77
|
} catch (e) {
|
|
@@ -137,7 +136,7 @@ export const SecureStorage = {
|
|
|
137
136
|
const encryptedData = await AsyncStorage.getItem(item[0]);
|
|
138
137
|
const data = await decrypt(encryptedData ?? '');
|
|
139
138
|
if (!isJsonString(data) || !isJsonString(item[1])) return null;
|
|
140
|
-
const mergedData = await JSON.stringify(
|
|
139
|
+
const mergedData = await JSON.stringify(Object.assign(JSON.parse(data), JSON.parse(item[1])));
|
|
141
140
|
const encryptedValue = await encrypt(mergedData, false);
|
|
142
141
|
return AsyncStorage.setItem(encryptedKey, encryptedValue);
|
|
143
142
|
}
|
|
@@ -181,12 +180,10 @@ export function fetch(url, options) {
|
|
|
181
180
|
reject({
|
|
182
181
|
json: () => errorJson,
|
|
183
182
|
error: error === null || error === void 0 ? void 0 : error.error,
|
|
184
|
-
path: errorJson === null || errorJson === void 0 ? void 0 : errorJson.path,
|
|
185
|
-
message: errorJson === null || errorJson === void 0 ? void 0 : errorJson.message,
|
|
186
|
-
code: errorJson === null || errorJson === void 0 ? void 0 : errorJson.code,
|
|
187
183
|
status: error === null || error === void 0 ? void 0 : error.status,
|
|
188
184
|
url: error === null || error === void 0 ? void 0 : error.url,
|
|
189
|
-
curl: error === null || error === void 0 ? void 0 : error.curl
|
|
185
|
+
curl: error === null || error === void 0 ? void 0 : error.curl,
|
|
186
|
+
...errorJson
|
|
190
187
|
});
|
|
191
188
|
}
|
|
192
189
|
} catch (e) {
|
package/lib/module/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["NativeModules","Platform","AsyncStorage","
|
|
1
|
+
{"version":3,"names":["NativeModules","Platform","AsyncStorage","isJsonString","jsonParse","EventEmitter","LINKING_ERROR","select","ios","default","SecuritySuite","Proxy","get","Error","getPublicKey","getSharedKey","serverPublicKey","encryptBySharedKey","input","encrypt","decryptBySharedKey","decrypt","getDeviceId","Promise","resolve","reject","result","error","hardEncryption","arguments","length","undefined","secretKey","storageEncrypt","storageDecrypt","SecureStorage","setItem","key","value","encryptedKey","encryptedValue","e","console","getItem","encryptedData","mergeItem","data","mergedData","JSON","stringify","Object","assign","parse","removeItem","getAllKeys","encryptedKeys","all","map","item","decryptedKey","multiSet","keyValuePairs","encryptedKeyValuePairs","multiGet","keys","Array","isArray","encryptedItems","decryptedalue","multiMerge","multiRemove","clear","fetch","url","options","SSEventEmitter","emit","response","json","errorJson","status","curl","deviceHasSecurityRisk"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "react-native-security-suite",
|
|
3
|
-
"version": "0.5.
|
|
3
|
+
"version": "0.5.19",
|
|
4
4
|
"description": "Security solution for React Native",
|
|
5
5
|
"main": "lib/commonjs/index",
|
|
6
6
|
"module": "lib/module/index",
|
|
@@ -59,7 +59,6 @@
|
|
|
59
59
|
"@react-native-community/eslint-config": "^3.0.2",
|
|
60
60
|
"@release-it/conventional-changelog": "^5.0.0",
|
|
61
61
|
"@types/jest": "^28.1.2",
|
|
62
|
-
"@types/lodash": "^4.14.196",
|
|
63
62
|
"@types/react": "~17.0.21",
|
|
64
63
|
"@types/react-native": "0.70.0",
|
|
65
64
|
"commitlint": "^17.0.2",
|
|
@@ -82,7 +81,6 @@
|
|
|
82
81
|
},
|
|
83
82
|
"peerDependencies": {
|
|
84
83
|
"@react-native-async-storage/async-storage": "*",
|
|
85
|
-
"lodash": "*",
|
|
86
84
|
"react": "*",
|
|
87
85
|
"react-native": "*"
|
|
88
86
|
},
|
package/src/index.tsx
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { NativeModules, Platform } from 'react-native';
|
|
2
2
|
import AsyncStorage from '@react-native-async-storage/async-storage';
|
|
3
|
-
import _ from 'lodash';
|
|
4
3
|
import { isJsonString, jsonParse } from './helpers';
|
|
5
4
|
import { EventEmitter } from 'events';
|
|
6
5
|
|
|
@@ -158,7 +157,7 @@ export const SecureStorage = {
|
|
|
158
157
|
const data = await decrypt(encryptedData ?? '');
|
|
159
158
|
if (!isJsonString(data) || !isJsonString(value)) return;
|
|
160
159
|
const mergedData = await JSON.stringify(
|
|
161
|
-
|
|
160
|
+
Object.assign(JSON.parse(data), JSON.parse(value))
|
|
162
161
|
);
|
|
163
162
|
const encryptedValue = await encrypt(mergedData);
|
|
164
163
|
return AsyncStorage.setItem(encryptedKey, encryptedValue);
|
|
@@ -240,7 +239,7 @@ export const SecureStorage = {
|
|
|
240
239
|
const data = await decrypt(encryptedData ?? '');
|
|
241
240
|
if (!isJsonString(data) || !isJsonString(item[1])) return null;
|
|
242
241
|
const mergedData = await JSON.stringify(
|
|
243
|
-
|
|
242
|
+
Object.assign(JSON.parse(data), JSON.parse(item[1]))
|
|
244
243
|
);
|
|
245
244
|
const encryptedValue = await encrypt(mergedData, false);
|
|
246
245
|
return AsyncStorage.setItem(encryptedKey, encryptedValue);
|
|
@@ -298,12 +297,10 @@ export function fetch(
|
|
|
298
297
|
reject({
|
|
299
298
|
json: () => errorJson,
|
|
300
299
|
error: error?.error,
|
|
301
|
-
path: errorJson?.path,
|
|
302
|
-
message: errorJson?.message,
|
|
303
|
-
code: errorJson?.code,
|
|
304
300
|
status: error?.status,
|
|
305
301
|
url: error?.url,
|
|
306
302
|
curl: error?.curl,
|
|
303
|
+
...errorJson,
|
|
307
304
|
});
|
|
308
305
|
}
|
|
309
306
|
} catch (e) {
|