Skip to content

Commit

Permalink
Attempt to fix Python APIs 2
Browse files Browse the repository at this point in the history
Signed-off-by: Lukasz Gryglicki <[email protected]>
  • Loading branch information
lukaszgryglicki committed Feb 6, 2025
1 parent a6c9980 commit d842663
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 2 deletions.
2 changes: 2 additions & 0 deletions cla-backend/cla/controllers/signature.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,8 @@ def create_signature(signature_project_id, # pylint: disable=too-many-arguments
signature.set_signature_sign_url(signature_sign_url)
if signature_user_ccla_company_id is not None:
signature.set_signature_user_ccla_company_id(str(signature_user_ccla_company_id))
# LG:
cla.log.info(f"LG: signature.save(): {signature.get_signature_id()} --> {signature.get_signature_acl()}")
signature.save()

event_data = f'Signature added. Signature_id - {signature.get_signature_id()} for Project - {project.get_project_name()}'
Expand Down
6 changes: 5 additions & 1 deletion cla-backend/cla/models/docusign_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,9 @@ def request_individual_signature(self, project_id, user_id, return_url=None, ret
acl = user.get_user_github_id()
elif return_url_type.lower() == "gitlab":
acl = user.get_user_gitlab_id()
cla.log.debug('Individual Signature - setting ACL using user {} id: {}'.format(return_url_type, acl))
# LG:
cla.log.info('LG: Individual Signature - setting ACL using user {} id: {}'.format(return_url_type, acl))
# cla.log.debug('Individual Signature - setting ACL using user {} id: {}'.format(return_url_type, acl))
signature.set_signature_acl('{}:{}'.format(return_url_type.lower(),acl))

# Populate sign url
Expand Down Expand Up @@ -1488,6 +1490,8 @@ def populate_sign_url(self, signature, callback_url=None,
# Save Envelope ID in signature.
cla.log.debug(f'{fn} - {sig_type} - saving signature to database...')
signature.set_signature_envelope_id(envelope.envelopeId)
# LG:
cla.log.info(f"LG: final save in populate_sign_url: {signature.get_signature_id()} --> {signature.get_signature_acl()}")
signature.save()
cla.log.debug(f'{fn} - {sig_type} - saved signature to database - id: {signature.get_signature_id()}...')
cla.log.debug(f'populate_sign_url - {sig_type} - complete')
Expand Down
6 changes: 6 additions & 0 deletions cla-backend/cla/models/dynamo_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -2792,6 +2792,7 @@ def get_signature_user_ccla_company_id(self):
return self.model.signature_user_ccla_company_id

def get_signature_acl(self):
cla.log.info(f"LG:{self.get_signature_id()}: get_signature_acl: --> {self.model.signature_acl}")
return self.model.signature_acl or set()

def get_signature_return_url_type(self):
Expand Down Expand Up @@ -2933,6 +2934,7 @@ def set_signature_user_ccla_company_id(self, company_id) -> None:

def set_signature_acl(self, signature_acl_username) -> None:
self.model.signature_acl = set([signature_acl_username])
cla.log.info(f"LG:{self.get_signature_id()}: set_signature_acl: {self.model.signature_acl} <-- {signature_acl_username}")

def set_signature_return_url_type(self, signature_return_url_type) -> None:
self.model.signature_return_url_type = signature_return_url_type
Expand Down Expand Up @@ -2992,12 +2994,16 @@ def add_signature_acl(self, username) -> None:
if not self.model.signature_acl:
self.model.signature_acl = set()
self.model.signature_acl.add(username)
# LG:
cla.log.info(f"LG:{self.get_signature_id()}: add_signature_acl: {self.model.signature_acl} <-- {username}")

def remove_signature_acl(self, username) -> None:
current_acl = self.model.signature_acl or set()
if username not in current_acl:
return
self.model.signature_acl.remove(username)
# LG:
cla.log.info(f"LG:{self.get_signature_id()}: remove_signature_acl: {self.model.signature_acl} <-- {username}")

def set_user_email(self, user_email) -> None:
self.model.user_email = user_email
Expand Down
2 changes: 1 addition & 1 deletion utils/lookup_signature_by_reference_id_dd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# ./utils/lookup_signature_by_reference_id_dd.sh 3777c5a4-0ca8-11ec-9807-4ebaf2d64a25 | jq -r '.Items[].signature_id'
if [ -z "$1" ]
then
echo "$0: you need to specify reference_id as a 1st parameter, for example: '9dcf5bbc-2492-11ed-97c7-3e2a23ea20b5', '3777c5a4-0ca8-11ec-9807-4ebaf2d64a25'"
echo "$0: you need to specify reference_id as a 1st parameter, for example: '9dcf5bbc-2492-11ed-97c7-3e2a23ea20b5', '55775b48-69c1-474d-a07a-2a329e7012b4', '3777c5a4-0ca8-11ec-9807-4ebaf2d64a25'"
exit 1
fi

Expand Down

0 comments on commit d842663

Please sign in to comment.