diff --git a/scripts/issue-ecr.sh b/scripts/issue-ecr.sh index 8c27634..196da74 100755 --- a/scripts/issue-ecr.sh +++ b/scripts/issue-ecr.sh @@ -81,9 +81,10 @@ kli saidify --file /tmp/ecr-edges.json kli vc create --name qvi --alias qvi --private --registry-name vLEI-qvi --schema EEy9PkikFcANV1l7EHukCeXqrzT1hNZjGlUk7wuMO5jw --recipient EBcIURLpxmVwahksgrsGW6_dUw0zBhyEHYFk17eWrZfk --data @"${KERI_DEMO_SCRIPT_DIR}"/data/ecr-data.json --edges @/tmp/ecr-edges.json --rules @"${KERI_DEMO_SCRIPT_DIR}"/data/ecr-rules.json SAID=$(kli vc list --name qvi --alias qvi --issued --said --schema EEy9PkikFcANV1l7EHukCeXqrzT1hNZjGlUk7wuMO5jw) kli ipex grant --name qvi --alias qvi --said "${SAID}" --recipient EBcIURLpxmVwahksgrsGW6_dUw0zBhyEHYFk17eWrZfk +kli ipex list --name qvi --alias qvi --poll -kli ipex list --name qvi --alias qvi GRANT=$(python "${KERI_SCRIPT_DIR}"/list_ipex.py) +echo "Sending admit with ${GRANT}" python "${KERI_SCRIPT_DIR}"/send_admit.py "${GRANT}" EHMnCf8_nIemuPx-cUHaDQq8zSnQIFAurdEpwHpNbnvX kli ipex list --name qvi --alias qvi --poll python "${KERI_SCRIPT_DIR}"/list_person_credentials.py diff --git a/scripts/join_new_quadlet.py b/scripts/join_new_quadlet.py index b1b67a3..ee01cd5 100644 --- a/scripts/join_new_quadlet.py +++ b/scripts/join_new_quadlet.py @@ -56,7 +56,7 @@ def accept_join_request(client, name, group): if route == "/multisig/rot": said = payload['d'] - res = exchanges.get(name=name, said=said) + res = exchanges.get(said=said) exn = res['exn'] a = exn['a'] diff --git a/scripts/multisig-holder.py b/scripts/multisig-holder.py index f4dc458..d2211d4 100644 --- a/scripts/multisig-holder.py +++ b/scripts/multisig-holder.py @@ -219,7 +219,7 @@ def create_admit(client, participant, group, said, recp): exchanges = client.exchanges() ipex = client.ipex() - res = exchanges.get(participant, said) + res = exchanges.get(said) grant = coring.Serder(ked=res['exn']) ghab = get_aid(client, group) mhab = get_aid(client, participant) diff --git a/src/signify/app/credentialing.py b/src/signify/app/credentialing.py index d5ee8a4..3c38e40 100644 --- a/src/signify/app/credentialing.py +++ b/src/signify/app/credentialing.py @@ -273,6 +273,9 @@ def grant(self, hab, recp, message, acdc, iss, anc, agree=None, dt=None): return grant, gsigs, end def admit(self, hab, message, grant, dt=None): + if not grant: + raise ValueError(f"invalid grant={grant}") + exchanges = self.client.exchanges() data = dict( m=message, diff --git a/src/signify/peer/exchanging.py b/src/signify/peer/exchanging.py index bbe3816..2d6f839 100644 --- a/src/signify/peer/exchanging.py +++ b/src/signify/peer/exchanging.py @@ -101,11 +101,10 @@ def sendFromEvents(self, name, topic, exn, sigs, atc, recipients): res = self.client.post(f"/identifiers/{name}/exchanges", json=body) return res.json() - def get(self, name, said): + def get(self, said): """ Parameters: - name (str): human readable identifier alias to send from said (str): qb64 SAID of the exn message to retrieve Returns: @@ -113,5 +112,5 @@ def get(self, name, said): """ - res = self.client.get(f"/identifiers/{name}/exchanges/{said}") - return res.json() \ No newline at end of file + res = self.client.get(f"/exchanges/{said}") + return res.json() diff --git a/tests/peer/test_exchanging.py b/tests/peer/test_exchanging.py index 0add498..43c294e 100644 --- a/tests/peer/test_exchanging.py +++ b/tests/peer/test_exchanging.py @@ -60,10 +60,10 @@ def test_exchanges_get(mockHelpingNowIso8601): from requests import Response mock_response = mock({'content': 'things I found'}, spec=Response, strict=True) expect(mock_response, times=1).json().thenReturn({'content': 'an exn'}) - expect(mock_client, times=1).get("/identifiers/aid1/exchanges/EEE",).thenReturn(mock_response) + expect(mock_client, times=1).get("/exchanges/EEE",).thenReturn(mock_response) from signify.peer.exchanging import Exchanges - out = Exchanges(client=mock_client).get('aid1', 'EEE') # type: ignore + out = Exchanges(client=mock_client).get('EEE') # type: ignore assert out == {'content': 'an exn'}