|
@@ -140,11 +140,12 @@ public class StandardAccountMessageService implements AccountMessageService { |
|
|
final AccountMessage request = messageDAO.findOperationRequest(approval); |
|
|
final AccountMessage request = messageDAO.findOperationRequest(approval); |
|
|
if (request == null) throw invalidEx("err.approvalToken.invalid", "Request could not be found for approval: "+approval); |
|
|
if (request == null) throw invalidEx("err.approvalToken.invalid", "Request could not be found for approval: "+approval); |
|
|
final AccountPolicy policy = policyDAO.findSingleByAccount(account.getUuid()); |
|
|
final AccountPolicy policy = policyDAO.findSingleByAccount(account.getUuid()); |
|
|
final AccountMessage confirm = messageDAO.create(new AccountMessage(approval).setMessageType(AccountMessageType.confirmation)); |
|
|
|
|
|
approval.setRequest(request); |
|
|
approval.setRequest(request); |
|
|
approval.setRequestContact(policy.findContactByUuid(approval.getRequest().getContact())); |
|
|
approval.setRequestContact(policy.findContactByUuid(approval.getRequest().getContact())); |
|
|
getCompletionHandler(approval).confirm(approval, data); |
|
|
getCompletionHandler(approval).confirm(approval, data); |
|
|
|
|
|
|
|
|
|
|
|
final AccountMessage confirm = messageDAO.create( |
|
|
|
|
|
new AccountMessage(approval).setMessageType(AccountMessageType.confirmation)); |
|
|
if (approval.hasConfirmationTokensToRemove()) { |
|
|
if (approval.hasConfirmationTokensToRemove()) { |
|
|
final RedisService tokens = getConfirmationTokens(); |
|
|
final RedisService tokens = getConfirmationTokens(); |
|
|
for (String toRemove : approval.getConfirmationTokensToRemove()) tokens.del(toRemove); |
|
|
for (String toRemove : approval.getConfirmationTokensToRemove()) tokens.del(toRemove); |
|
|