Merge pull request #130 from Flutterwave/dev

Pull changes from dev branch

Author: corneliusyaovi

.github/workflows/change-review.yml

@@ -12,15 +12,15 @@ jobs:
     runs-on: ubuntu-latest
     env:
       OS: ubuntu-latest
-      PYTHON: '3.7'
+      PYTHON: '3.8'
     steps:
     - name: checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: setup python environment
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
-        python-version: '3.7'
+        python-version: '3.8'
 
     - name: install python dependencies
       run: |

.github/workflows/python-publish.yml

@@ -9,10 +9,10 @@ jobs:
     runs-on: ubuntu-latest 
     env:
       OS: ubuntu-latest
-      PYTHON: '3.7'
+      PYTHON: '3.8'
     steps:
       - name: checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: check for changes in readme and changelog files
         run: |
@@ -39,15 +39,15 @@ jobs:
     runs-on: ubuntu-latest
     env:
       OS: ubuntu-latest
-      PYTHON: '3.7'
+      PYTHON: '3.8'
     steps:
     - name: checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Setup python environment
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
-        python-version: '3.7'
+        python-version: '3.8'
 
     - name: install python dependencies
       run: |

.github/workflows/security-scan.yml

@@ -12,10 +12,10 @@ jobs:
     runs-on: ubuntu-latest
     env:
       OS: ubuntu-latest
-      PYTHON: '3.7'
+      PYTHON: '3.8'
     steps:
     - name: checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
 
     - name: Checkmarx One ClI Action

rave_python/rave_francophone.py

@@ -4,7 +4,6 @@
 import json
 import webbrowser
 
-
 class Francophone(Payment):
 
     def __init__(self, publicKey, secretKey, production, usingEnv):
@@ -30,7 +29,7 @@ def charge(self, accountDetails, hasFailed=False):
 
         # It is faster to add boilerplate than to check if each one is present
         accountDetails.update(
-            {"payment_type": "mobilemoneyfrancophone", "is_mobile_money_franco": "1"})
+            {"payment_type": "mobilemoneyfranco", "is_mobile_money_franco": "1"})
 
         # If transaction reference is not set
         if not ("txRef" in accountDetails):

rave_python/rave_payment.py

@@ -145,8 +145,13 @@ def _handleChargeResponse(self, response, txRef, request=None, isMpesa=False):
                     "status": responseJson["status"],
                     "validationRequired": True,
                     "txRef": txRef,
-                    "flwRef": responseJson["data"]["flwRef"],
-                    "chargeResponseMessage": responseJson["data"]["chargeResponseMessage"]}
+                    "flwRef": responseJson["data"]["data"]["flw_reference"],
+                    "chargeResponseMessage": responseJson["data"]["response_message"],
+                    "redirect": responseJson["data"]["data"]["redirect"],
+                    "type": responseJson["data"]["data"]["type"],
+                    "provider": responseJson["data"]["data"]["provider"]
+                }
+
             else:
                 return {
                     "error": True,
@@ -313,30 +318,6 @@ def charge(
             response = requests.post(
                 endpoint, headers=headers, data=json.dumps(payload))
 
-            # feature logging
-            # if response.ok:
-            #     tracking_endpoint = self._trackingMap
-            #     responseTime = response.elapsed.total_seconds()
-            #     tracking_payload = {
-            #         "publicKey": self._getPublicKey(),
-            #         "language": "Python v2",
-            #         "version": "1.2.13",
-            #         "title": feature_name,
-            #         "message": responseTime}
-            #     tracking_response = requests.post(
-            #         tracking_endpoint, data=json.dumps(tracking_payload))
-            # else:
-            #     tracking_endpoint = self._trackingMap
-            #     responseTime = response.elapsed.total_seconds()
-            #     tracking_payload = {
-            #         "publicKey": self._getPublicKey(),
-            #         "language": "Python v2",
-            #         "version": "1.2.13",
-            #         "title": feature_name + " error",
-            #         "message": responseTime}
-            #     tracking_response = requests.post(
-            #         tracking_endpoint, data=json.dumps(tracking_payload))
-
         if shouldReturnRequest:
             if isMpesa:
                 return self._handleChargeResponse(
@@ -350,6 +331,9 @@ def charge(
             return self._handleChargeResponse(
                 response, paymentDetails["txRef"])
 
+        # print (paymentDetails, endpoint, headers, json.dumps(payload))
+        # return response.json()
+
     def validate(self, feature_name, flwRef, otp, endpoint=None):
         """ This is the base validate call.\n
              Parameters include:\n

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="rave_python",
-    version="1.4.1",
+    version="1.4.2",
     author="Flutterwave",
     author_email="[email protected]",
     description="Python library for Flutterwave for Business (F4B) v2 APIs.",