Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure "preserve_exchange_records" flags are set. #2664

Merged
merged 3 commits into from
Dec 9, 2023
Merged

Ensure "preserve_exchange_records" flags are set. #2664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
092dccf
Ensure "preserve_exchange_records" flags are set.
usingtechnology Dec 9, 2023
5b4295c
Merge branch 'main' into issue_2656_preserve_records_flag
usingtechnology Dec 9, 2023
c25b8b1
Merge branch 'main' into issue_2656_preserve_records_flag
dbluhm Dec 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions aries_cloudagent/protocols/issue_credential/v1_0/manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import asyncio
import json
import logging

from typing import Mapping, Optional, Tuple

from ....cache.base import BaseCache
Expand All @@ -18,8 +17,8 @@
IndyLedgerRequestsExecutor,
)
from ....messaging.credential_definitions.util import (
CRED_DEF_TAGS,
CRED_DEF_SENT_RECORD_TYPE,
CRED_DEF_TAGS,
)
from ....messaging.responder import BaseResponder
from ....multitenant.base import BaseMultitenantManager
Expand All @@ -28,7 +27,6 @@
from ....revocation.models.revocation_registry import RevocationRegistry
from ....storage.base import BaseStorage
from ....storage.error import StorageError, StorageNotFoundError

from ...out_of_band.v1_0.models.oob_record import OobRecord
from .messages.credential_ack import CredentialAck
from .messages.credential_issue import CredentialIssue
Expand Down Expand Up @@ -410,6 +408,9 @@ async def create_request(
cred_req_ser = None
cred_req_meta = None

# hold on to values that may have changed so we can restore after fetch
auto_remove = cred_ex_record.auto_remove

async def _create():
multitenant_mgr = self.profile.inject_or(BaseMultitenantManager)
if multitenant_mgr:
Expand Down Expand Up @@ -478,6 +479,8 @@ async def _create():
cred_ex_record.credential_request = cred_req_ser
cred_ex_record.credential_request_metadata = cred_req_meta
cred_ex_record.state = V10CredentialExchange.STATE_REQUEST_SENT
# restore values passed in...
cred_ex_record.auto_remove = auto_remove
await cred_ex_record.save(txn, reason="create credential request")
await txn.commit()
else:
Expand Down
23 changes: 16 additions & 7 deletions aries_cloudagent/protocols/issue_credential/v1_0/routes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
request_schema,
response_schema,
)

from marshmallow import fields, validate

from ....admin.request_context import AdminRequestContext
Expand Down Expand Up @@ -484,14 +483,16 @@ async def credential_exchange_create(request: web.BaseRequest):
r_time = get_timer()

context: AdminRequestContext = request["context"]

profile = context.profile
body = await request.json()

comment = body.get("comment")
preview_spec = body.get("credential_proposal")
if not preview_spec:
raise web.HTTPBadRequest(reason="credential_proposal must be provided")
auto_remove = body.get("auto_remove")
auto_remove = body.get(
"auto_remove", not profile.settings.get("preserve_exchange_records")
)
trace_msg = body.get("trace")

try:
Expand Down Expand Up @@ -570,7 +571,9 @@ async def credential_exchange_send(request: web.BaseRequest):
preview_spec = body.get("credential_proposal")
if not preview_spec:
raise web.HTTPBadRequest(reason="credential_proposal must be provided")
auto_remove = body.get("auto_remove")
auto_remove = body.get(
"auto_remove", not profile.settings.get("preserve_exchange_records")
)
trace_msg = body.get("trace")

connection_record = None
Expand Down Expand Up @@ -663,7 +666,9 @@ async def credential_exchange_send_proposal(request: web.BaseRequest):
connection_id = body.get("connection_id")
comment = body.get("comment")
preview_spec = body.get("credential_proposal")
auto_remove = body.get("auto_remove")
auto_remove = body.get(
"auto_remove", not profile.settings.get("preserve_exchange_records")
)
trace_msg = body.get("trace")

connection_record = None
Expand Down Expand Up @@ -788,7 +793,9 @@ async def credential_exchange_create_free_offer(request: web.BaseRequest):
auto_issue = body.get(
"auto_issue", context.settings.get("debug.auto_respond_credential_request")
)
auto_remove = body.get("auto_remove")
auto_remove = body.get(
"auto_remove", not profile.settings.get("preserve_exchange_records")
)
comment = body.get("comment")
preview_spec = body.get("credential_preview")
if not preview_spec:
Expand Down Expand Up @@ -862,7 +869,9 @@ async def credential_exchange_send_free_offer(request: web.BaseRequest):
auto_issue = body.get(
"auto_issue", context.settings.get("debug.auto_respond_credential_request")
)
auto_remove = body.get("auto_remove")
auto_remove = body.get(
"auto_remove", not profile.settings.get("preserve_exchange_records")
)
comment = body.get("comment")
preview_spec = body.get("credential_preview")
if not preview_spec:
Expand Down
31 changes: 21 additions & 10 deletions aries_cloudagent/protocols/issue_credential/v2_0/routes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,13 @@
request_schema,
response_schema,
)

from marshmallow import ValidationError, fields, validate, validates_schema

from ....admin.request_context import AdminRequestContext
from ....connections.models.conn_record import ConnRecord
from ....core.profile import Profile
from ....anoncreds.holder import AnonCredsHolderError
from ....anoncreds.issuer import AnonCredsIssuerError
from ....connections.models.conn_record import ConnRecord
from ....core.profile import Profile
from ....indy.holder import IndyHolderError
from ....indy.issuer import IndyIssuerError
from ....ledger.error import LedgerError
Expand Down Expand Up @@ -607,13 +606,15 @@ async def credential_exchange_create(request: web.BaseRequest):
r_time = get_timer()

context: AdminRequestContext = request["context"]

profile = context.profile
body = await request.json()

comment = body.get("comment")
preview_spec = body.get("credential_preview")
filt_spec = body.get("filter")
auto_remove = body.get("auto_remove")
auto_remove = body.get(
"auto_remove", not profile.settings.get("preserve_exchange_records")
)
if not filt_spec:
raise web.HTTPBadRequest(reason="Missing filter")
trace_msg = body.get("trace")
Expand Down Expand Up @@ -694,7 +695,9 @@ async def credential_exchange_send(request: web.BaseRequest):
if not filt_spec:
raise web.HTTPBadRequest(reason="Missing filter")
preview_spec = body.get("credential_preview")
auto_remove = body.get("auto_remove")
auto_remove = body.get(
"auto_remove", not profile.settings.get("preserve_exchange_records")
)
replacement_id = body.get("replacement_id")
trace_msg = body.get("trace")

Expand Down Expand Up @@ -802,7 +805,9 @@ async def credential_exchange_send_proposal(request: web.BaseRequest):
filt_spec = body.get("filter")
if not filt_spec:
raise web.HTTPBadRequest(reason="Missing filter")
auto_remove = body.get("auto_remove")
auto_remove = body.get(
"auto_remove", not profile.settings.get("preserve_exchange_records")
)
trace_msg = body.get("trace")

conn_record = None
Expand Down Expand Up @@ -925,7 +930,9 @@ async def credential_exchange_create_free_offer(request: web.BaseRequest):
auto_issue = body.get(
"auto_issue", context.settings.get("debug.auto_respond_credential_request")
)
auto_remove = body.get("auto_remove")
auto_remove = body.get(
"auto_remove", not profile.settings.get("preserve_exchange_records")
)
replacement_id = body.get("replacement_id")
comment = body.get("comment")
preview_spec = body.get("credential_preview")
Expand Down Expand Up @@ -1000,7 +1007,9 @@ async def credential_exchange_send_free_offer(request: web.BaseRequest):
auto_issue = body.get(
"auto_issue", context.settings.get("debug.auto_respond_credential_request")
)
auto_remove = body.get("auto_remove")
auto_remove = body.get(
"auto_remove", not profile.settings.get("preserve_exchange_records")
)
replacement_id = body.get("replacement_id")
comment = body.get("comment")
preview_spec = body.get("credential_preview")
Expand Down Expand Up @@ -1196,7 +1205,9 @@ async def credential_exchange_send_free_request(request: web.BaseRequest):
filt_spec = body.get("filter")
if not filt_spec:
raise web.HTTPBadRequest(reason="Missing filter")
auto_remove = body.get("auto_remove")
auto_remove = body.get(
"auto_remove", not profile.settings.get("preserve_exchange_records")
)
trace_msg = body.get("trace")
holder_did = body.get("holder_did")

Expand Down