Merge pull request #311 from amen50/17.0-1.3

update jwt signature in api calls

Author: mkumar-02

g2p_bridge_configuration/models/payment_manager.py

@@ -4,6 +4,7 @@
 import requests
 
 from odoo import fields, models
+from odoo.exceptions import ValidationError
 
 _logger = logging.getLogger(__name__)
 
@@ -15,18 +16,11 @@ class G2PPaymentManagerG2PConnect(models.Model):
     sponsoring_bank = fields.Many2one("g2p.sponsoring.bank.account", required=False)
     sent_to_bridge = fields.Boolean(default=False)
 
-    def create_jwt_token(self, payload: dict):
-        self.ensure_one()
-        enc_provider = self.get_encryption_provider()
-        token = enc_provider.jwt_sign(payload, include_payload=False)
-        return token
-
     def publish_bridge_benefit_program(self):
         self.ensure_one()
         try:
             url = self.program_creation_endpoint_url
             data = {
-                "signature": "string",
                 "header": {
                     "version": "1.0.0",
                     "message_id": "string",
@@ -51,7 +45,8 @@ def publish_bridge_benefit_program(self):
                     "id_mapper_resolution_required": True,
                 },
             }
-            token = self.create_jwt_token(data)
+
+            token = self.create_jwt_token(json.dumps(data, separators=(",", ":")))
             headers = {
                 "Accept": "application/json",
                 "Content-Type": "application/json",
@@ -60,7 +55,13 @@ def publish_bridge_benefit_program(self):
             response = requests.post(url, data=json.dumps(data), headers=headers, timeout=self.api_timeout)
             response.raise_for_status()
             response_data = response.json()
+            status = response_data.get("header", {}).get("status")
+            reason = response_data.get("header", {}).get("status_reason_message")
             if response_data.get("header", {}).get("status") == "succ":
                 self.sent_to_bridge = True
-        except Exception as e:
-            _logger.error("Error occurred on publishing sponsoring bank %s" % e)
+            else:
+                raise ValidationError(f"Request has the {status} status because of {reason}")
+
+        except Exception:
+            _logger.exception("Error occurred on publishing sponsoring bank")
+            raise

g2p_payment_g2p_connect/models/cycle.py

@@ -1,14 +1,13 @@
 # Part of OpenG2P. See LICENSE file for full copyright and licensing details.
 
+import json
 import logging
 
 import requests
 
 from odoo import _, fields, models
 from odoo.exceptions import UserError
 
-from odoo.addons.g2p_programs.models import constants
-
 _logger = logging.getLogger(__name__)
 
 
@@ -20,29 +19,36 @@ class G2PCycle(models.Model):
     def generate_summary(self):
         # Call the Disbursement Envelope Status API to get the latest details
         try:
-            payment_manager = self.program_id.get_manager(constants.MANAGER_PAYMENT)
-            response = requests.post(
-                payment_manager.envelope_status_url,
-                json={
-                    "signature": "string",
-                    "header": {
-                        "version": "1.0.0",
-                        "message_id": "string",
-                        "message_ts": "string",
-                        "action": "string",
-                        "sender_id": "string",
-                        "sender_uri": "",
-                        "receiver_id": "",
-                        "total_count": 0,
-                        "is_msg_encrypted": False,
-                        "meta": "string",
-                    },
-                    "message": self.disbursement_envelope_id,
+            payment_manager = self.env["g2p.program.payment.manager.g2p.connect"].search([], limit=1)
+
+            data = {
+                "header": {
+                    "version": "1.0.0",
+                    "message_id": "string",
+                    "message_ts": "string",
+                    "action": "string",
+                    "sender_id": payment_manager.sender_id,
+                    "sender_uri": "",
+                    "receiver_id": "",
+                    "total_count": 0,
+                    "is_msg_encrypted": False,
+                    "meta": "string",
                 },
-                timeout=10,
+                "message": self.disbursement_envelope_id,
+            }
+
+            token = payment_manager.create_jwt_token(json.dumps(data, separators=(",", ":")))
+            headers = {
+                "Accept": "application/json",
+                "Content-Type": "application/json",
+                "Signature": token,
+            }
+            response = requests.post(
+                payment_manager.envelope_status_url, json=data, timeout=10, headers=headers
             )
             response.raise_for_status()
             data = response.json()
+
             # Create new record for the summary report ( CycleEnvelopeSummary model)
             cycle_and_envelope_summary = self.env["g2p.cycle.envelope.summary"].create(
                 {

g2p_payment_g2p_connect/models/payment_manager.py

@@ -1,4 +1,5 @@
 # Part of OpenG2P. See LICENSE file for full copyright and licensing details.
+import json
 import logging
 import os
 from datetime import datetime, timedelta
@@ -87,6 +88,12 @@ class G2PPaymentManagerG2PConnect(models.Model):
     send_payments_domain = fields.Text("Filter Batches to Send", default="[]")
     sender_id = fields.Char("Sender ID", default=DEFAULT_SENDER_ID, required=False)
 
+    def create_jwt_token(self, payload: str):
+        self.ensure_one()
+        enc_provider = self.get_encryption_provider()
+        token = enc_provider.jwt_sign(payload, include_payload=False)
+        return token
+
     @api.onchange("payee_id_type")
     def _onchange_payee_id_type(self):
         prefix_mapping = {
@@ -172,11 +179,14 @@ def _send_payments(self, batches):
                 )
             try:
                 _logger.info("G2P Bridge Disbursement Batch Data: %s", batch_data)
-
+                token = self.create_jwt_token(json.dumps(batch_data, separators=(",", ":")))
+                headers = {
+                    "Accept": "application/json",
+                    "Content-Type": "application/json",
+                    "Signature": token,
+                }
                 response = requests.post(
-                    self.payment_endpoint_url,
-                    json=batch_data,
-                    timeout=self.api_timeout,
+                    self.payment_endpoint_url, json=batch_data, timeout=self.api_timeout, headers=headers
                 )
                 _logger.info("G2P Bridge Disbursement response: %s", response.content)
                 response.raise_for_status()
@@ -242,7 +252,6 @@ def payments_status_check(self, id_):
             _logger.info(f"Payment for Status Check: {len(payments)}")
 
             status_data = {
-                "signature": "string",
                 "header": {
                     "version": "1.0.0",
                     "message_id": "string",
@@ -259,11 +268,17 @@ def payments_status_check(self, id_):
             }
             try:
                 _logger.info("G2P Connect Disbursement Status Data: %s", status_data)
-
+                token = self.create_jwt_token(json.dumps(status_data, separators=(",", ":")))
+                headers = {
+                    "Accept": "application/json",
+                    "Content-Type": "application/json",
+                    "Signature": token,
+                }
                 res = requests.post(
                     payment_manager.status_endpoint_url,
                     json=status_data,
                     timeout=payment_manager.api_timeout,
+                    headers=headers,
                 )
                 _logger.info("G2P Connect Disbursement Status response: %s", res.content)
                 res.raise_for_status()
@@ -353,7 +368,7 @@ def _create_envelope_g2p_bridge(self, cycle):
                 "version": "1.0.0",
                 "message_id": "string",
                 "message_ts": "string",
-                "action": "string",
+                "action": "create_disbursement_envelope",
                 "sender_id": self.sender_id,
                 "sender_uri": "",
                 "receiver_id": "",
@@ -373,10 +388,17 @@ def _create_envelope_g2p_bridge(self, cycle):
             },
         }
         try:
+            token = self.create_jwt_token(json.dumps(envelope_request_data, separators=(",", ":")))
+            headers = {
+                "Accept": "application/json",
+                "Content-Type": "application/json",
+                "Signature": token,
+            }
             response = requests.post(
                 self.envelope_creation_url,
                 json=envelope_request_data,
                 timeout=10,
+                headers=headers,
             )
             # Store the id from respose to the model
             disbursement_envelope_id = response.json().get("message").get("disbursement_envelope_id")