Skip to content

Commit 65cfaa0

Browse files
authored
refactor(core): pre-release tidy ups (#995)
* refactor(core): pre-release insepection of storage, main agent files * refactor(core): inspection of remaining services, and disallow HTTP on iOS * fix: pendingdeletion tag for identifiers * fix(core): only create connection record for non schema OOBIs
1 parent 610f8a1 commit 65cfaa0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+598
-284
lines changed

ios/App/App/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<key>NSAppTransportSecurity</key>
2828
<dict>
2929
<key>NSAllowsArbitraryLoads</key>
30-
<true/>
30+
<false/>
3131
</dict>
3232
<key>NSCameraUsageDescription</key>
3333
<string>The app enables the scanning of various barcodes.</string>

src/core/__fixtures__/agent/ipexCommunicationFixtures.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ const admitForIssuanceExnMessage = {
123123
},
124124
pathed: {},
125125
};
126+
126127
// @TODO - foconnor: Agree must have valid p, and no embeds - but causing tests to fail right now.
127128
const agreeForPresentingExnMessage = {
128129
exn: {
@@ -416,7 +417,7 @@ const multisigParticipantsProps = {
416417

417418
const ipexGrantSerder = {
418419
kind: "JSON",
419-
raw: '{"v":"KERI10JSON0004b1_","t":"exn","d":"EIGHcMNSHqnRlQWy-tIg04k24wIy5_mqBfOXDhhAsHvx","i":"EHis8uP3C9jJ70OjwRfY9tLxvqefH7qVIazlpaVJI5zm","p":"","dt":"2024-08-15T08:44:16.867000+00:00","r":"/ipex/grant","q":{},"a":{"m":"","i":"EEozWLiY6DrCMCLfPqdBaIvUX1aUyjLKkT6-RxFrIMd9"},"e":{"acdc":{"v":"ACDC10JSON000197_","d":"EBJHAbtBAi8yYspNjLDaw0s5A7PZyjoj1lrhSE-Dn28r","i":"EEozWLiY6DrCMCLfPqdBaIvUX1aUyjLKkT6-RxFrIMd9","ri":"EPUFfq94pBLYKDRWyfOe7m-RKsET_zriJbfU3iUtM450","s":"EBfdlu8R27Fbx-ehrqwImnK-8Cm79sqbAQ4MmvEAYqao","a":{"d":"EIK0Xph_pH3RYIgLniWMuMVlgvoLK8eIICN7cIUJv2j8","i":"EHis8uP3C9jJ70OjwRfY9tLxvqefH7qVIazlpaVJI5zm","LEI":"5493001KJTIIGC8Y1R17","dt":"2024-08-15T08:44:13.141000+00:00"}},"iss":{"v":"KERI10JSON0000ed_","t":"iss","d":"EEuxEi0sa45nAcVQc_MwGh8EGK0Lh1pgiHY18hbh1yNF","i":"EBJHAbtBAi8yYspNjLDaw0s5A7PZyjoj1lrhSE-Dn28r","s":"0","ri":"EPUFfq94pBLYKDRWyfOe7m-RKsET_zriJbfU3iUtM450","dt":"2024-08-15T08:44:13.141000+00:00"},"anc":{"v":"KERI10JSON0000cd_","t":"ixn","d":"EK9x8RSjMJ_oxuBHIWftq5lYQcTW7WYZ3HwCT34s62jQ","i":"EEozWLiY6DrCMCLfPqdBaIvUX1aUyjLKkT6-RxFrIMd9","s":"1","p":"EBJHAbtBAi8yYspNjLDaw0s5A7PZyjoj1lrhSE-Dn28r","a":[{}]},"d":"EO_bCCneshP2lNWQ8gKSqyU9frP9V8Zo6tLczIHeXhXg"}}',
420+
raw: "{\"v\":\"KERI10JSON0004b1_\",\"t\":\"exn\",\"d\":\"EIGHcMNSHqnRlQWy-tIg04k24wIy5_mqBfOXDhhAsHvx\",\"i\":\"EHis8uP3C9jJ70OjwRfY9tLxvqefH7qVIazlpaVJI5zm\",\"p\":\"\",\"dt\":\"2024-08-15T08:44:16.867000+00:00\",\"r\":\"/ipex/grant\",\"q\":{},\"a\":{\"m\":\"\",\"i\":\"EEozWLiY6DrCMCLfPqdBaIvUX1aUyjLKkT6-RxFrIMd9\"},\"e\":{\"acdc\":{\"v\":\"ACDC10JSON000197_\",\"d\":\"EBJHAbtBAi8yYspNjLDaw0s5A7PZyjoj1lrhSE-Dn28r\",\"i\":\"EEozWLiY6DrCMCLfPqdBaIvUX1aUyjLKkT6-RxFrIMd9\",\"ri\":\"EPUFfq94pBLYKDRWyfOe7m-RKsET_zriJbfU3iUtM450\",\"s\":\"EBfdlu8R27Fbx-ehrqwImnK-8Cm79sqbAQ4MmvEAYqao\",\"a\":{\"d\":\"EIK0Xph_pH3RYIgLniWMuMVlgvoLK8eIICN7cIUJv2j8\",\"i\":\"EHis8uP3C9jJ70OjwRfY9tLxvqefH7qVIazlpaVJI5zm\",\"LEI\":\"5493001KJTIIGC8Y1R17\",\"dt\":\"2024-08-15T08:44:13.141000+00:00\"}},\"iss\":{\"v\":\"KERI10JSON0000ed_\",\"t\":\"iss\",\"d\":\"EEuxEi0sa45nAcVQc_MwGh8EGK0Lh1pgiHY18hbh1yNF\",\"i\":\"EBJHAbtBAi8yYspNjLDaw0s5A7PZyjoj1lrhSE-Dn28r\",\"s\":\"0\",\"ri\":\"EPUFfq94pBLYKDRWyfOe7m-RKsET_zriJbfU3iUtM450\",\"dt\":\"2024-08-15T08:44:13.141000+00:00\"},\"anc\":{\"v\":\"KERI10JSON0000cd_\",\"t\":\"ixn\",\"d\":\"EK9x8RSjMJ_oxuBHIWftq5lYQcTW7WYZ3HwCT34s62jQ\",\"i\":\"EEozWLiY6DrCMCLfPqdBaIvUX1aUyjLKkT6-RxFrIMd9\",\"s\":\"1\",\"p\":\"EBJHAbtBAi8yYspNjLDaw0s5A7PZyjoj1lrhSE-Dn28r\",\"a\":[{}]},\"d\":\"EO_bCCneshP2lNWQ8gKSqyU9frP9V8Zo6tLczIHeXhXg\"}}",
420421
ked: {
421422
v: "KERI10JSON0004b1_",
422423
t: "exn",
@@ -446,7 +447,7 @@ const ipexGrantEnd =
446447

447448
const ipexSubmitGrantSerder = {
448449
kind: "JSON",
449-
raw: '{"v":"KERI10JSON00025f_","t":"exn","d":"EFnDzHLeULKSm_jbQSIN427yWWFr82OBkkxg3iUf2FUW","i":"EGUORQAs0r1mup1OmX1H23PITDV7td-o2XGdMVL6lmmk","p":"","dt":"2024-08-02T03:53:30.133000+00:00","r":"/multisig/exn","q":{},"a":{"gid":"EPIKswKD9AiVxIqU4QLn14qpNuiAfgVGzoK-HVU0znjC"},"e":{"exn":{"v":"KERI10JSON000111_","t":"exn","d":"EMTArfbjevIfB-fbxzsepKO35RWHN2gQxTTU5Lov2Dld","i":"EPIKswKD9AiVxIqU4QLn14qpNuiAfgVGzoK-HVU0znjC","p":"EH-_9IgodejkwXi2Hw--A53rVYcO6bDYnBrbpCId8LOu","dt":"2024-08-02T03:53:29.400000+00:00","r":"/ipex/admit","q":{},"a":{"m":""},"e":{}},"d":"ECxCLDUf8A1y62wf7YkWAcj5RN-KVzNaxRefzgE7oIjq"}}',
450+
raw: "{\"v\":\"KERI10JSON00025f_\",\"t\":\"exn\",\"d\":\"EFnDzHLeULKSm_jbQSIN427yWWFr82OBkkxg3iUf2FUW\",\"i\":\"EGUORQAs0r1mup1OmX1H23PITDV7td-o2XGdMVL6lmmk\",\"p\":\"\",\"dt\":\"2024-08-02T03:53:30.133000+00:00\",\"r\":\"/multisig/exn\",\"q\":{},\"a\":{\"gid\":\"EPIKswKD9AiVxIqU4QLn14qpNuiAfgVGzoK-HVU0znjC\"},\"e\":{\"exn\":{\"v\":\"KERI10JSON000111_\",\"t\":\"exn\",\"d\":\"EMTArfbjevIfB-fbxzsepKO35RWHN2gQxTTU5Lov2Dld\",\"i\":\"EPIKswKD9AiVxIqU4QLn14qpNuiAfgVGzoK-HVU0znjC\",\"p\":\"EH-_9IgodejkwXi2Hw--A53rVYcO6bDYnBrbpCId8LOu\",\"dt\":\"2024-08-02T03:53:29.400000+00:00\",\"r\":\"/ipex/admit\",\"q\":{},\"a\":{\"m\":\"\"},\"e\":{}},\"d\":\"ECxCLDUf8A1y62wf7YkWAcj5RN-KVzNaxRefzgE7oIjq\"}}",
450451
ked: {
451452
v: "KERI10JSON00066c_",
452453
t: "exn",
@@ -524,7 +525,7 @@ const ipexSubmitGrantEnd =
524525

525526
const ipexOfferSerder = {
526527
kind: "JSON",
527-
raw: '{"v":"KERI10JSON000340_","t":"exn","d":"EGfyfKc4tnZtigxgaw_55NEa13-5zpFXkheLv2jZiwI1","i":"EBopw9UjL8plPiTfqJbb819-l2Jsr-0de7YXGxzKGRq4","rp":"EOb2ITawuAc6mAeSn4SMuHZtB9mIHfZzac_1NO28eytd","p":"ENdg2aG1gOXitYwI1xKZNch0VFAmZuFpvL0Xftliv0W9","dt":"2024-10-02T15:23:50.210000+00:00","r":"/ipex/offer","q":{},"a":{"i":"EOb2ITawuAc6mAeSn4SMuHZtB9mIHfZzac_1NO28eytd","m":""},"e":{"acdc":{"v":"ACDC10JSON00018e_","d":"ELKa5OdxusflKLZBqmHI09vYgyiySh4ZM1CQcoS6Nabh","i":"EOb2ITawuAc6mAeSn4SMuHZtB9mIHfZzac_1NO28eytd","ri":"EN1AomPsN0gmQS47DCaI3hz6rJovMz2aiLSfXDit_UrU","s":"EJxnJdxkHbRw2wVFNe4IUOPLt8fEtg9Sr3WyTjlgKoIb","a":{"d":"ENnh02JAwpkWVo8ExuuwgBGQB9fG8Zapg99H4dT6a_93","i":"EBopw9UjL8plPiTfqJbb819-l2Jsr-0de7YXGxzKGRq4","attendeeName":"99","dt":"2024-10-02T15:21:50.607000+00:00"}},"d":"ECc3mOk1p4QceI4bGBoVhv7cVX34n-UOlK73VSm7m_fS"}}',
528+
raw: "{\"v\":\"KERI10JSON000340_\",\"t\":\"exn\",\"d\":\"EGfyfKc4tnZtigxgaw_55NEa13-5zpFXkheLv2jZiwI1\",\"i\":\"EBopw9UjL8plPiTfqJbb819-l2Jsr-0de7YXGxzKGRq4\",\"rp\":\"EOb2ITawuAc6mAeSn4SMuHZtB9mIHfZzac_1NO28eytd\",\"p\":\"ENdg2aG1gOXitYwI1xKZNch0VFAmZuFpvL0Xftliv0W9\",\"dt\":\"2024-10-02T15:23:50.210000+00:00\",\"r\":\"/ipex/offer\",\"q\":{},\"a\":{\"i\":\"EOb2ITawuAc6mAeSn4SMuHZtB9mIHfZzac_1NO28eytd\",\"m\":\"\"},\"e\":{\"acdc\":{\"v\":\"ACDC10JSON00018e_\",\"d\":\"ELKa5OdxusflKLZBqmHI09vYgyiySh4ZM1CQcoS6Nabh\",\"i\":\"EOb2ITawuAc6mAeSn4SMuHZtB9mIHfZzac_1NO28eytd\",\"ri\":\"EN1AomPsN0gmQS47DCaI3hz6rJovMz2aiLSfXDit_UrU\",\"s\":\"EJxnJdxkHbRw2wVFNe4IUOPLt8fEtg9Sr3WyTjlgKoIb\",\"a\":{\"d\":\"ENnh02JAwpkWVo8ExuuwgBGQB9fG8Zapg99H4dT6a_93\",\"i\":\"EBopw9UjL8plPiTfqJbb819-l2Jsr-0de7YXGxzKGRq4\",\"attendeeName\":\"99\",\"dt\":\"2024-10-02T15:21:50.607000+00:00\"}},\"d\":\"ECc3mOk1p4QceI4bGBoVhv7cVX34n-UOlK73VSm7m_fS\"}}",
528529
ked: {
529530
v: "KERI10JSON000340_",
530531
t: "exn",
@@ -565,7 +566,7 @@ const ipexOfferSig = [
565566

566567
const multisigOfferSerder = {
567568
kind: "JSON",
568-
raw: '{"v":"KERI10JSON0004f5_","t":"exn","d":"EARi8kQ1PkSSRyFEIPOFPdnsnv7P2QZYEQqnmr1Eo2N8","i":"EAsQ-kwJwO8ug-S2dk1WGwpPlF4hT3q5TJi_OLZSFdEy","rp":"EOb2ITawuAc6mAeSn4SMuHZtB9mIHfZzac_1NO28eytd","p":"","dt":"2024-10-02T15:26:01.003000+00:00","r":"/multisig/exn","q":{},"a":{"i":"EOb2ITawuAc6mAeSn4SMuHZtB9mIHfZzac_1NO28eytd","gid":"EBopw9UjL8plPiTfqJbb819-l2Jsr-0de7YXGxzKGRq4"},"e":{"exn":{"v":"KERI10JSON000340_","t":"exn","d":"EGfyfKc4tnZtigxgaw_55NEa13-5zpFXkheLv2jZiwI1","i":"EBopw9UjL8plPiTfqJbb819-l2Jsr-0de7YXGxzKGRq4","rp":"EOb2ITawuAc6mAeSn4SMuHZtB9mIHfZzac_1NO28eytd","p":"ENdg2aG1gOXitYwI1xKZNch0VFAmZuFpvL0Xftliv0W9","dt":"2024-10-02T15:23:50.210000+00:00","r":"/ipex/offer","q":{},"a":{"i":"EOb2ITawuAc6mAeSn4SMuHZtB9mIHfZzac_1NO28eytd","m":""},"e":{"acdc":{"v":"ACDC10JSON00018e_","d":"ELKa5OdxusflKLZBqmHI09vYgyiySh4ZM1CQcoS6Nabh","i":"EOb2ITawuAc6mAeSn4SMuHZtB9mIHfZzac_1NO28eytd","ri":"EN1AomPsN0gmQS47DCaI3hz6rJovMz2aiLSfXDit_UrU","s":"EJxnJdxkHbRw2wVFNe4IUOPLt8fEtg9Sr3WyTjlgKoIb","a":{"d":"ENnh02JAwpkWVo8ExuuwgBGQB9fG8Zapg99H4dT6a_93","i":"EBopw9UjL8plPiTfqJbb819-l2Jsr-0de7YXGxzKGRq4","attendeeName":"99","dt":"2024-10-02T15:21:50.607000+00:00"}},"d":"ECc3mOk1p4QceI4bGBoVhv7cVX34n-UOlK73VSm7m_fS"}},"d":"EKNY8J1PflxKy72qqE05SKmej4SpEecFAGFA3cLSPTKj"}}',
569+
raw: "{\"v\":\"KERI10JSON0004f5_\",\"t\":\"exn\",\"d\":\"EARi8kQ1PkSSRyFEIPOFPdnsnv7P2QZYEQqnmr1Eo2N8\",\"i\":\"EAsQ-kwJwO8ug-S2dk1WGwpPlF4hT3q5TJi_OLZSFdEy\",\"rp\":\"EOb2ITawuAc6mAeSn4SMuHZtB9mIHfZzac_1NO28eytd\",\"p\":\"\",\"dt\":\"2024-10-02T15:26:01.003000+00:00\",\"r\":\"/multisig/exn\",\"q\":{},\"a\":{\"i\":\"EOb2ITawuAc6mAeSn4SMuHZtB9mIHfZzac_1NO28eytd\",\"gid\":\"EBopw9UjL8plPiTfqJbb819-l2Jsr-0de7YXGxzKGRq4\"},\"e\":{\"exn\":{\"v\":\"KERI10JSON000340_\",\"t\":\"exn\",\"d\":\"EGfyfKc4tnZtigxgaw_55NEa13-5zpFXkheLv2jZiwI1\",\"i\":\"EBopw9UjL8plPiTfqJbb819-l2Jsr-0de7YXGxzKGRq4\",\"rp\":\"EOb2ITawuAc6mAeSn4SMuHZtB9mIHfZzac_1NO28eytd\",\"p\":\"ENdg2aG1gOXitYwI1xKZNch0VFAmZuFpvL0Xftliv0W9\",\"dt\":\"2024-10-02T15:23:50.210000+00:00\",\"r\":\"/ipex/offer\",\"q\":{},\"a\":{\"i\":\"EOb2ITawuAc6mAeSn4SMuHZtB9mIHfZzac_1NO28eytd\",\"m\":\"\"},\"e\":{\"acdc\":{\"v\":\"ACDC10JSON00018e_\",\"d\":\"ELKa5OdxusflKLZBqmHI09vYgyiySh4ZM1CQcoS6Nabh\",\"i\":\"EOb2ITawuAc6mAeSn4SMuHZtB9mIHfZzac_1NO28eytd\",\"ri\":\"EN1AomPsN0gmQS47DCaI3hz6rJovMz2aiLSfXDit_UrU\",\"s\":\"EJxnJdxkHbRw2wVFNe4IUOPLt8fEtg9Sr3WyTjlgKoIb\",\"a\":{\"d\":\"ENnh02JAwpkWVo8ExuuwgBGQB9fG8Zapg99H4dT6a_93\",\"i\":\"EBopw9UjL8plPiTfqJbb819-l2Jsr-0de7YXGxzKGRq4\",\"attendeeName\":\"99\",\"dt\":\"2024-10-02T15:21:50.607000+00:00\"}},\"d\":\"ECc3mOk1p4QceI4bGBoVhv7cVX34n-UOlK73VSm7m_fS\"}},\"d\":\"EKNY8J1PflxKy72qqE05SKmej4SpEecFAGFA3cLSPTKj\"}}",
569570
ked: {
570571
v: "KERI10JSON0004f5_",
571572
t: "exn",
@@ -627,7 +628,7 @@ const multisigOfferEnd =
627628

628629
const ipexAdmitSerder = {
629630
kind: "JSON",
630-
raw: '{"v":"KERI10JSON0004b1_","t":"exn","d":"EIGHcMNSHqnRlQWy-tIg04k24wIy5_mqBfOXDhhAsHvx","i":"EHis8uP3C9jJ70OjwRfY9tLxvqefH7qVIazlpaVJI5zm","p":"","dt":"2024-08-15T08:44:16.867000+00:00","r":"/ipex/grant","q":{},"a":{"m":"","i":"EEozWLiY6DrCMCLfPqdBaIvUX1aUyjLKkT6-RxFrIMd9"},"e":{"acdc":{"v":"ACDC10JSON000197_","d":"EBJHAbtBAi8yYspNjLDaw0s5A7PZyjoj1lrhSE-Dn28r","i":"EEozWLiY6DrCMCLfPqdBaIvUX1aUyjLKkT6-RxFrIMd9","ri":"EPUFfq94pBLYKDRWyfOe7m-RKsET_zriJbfU3iUtM450","s":"EBfdlu8R27Fbx-ehrqwImnK-8Cm79sqbAQ4MmvEAYqao","a":{"d":"EIK0Xph_pH3RYIgLniWMuMVlgvoLK8eIICN7cIUJv2j8","i":"EHis8uP3C9jJ70OjwRfY9tLxvqefH7qVIazlpaVJI5zm","LEI":"5493001KJTIIGC8Y1R17","dt":"2024-08-15T08:44:13.141000+00:00"}},"iss":{"v":"KERI10JSON0000ed_","t":"iss","d":"EEuxEi0sa45nAcVQc_MwGh8EGK0Lh1pgiHY18hbh1yNF","i":"EBJHAbtBAi8yYspNjLDaw0s5A7PZyjoj1lrhSE-Dn28r","s":"0","ri":"EPUFfq94pBLYKDRWyfOe7m-RKsET_zriJbfU3iUtM450","dt":"2024-08-15T08:44:13.141000+00:00"},"anc":{"v":"KERI10JSON0000cd_","t":"ixn","d":"EK9x8RSjMJ_oxuBHIWftq5lYQcTW7WYZ3HwCT34s62jQ","i":"EEozWLiY6DrCMCLfPqdBaIvUX1aUyjLKkT6-RxFrIMd9","s":"1","p":"EBJHAbtBAi8yYspNjLDaw0s5A7PZyjoj1lrhSE-Dn28r","a":[{}]},"d":"EO_bCCneshP2lNWQ8gKSqyU9frP9V8Zo6tLczIHeXhXg"}}',
631+
raw: "{\"v\":\"KERI10JSON0004b1_\",\"t\":\"exn\",\"d\":\"EIGHcMNSHqnRlQWy-tIg04k24wIy5_mqBfOXDhhAsHvx\",\"i\":\"EHis8uP3C9jJ70OjwRfY9tLxvqefH7qVIazlpaVJI5zm\",\"p\":\"\",\"dt\":\"2024-08-15T08:44:16.867000+00:00\",\"r\":\"/ipex/grant\",\"q\":{},\"a\":{\"m\":\"\",\"i\":\"EEozWLiY6DrCMCLfPqdBaIvUX1aUyjLKkT6-RxFrIMd9\"},\"e\":{\"acdc\":{\"v\":\"ACDC10JSON000197_\",\"d\":\"EBJHAbtBAi8yYspNjLDaw0s5A7PZyjoj1lrhSE-Dn28r\",\"i\":\"EEozWLiY6DrCMCLfPqdBaIvUX1aUyjLKkT6-RxFrIMd9\",\"ri\":\"EPUFfq94pBLYKDRWyfOe7m-RKsET_zriJbfU3iUtM450\",\"s\":\"EBfdlu8R27Fbx-ehrqwImnK-8Cm79sqbAQ4MmvEAYqao\",\"a\":{\"d\":\"EIK0Xph_pH3RYIgLniWMuMVlgvoLK8eIICN7cIUJv2j8\",\"i\":\"EHis8uP3C9jJ70OjwRfY9tLxvqefH7qVIazlpaVJI5zm\",\"LEI\":\"5493001KJTIIGC8Y1R17\",\"dt\":\"2024-08-15T08:44:13.141000+00:00\"}},\"iss\":{\"v\":\"KERI10JSON0000ed_\",\"t\":\"iss\",\"d\":\"EEuxEi0sa45nAcVQc_MwGh8EGK0Lh1pgiHY18hbh1yNF\",\"i\":\"EBJHAbtBAi8yYspNjLDaw0s5A7PZyjoj1lrhSE-Dn28r\",\"s\":\"0\",\"ri\":\"EPUFfq94pBLYKDRWyfOe7m-RKsET_zriJbfU3iUtM450\",\"dt\":\"2024-08-15T08:44:13.141000+00:00\"},\"anc\":{\"v\":\"KERI10JSON0000cd_\",\"t\":\"ixn\",\"d\":\"EK9x8RSjMJ_oxuBHIWftq5lYQcTW7WYZ3HwCT34s62jQ\",\"i\":\"EEozWLiY6DrCMCLfPqdBaIvUX1aUyjLKkT6-RxFrIMd9\",\"s\":\"1\",\"p\":\"EBJHAbtBAi8yYspNjLDaw0s5A7PZyjoj1lrhSE-Dn28r\",\"a\":[{}]},\"d\":\"EO_bCCneshP2lNWQ8gKSqyU9frP9V8Zo6tLczIHeXhXg\"}}",
631632
ked: {
632633
v: "KERI10JSON000178_",
633634
t: "exn",
@@ -656,7 +657,7 @@ const ipexAdmitEnd =
656657

657658
const ipexSubmitAdmitSerder = {
658659
kind: "JSON",
659-
raw: '{"v":"KERI10JSON00032d_","t":"exn","d":"EL3A2jk9gvmVe4ROISB2iWmM8yPSNwQlmar6-SFVWSPW","i":"EJ6cZ3ErT6857EAbYquE82waXZv2vftHTbBgtvNE3-J2","rp":"EDxLVG6ffRnsjqdvffpM4Id2W4q9APTu0Ej35sdjtKYN","p":"","dt":"2024-10-09T12:20:55.832000+00:00","r":"/multisig/exn","q":{},"a":{"i":"EDxLVG6ffRnsjqdvffpM4Id2W4q9APTu0Ej35sdjtKYN","gid":"EB6wkTnyxwgEgwgPv23OM-bWUSB_jdnlMIab9Q0JUNac"},"e":{"exn":{"v":"KERI10JSON000178_","t":"exn","d":"EJjQmGwlatWTgbaawivz0Qs-8O3XvburFSRLmi6fj25d","i":"EB6wkTnyxwgEgwgPv23OM-bWUSB_jdnlMIab9Q0JUNac","rp":"EBvkzD-Kn4bBQVjrpkjyh3PvUKF-9yuM3RYTvLK5k_5z","p":"EGic7AcZLZAwA_cLbXmzFZleQoitx_ghgQtv8E9QMShk","dt":"2024-10-09T12:20:43.875000+00:00","r":"/ipex/admit","q":{},"a":{"i":"EBvkzD-Kn4bBQVjrpkjyh3PvUKF-9yuM3RYTvLK5k_5z","m":""},"e":{}},"d":"EEtr51v8dSBepGheENmzRgySXbb5kkxibt7s-NyQyn_j"}}',
660+
raw: "{\"v\":\"KERI10JSON00032d_\",\"t\":\"exn\",\"d\":\"EL3A2jk9gvmVe4ROISB2iWmM8yPSNwQlmar6-SFVWSPW\",\"i\":\"EJ6cZ3ErT6857EAbYquE82waXZv2vftHTbBgtvNE3-J2\",\"rp\":\"EDxLVG6ffRnsjqdvffpM4Id2W4q9APTu0Ej35sdjtKYN\",\"p\":\"\",\"dt\":\"2024-10-09T12:20:55.832000+00:00\",\"r\":\"/multisig/exn\",\"q\":{},\"a\":{\"i\":\"EDxLVG6ffRnsjqdvffpM4Id2W4q9APTu0Ej35sdjtKYN\",\"gid\":\"EB6wkTnyxwgEgwgPv23OM-bWUSB_jdnlMIab9Q0JUNac\"},\"e\":{\"exn\":{\"v\":\"KERI10JSON000178_\",\"t\":\"exn\",\"d\":\"EJjQmGwlatWTgbaawivz0Qs-8O3XvburFSRLmi6fj25d\",\"i\":\"EB6wkTnyxwgEgwgPv23OM-bWUSB_jdnlMIab9Q0JUNac\",\"rp\":\"EBvkzD-Kn4bBQVjrpkjyh3PvUKF-9yuM3RYTvLK5k_5z\",\"p\":\"EGic7AcZLZAwA_cLbXmzFZleQoitx_ghgQtv8E9QMShk\",\"dt\":\"2024-10-09T12:20:43.875000+00:00\",\"r\":\"/ipex/admit\",\"q\":{},\"a\":{\"i\":\"EBvkzD-Kn4bBQVjrpkjyh3PvUKF-9yuM3RYTvLK5k_5z\",\"m\":\"\"},\"e\":{}},\"d\":\"EEtr51v8dSBepGheENmzRgySXbb5kkxibt7s-NyQyn_j\"}}",
660661
ked: {
661662
v: "KERI10JSON00032d_",
662663
t: "exn",

src/core/agent/agent.ts

Lines changed: 19 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ import {
1111
ConnectionService,
1212
CredentialService,
1313
IdentifierService,
14+
KeriaNotificationService,
15+
MultiSigService,
16+
IpexCommunicationService,
1417
} from "./services";
15-
import { KeriaNotificationService } from "./services/keriaNotificationService";
1618
import {
1719
AgentServicesProps,
1820
BranAndMnemonic,
@@ -35,8 +37,6 @@ import {
3537
NotificationStorage,
3638
} from "./records";
3739
import { KeyStoreKeys, SecureStorage } from "../storage";
38-
import { MultiSigService } from "./services/multiSigService";
39-
import { IpexCommunicationService } from "./services/ipexCommunicationService";
4040
import { SqliteSession } from "../storage/sqliteStorage/sqliteSession";
4141
import { IonicSession } from "../storage/ionicStorage/ionicSession";
4242
import { IonicStorage } from "../storage/ionicStorage";
@@ -68,10 +68,8 @@ class Agent {
6868
static readonly DEFAULT_RECONNECT_INTERVAL = 1000;
6969

7070
private static instance: Agent;
71-
private agentServicesProps: AgentServicesProps = {
72-
eventEmitter: new CoreEventEmitter(),
73-
signifyClient: undefined as any,
74-
};
71+
private agentServicesProps!: AgentServicesProps;
72+
private signifyClient!: SignifyClient;
7573

7674
private storageSession!: SqliteSession | IonicSession;
7775

@@ -83,9 +81,6 @@ class Agent {
8381
private peerConnectionStorage!: PeerConnectionStorage;
8482
private operationPendingStorage!: OperationPendingStorage;
8583

86-
private signifyClient!: SignifyClient;
87-
88-
// @TODO - foconnor: Registering these should be more generic, but OK for now
8984
private identifierService!: IdentifierService;
9085
private multiSigService!: MultiSigService;
9186
private ipexCommunicationService!: IpexCommunicationService;
@@ -411,22 +406,18 @@ class Agent {
411406
}
412407

413408
private async saveAgentUrls(agentUrls: AgentUrls): Promise<void> {
414-
if (agentUrls.url) {
415-
await this.basicStorageService.save({
416-
id: MiscRecordId.KERIA_CONNECT_URL,
417-
content: {
418-
url: agentUrls.url,
419-
},
420-
});
421-
}
422-
if (agentUrls.bootUrl) {
423-
await this.basicStorageService.save({
424-
id: MiscRecordId.KERIA_BOOT_URL,
425-
content: {
426-
url: agentUrls.bootUrl,
427-
},
428-
});
429-
}
409+
await this.basicStorageService.save({
410+
id: MiscRecordId.KERIA_CONNECT_URL,
411+
content: {
412+
url: agentUrls.url,
413+
},
414+
});
415+
await this.basicStorageService.save({
416+
id: MiscRecordId.KERIA_BOOT_URL,
417+
content: {
418+
url: agentUrls.bootUrl,
419+
},
420+
});
430421
}
431422

432423
async setupLocalDependencies(): Promise<void> {
@@ -469,13 +460,7 @@ class Agent {
469460
) {
470461
try {
471462
if (Agent.isOnline) {
472-
Agent.isOnline = false;
473-
this.agentServicesProps.eventEmitter.emit<KeriaStatusChangedEvent>({
474-
type: EventTypes.KeriaStatusChanged,
475-
payload: {
476-
isOnline: false,
477-
},
478-
});
463+
this.markAgentStatus(false);
479464
}
480465
await this.signifyClient.connect();
481466

@@ -497,7 +482,7 @@ class Agent {
497482
if (!bran) {
498483
throw new Error(Agent.MISSING_BRAN_SECURE_STORAGE);
499484
}
500-
return bran as string;
485+
return bran;
501486
}
502487

503488
private getStorageService<T extends BaseRecord>(

src/core/agent/agent.types.ts

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ enum ConnectionStatus {
1212

1313
interface ConnectionHistoryItem {
1414
type: ConnectionHistoryType;
15-
credentialType?: string;
1615
timestamp: string;
16+
credentialType?: string;
1717
}
1818

1919
enum MiscRecordId {
@@ -48,8 +48,8 @@ interface ConnectionShortDetails {
4848
id: string;
4949
label: string;
5050
createdAtUTC: string;
51-
logo?: string;
5251
status: ConnectionStatus;
52+
logo?: string;
5353
oobi?: string;
5454
groupId?: string;
5555
}
@@ -67,7 +67,12 @@ interface JSONObject {
6767
// eslint-disable-next-line @typescript-eslint/no-empty-interface
6868
interface JSONArray extends Array<JSONValue> {}
6969

70-
type JSONValue = string | number | boolean | JSONObject | JSONArray;
70+
type JSONValue =
71+
| string
72+
| number
73+
| boolean
74+
| { [x: string]: JSONValue }
75+
| JSONArray;
7176

7277
type ExnMessage = {
7378
exn: {
@@ -121,23 +126,23 @@ interface KeriaNotification {
121126
id: string;
122127
createdAt: string;
123128
a: Record<string, unknown>;
124-
multisigId?: string;
125129
connectionId: string;
126130
read: boolean;
127131
groupReplied: boolean;
132+
multisigId?: string;
128133
initiatorAid?: string;
129134
groupInitiator?: boolean;
130135
}
131136

132-
enum KeriConnectionType {
137+
enum OobiType {
133138
NORMAL = "NORMAL",
134139
MULTI_SIG_INITIATOR = "MULTI_SIG_INITIATOR",
135140
}
136141

137142
type OobiScan =
138-
| { type: KeriConnectionType.NORMAL; connection: ConnectionShortDetails }
143+
| { type: OobiType.NORMAL; connection: ConnectionShortDetails }
139144
| {
140-
type: KeriConnectionType.MULTI_SIG_INITIATOR;
145+
type: OobiType.MULTI_SIG_INITIATOR;
141146
groupId: string;
142147
connection: ConnectionShortDetails;
143148
};
@@ -217,7 +222,7 @@ export {
217222
MiscRecordId,
218223
NotificationRoute,
219224
ExchangeRoute,
220-
KeriConnectionType,
225+
OobiType,
221226
CreationStatus,
222227
};
223228

@@ -238,4 +243,6 @@ export type {
238243
NotificationRpy,
239244
AuthorizationRequestExn,
240245
OperationCallback,
246+
JSONValue,
247+
JSONObject,
241248
};

src/core/agent/records/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
When creating a new record type, it's important to set default values within the `if (props)` block of the constructor, and not at the attribute level.
2+
This is due to how the serialisation is done when fetching from the database.

src/core/agent/records/connectionRecord.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@ interface ConnectionRecordStorageProps {
1010
oobi: string;
1111
groupId?: string;
1212
creationStatus?: CreationStatus;
13+
pendingDeletion?: boolean;
1314
}
1415

1516
class ConnectionRecord extends BaseRecord {
1617
alias!: string;
1718
oobi!: string;
1819
groupId?: string;
1920
creationStatus!: CreationStatus;
20-
pendingDeletion = false;
21+
pendingDeletion!: boolean;
2122
static readonly type = "ConnectionRecord";
2223
readonly type = ConnectionRecord.type;
2324

@@ -30,6 +31,7 @@ class ConnectionRecord extends BaseRecord {
3031
this.oobi = props.oobi;
3132
this.groupId = props.groupId;
3233
this.creationStatus = props.creationStatus ?? CreationStatus.PENDING;
34+
this.pendingDeletion = props.pendingDeletion ?? false;
3335
this._tags = props.tags ?? {};
3436
}
3537
}

0 commit comments

Comments
 (0)