update user agent

.build/prod/api.Dockerfile

@@ -1,8 +1,10 @@
 FROM python:3.9.20-slim-bookworm
 
-RUN pip install python-dotenv flask
+RUN pip install python-dotenv flask gunicorn
+RUN apt-get update && apt-get install -y curl jq && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app
-COPY api.py tx.sh .
+COPY api.py tx.sh fetchname.sh .
+RUN chmod +x tx.sh api.py fetchname.sh
 
-CMD python /app/api.py
+CMD gunicorn --workers 4 --bind 0.0.0.0:5000 api:app

.build/prod/compose.yml

@@ -9,3 +9,8 @@ services:
         context: ../../
         dockerfile: .build/prod/api.Dockerfile
       image: git.shihaam.dev/shihaam/mib-payment-verify/api
+   cookieserver:
+      build:
+        context: ../../
+        dockerfile: .build/prod/cookieserver.Dockerfile
+      image: git.shihaam.dev/shihaam/mib-payment-verify/cookieserver

.build/prod/cookieserver.Dockerfile

@@ -0,0 +1,10 @@
+FROM python:3.9.20-slim-bookworm
+
+RUN pip install beautifulsoup4  pyotp Flask python-dotenv requests
+RUN apt-get update && apt-get install -y curl jq && apt-get clean && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /app
+
+COPY getcookie.py .
+
+CMD python getcookie.py

.build/prod/keepalive.Dockerfile

@@ -1,10 +1,10 @@
 FROM debian:bullseye-slim
 
-RUN apt-get update && apt-get install -y curl && apt-get clean && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y curl jq && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app
 COPY keepalive.sh .
 
 RUN chmod +x keepalive.sh
 
-CMD /app/keepalive.sh
+CMD ./keepalive.sh

.env.example

@@ -2,9 +2,16 @@ USERNAME=
 PASSWORD=
 TOTP_SEED=
 
+PROFILE_ID=
+PROFILE_TYPE=
+ACCOUNT_NUMBER=
 
-#Cookie
-QL_0=
-IBSID=
+COOKIE_SERVER=http://cookieserver:5000
 
 APP_DEBUG=true
+
+## This valu is for time difference between request json and actual time of the transacation (+ or -) in mins, 5 or 10 is probably a good value
+TIME_DIFF_LIMIT=7
+
+## Sleep is the delay between keepalive request for extending sesssion, somewhere between 30 and 150 should be ok
+SLEEP=45 

.gitea/workflows/docker-build.yml

@@ -0,0 +1,37 @@
+name: Build and Push Docker Images
+
+on:
+  push:
+    branches:
+      - main
+      - master
+  pull_request:
+    branches:
+      - main
+      - master
+
+jobs:
+  docker:
+    name: Build and Push Docker Images
+    runs-on: builder
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Build Docker images
+        working-directory: .build/prod
+        run: docker compose build
+
+      - name: Login to Docker Registry
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ vars.DOCKER_REGISTRY_URL }}
+          username: ${{ vars.DOCKER_REGISTRY_USER }}
+          password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
+
+      - name: Push Docker images
+        if: github.event_name != 'pull_request'
+        working-directory: .build/prod
+        run: docker compose push

.gitignore

@@ -1,2 +1,3 @@
 env/*
 .env
+__pycache__/

README.md

@@ -0,0 +1,118 @@
+### Maldives Islamic Bank Payment Verification API
+
+
+- This api will allow you to match customers payment and your MIB account history, it will match with transaction time, account owner name and amount.
+- Issue with using account number name is that, MIB to MIB transaction sometimes have MIBs made-up name for the account owner name, This is challenging, so work around that, I added option to send customers account number to fetch the made-up name and match with it.
+- BML (Farava) transations works perfectly with just the name!
+- It uses cookie from webssion to fetch everything, it also has a keepalive service so websession does not expire after 5mins.
+
+## How to deploy/get started (with docker/podman)
+
+1. Login to MIB web [https://faisanet.mib.com.mv/](https://faisanet.mib.com.mv/) and get the your profile id and type:
+![select_profile.jpg](select_profile.jpg)
+2. copy .env.example to .env and fill your MIB Username, Password and TOTP Seed, `PROFILE_ID` and `PROFILE_TYPE` needs to be filled with contents from step 1, Make sure to fill `ACCOUNT_NUMBER` with your account number.
+3. Create `compose.yml` with the follwing contents:
+```yaml
+services:
+  keepalive:
+    env_file: .env
+    image: git.shihaam.dev/shihaam/mib-payment-verify/keepalive
+
+  cookieserver:
+    env_file: .env
+    image: git.shihaam.dev/shihaam/mib-payment-verify/cookieserver
+
+  api:
+    env_file: .env
+    image: git.shihaam.dev/shihaam/mib-payment-verify/api
+    ports:
+      - 5000:5000
+
+```
+4. Run `docker compose up -d` and that is all.
+
+
+## Using the API with curl examples:
+1. With both benefName and accountNo:
+```bash
+curl -X POST http://localhost:5000/verify-payment \
+     -H "Content-Type: application/json" \
+     -d '{
+           "benefName": "ABDLA.MAJUDHU AHMED",
+           "accountNo": "90103101178641000",
+           "absAmount": "100",
+           "time": "2024-10-16 16:08"
+         }'
+```
+In this request, it will first try to verify with benfName, if it fails, then it will try with accountNo.
+
+2. With only benefName:
+```bash
+curl -X POST http://localhost:5000/verify-payment \
+     -H "Content-Type: application/json" \
+     -d '{
+           "benefName": "ABDLA.MAJUDHU AHMED",
+           "absAmount": "100",
+           "time": "2024-10-16 16:08"
+         }'
+```
+3. With only accountNo:
+```bash
+curl -X POST http://localhost:5000/verify-payment \
+     -H "Content-Type: application/json" \
+     -d '{
+           "accountNo": "90103101178641000",
+           "absAmount": "100",
+           "time": "2024-10-16 16:08"
+         }'
+```
+
+
+## Exmaple Succcess responses:
+1. Both benefName and accountNo or only benefName provided
+```json
+{
+  "message": "Payment verified using beneficiary name",
+  "success": true,
+  "transaction": {
+    "ref": "MALBIPS20241208190231 HBTLGAKCNUS",
+    "sourceBank": "BML",
+    "trxDate": "2024-12-09 00:02:36"
+  }
+}
+
+```
+2. Both benefName and accountNo or only accountNo provided, but failed with benefName
+```json
+{
+  "message": "Payment verified using account number",
+  "success": true,
+  "transaction": {
+    "ref": "1-77722758-34140519-1",
+    "sourceBank": "MIB",
+    "trxDate": "2024-12-05 12:57:32"
+  }
+}
+```
+## Example Failed response:
+1. If transaction is not found with the provided details.
+```json
+{
+  "message": "Transaction not found, contact support",
+  "success": false
+}
+```
+2. If session times out
+```json
+{
+  "message": "Error from tx.sh: Session Expired",
+  "success": false
+}
+```
+3. If 500 from server
+```json
+{
+    "message": "Internal server error"
+    "success": false,
+}
+```

api.py

@@ -1,76 +1,156 @@
+#!/usr/bin/env python3
+
+from decimal import Decimal
+import os
+from dotenv import load_dotenv
 from flask import Flask, request, jsonify
 import subprocess
 import json
 from datetime import datetime, timedelta
-import os
-from dotenv import load_dotenv
+
+load_dotenv()  # This will load environment variables from a .env file if it exists
+TIME_DIFF_LIMIT = int(os.getenv('TIME_DIFF_LIMIT', 2))  # Default to 2mins if not set
 
 app = Flask(__name__)
 
-@app.route('/verify-payment', methods=['POST'])
-def verify_payment():
-    # Get data from request
-    data = request.json
-    benef_name = data.get('benefName', '').strip().lower()  # Normalize input name
-    abs_amount = data.get('absAmount')
-    time_str = data.get('time')
-
-    # Validate input
-    if not all([benef_name, abs_amount, time_str]):
-        return jsonify({"success": False, "message": "Missing required parameters"}), 400
-
+def fetch_account_name(account_no):
     try:
-        # Parse the input time
-        request_time = datetime.strptime(time_str, "%Y-%m-%d %H:%M")
-    except ValueError:
-        return jsonify({"success": False, "message": "Invalid time format"}), 400
+        result = subprocess.run(['./fetchname.sh', account_no], capture_output=True, text=True, check=True)
+        response = json.loads(result.stdout)
+        if response.get('success'):
+            return response.get('accountName')
+    except (subprocess.CalledProcessError, json.JSONDecodeError) as e:
+        app.logger.error(f"Error fetching account name: {str(e)}")
+    return None
 
-    # Execute tx.sh and get the output
-    try:
-        result = subprocess.run(['./tx.sh'], capture_output=True, text=True, check=True)
-        tx_response = json.loads(result.stdout)
-        
-        # Debug: Print the entire tx_response
-        app.logger.debug(f"tx_response: {json.dumps(tx_response, indent=2)}")
-        
-        if not tx_response.get('success'):
-            return jsonify({"success": False, "message": f"Error from tx.sh: {tx_response.get('reasonText', 'Unknown error')}"}), 500
-        
-        tx_data_list = tx_response.get('data', [])
-        if not tx_data_list:
-            return jsonify({"success": False, "message": "No transaction data found"}), 404
-        
-    except subprocess.CalledProcessError as e:
-        return jsonify({"success": False, "message": f"Error executing tx.sh: {str(e)}", "stderr": e.stderr}), 500
-    except json.JSONDecodeError as e:
-        return jsonify({"success": False, "message": f"Error parsing tx.sh output: {str(e)}", "output": result.stdout}), 500
+def get_transaction_details(tx_data):
+    """Extract reference and sourceBank based on transaction type"""
+    descr1 = tx_data.get('descr1', '')
+    
+    if descr1 == "Favara Credit":
+        reference = tx_data.get('descr2', '')
+        # Extract sourceBank from descr3 (part before the first '-')
+        descr3 = tx_data.get('descr3', '')
+        sourceBank = descr3.split(' - ')[0] if ' - ' in descr3 else ''
+    elif descr1 == "IB Acc to Acc":
+        reference = tx_data.get('trxNumber', '')
+        sourceBank = "MIB"
+    else:
+        reference = tx_data.get('trxNumber', '')
+        sourceBank = ""
 
-    # Check transactions
+    return {
+        "ref": reference,
+        "trxDate": tx_data.get('trxDate', ''),
+        "sourceBank": sourceBank
+    }
+
+def verify_transaction(benef_name, abs_amount, request_time, tx_data_list):
     for tx_data in tx_data_list:
-        # Check if the required keys exist in tx_data
         required_keys = ['trxDate', 'benefName', 'absAmount']
-        missing_keys = [key for key in required_keys if key not in tx_data]
-        if missing_keys:
+        if not all(key in tx_data for key in required_keys):
             continue  # Skip this transaction if it's missing required keys
 
         try:
             tx_time = datetime.strptime(tx_data['trxDate'], "%Y-%m-%d %H:%M:%S")
             time_diff = abs(tx_time - request_time)
             
-            # Normalize transaction beneficiary name for comparison
             tx_benef_name = tx_data['benefName'].strip().lower()
             
-            if (tx_benef_name == benef_name and
-                str(tx_data['absAmount']) == str(abs_amount) and
-                time_diff <= timedelta(minutes=30)):
-                return jsonify({"success": True, "message": "Payment verified"})
+            if (tx_benef_name == benef_name.strip().lower() and
+                compare_amounts(tx_data['absAmount'], abs_amount) and
+                time_diff <= timedelta(minutes=TIME_DIFF_LIMIT)):
+                return True, tx_data
         except ValueError as e:
             app.logger.error(f"Error processing transaction: {str(e)}")
-            continue  # Skip this transaction if there's an error processing it
+    return False, None
 
-    # If we've checked all transactions and found no match
-    return jsonify({"success": False, "message": "Transaction not found, contact support"})
+def compare_amounts(amount1, amount2):
+    """Compare two amount strings as Decimal objects."""
+    return Decimal(amount1) == Decimal(amount2)
+
+@app.errorhandler(400)
+def bad_request(error):
+    return jsonify({"success": False, "message": "Invalid request: Malformed JSON"}), 400
+
+@app.errorhandler(500)
+def internal_error(error):
+    return jsonify({"success": False, "message": "Internal server error"}), 500
+
+@app.route('/verify-payment', methods=['POST'])
+def verify_payment():
+    try:
+        if not request.is_json:
+            return jsonify({"success": False, "message": "Request must be JSON"}), 400
+            
+        data = request.get_json()
+        if data is None:
+            return jsonify({"success": False, "message": "Invalid JSON format"}), 400
+            
+        benef_name = data.get('benefName', '').strip() if data.get('benefName') else ''
+        account_no = data.get('accountNo')
+        abs_amount = data.get('absAmount')
+        time_str = data.get('time')
+
+        if not all([abs_amount, time_str]):
+            return jsonify({"success": False, "message": "Missing required parameters"}), 400
+
+        if not benef_name and not account_no:
+            return jsonify({"success": False, "message": "Either benefName or accountNo must be provided"}), 400
+
+        try:
+            request_time = datetime.strptime(time_str, "%Y-%m-%d %H:%M")
+        except ValueError:
+            return jsonify({"success": False, "message": "Invalid time format"}), 400
+
+        try:
+            result = subprocess.run(['./tx.sh'], capture_output=True, text=True, check=True)
+            tx_response = json.loads(result.stdout)
+            
+            app.logger.debug(f"tx_response: {json.dumps(tx_response, indent=2)}")
+            
+            if not tx_response.get('success'):
+                return jsonify({"success": False, "message": f"Error from tx.sh: {tx_response.get('reasonText', 'Unknown error')}"}), 500
+            
+            tx_data_list = tx_response.get('data', [])
+            if not tx_data_list:
+                return jsonify({"success": False, "message": "No transaction data found"}), 404
+            
+        except subprocess.CalledProcessError as e:
+            return jsonify({"success": False, "message": f"Error executing tx.sh: {str(e)}"}), 500
+        except json.JSONDecodeError as e:
+            return jsonify({"success": False, "message": f"Error parsing tx.sh output: {str(e)}"}), 500
+
+        # First, try to verify with benefName if provided
+        if benef_name:
+            verified, tx_data = verify_transaction(benef_name, abs_amount, request_time, tx_data_list)
+            if verified:
+                return jsonify({
+                    "success": True,
+                    "message": "Payment verified using beneficiary name",
+                    "transaction": get_transaction_details(tx_data)
+                })
+
+        # If benefName verification failed or wasn't provided, try with accountNo
+        if account_no:
+            fetched_name = fetch_account_name(account_no)
+            if fetched_name:
+                verified, tx_data = verify_transaction(fetched_name, abs_amount, request_time, tx_data_list)
+                if verified:
+                    return jsonify({
+                        "success": True,
+                        "message": "Payment verified using account number",
+                        "transaction": get_transaction_details(tx_data)
+                    })
+
+        # If both verifications fail
+        return jsonify({"success": False, "message": "Transaction not found, contact support"})
+        
+    except Exception as e:
+        app.logger.error(f"Unexpected error: {str(e)}")
+        return jsonify({"success": False, "message": "Internal server error"}), 500
 
 if __name__ == '__main__':
     debug_mode = os.getenv('APP_DEBUG', 'False').lower() in ('true', '1', 't')
-    app.run(debug=debug_mode)
+    port = int(os.getenv('PORT', 5000))
+    app.run(host='0.0.0.0', port=port, debug=debug_mode)

auth.js

@@ -1,316 +0,0 @@
-
-
-            let displayError = function (msg) {
-                $("#error-display").text(msg).show('slow');
-            };
-
-            let hideError = function (msg) {
-                $("#error-display").hide('slow');
-            };
-
-            window.location.hash = '';
-            let hideProgress = function () {
-                $("#login-submit").removeClass('button-loader');
-            };
-
-
-            let showProgress = function () {
-                $("#login-submit").addClass('button-loader');
-            };
-
-            let pushDashboardToHistory = function () {
-                let defaultLandingPage = "https://faisanet.mib.com.mv/dashboard";
-                window.history.pushState({}, '', defaultLandingPage)
-            };
-
-            let getLandingPage = function (landingPageOption) {
-                let landingPage = "https://faisanet.mib.com.mv/profiles";
-                switch (landingPageOption) {
-                    case "0":
-                    {
-                        //individual account login
-
-                        landingPage = "https://faisanet.mib.com.mv/dashboard";
-                        break;
-
-                    }
-                    case "1":
-                    {
-                        //profiles
-
-                        landingPage = "https://faisanet.mib.com.mv/accounts";
-                        break;
-
-                    }
-                    case "2":
-                    {
-
-                        //quick
-
-                        landingPage = "https://faisanet.mib.com.mv/transfer/quick";
-                        break;
-
-                    }
-                    case "3":
-                    {
-                        //local
-
-                        landingPage = "https://faisanet.mib.com.mv/transfer/local";
-                        break;
-
-                    }
-                    default:
-                    {
-                        //profiles
-
-                        landingPage = "https://faisanet.mib.com.mv/profiles";
-                    }
-                }
-
-                return landingPage;
-            }
-
-
-            let requestAuthType = function () {
-                showProgress();
-                hideError();
-                actionBlocker.blockActions();
-                let formData = $('#login-submit-form').serializeArray().reduce(function (obj, item) {
-                    obj[item.name] = item.value;
-                    return obj;
-                }, {});
-
-                delete formData['pgf02'];
-
-                $.ajax({
-                    type: 'POST',
-                    url: "https://faisanet.mib.com.mv/aAuth/getAuthType",
-                    data: formData,
-                    success: function (data, textStatus, request) {
-                        actionBlocker.unblockActions();
-                        //hideProgress();
-                        let responseData = (JSON.parse(request.responseText));
-                        let loginTypeParams = responseData['data'][0];
-                        console.log(data, textStatus, request);
-                        console.log(loginTypeParams);
-                        if (loginTypeParams['loginType'] == 0) {
-                            requestSimpleAuth();
-                        } else {
-                            requestXAuth(loginTypeParams);
-                        }
-
-                    },
-                    error: function (request, textStatus, errorThrown) {
-                        actionBlocker.unblockActions();
-                        hideProgress();
-
-
-
-                        let responseData = (JSON.parse(request.responseText));
-                        displayError(responseData.reasonText);
-
-
-
-
-                    }
-                });
-            };
-
-            let get256Hash = function (text) {
-                const shaObj = new jsSHA("SHA-256", "TEXT", {encoding: "UTF8"});
-                /* .update() can be chained */
-                //shaObj.update("This is").update(" a ");
-                shaObj.update(text);
-                const hash = shaObj.getHash("HEX");
-                return hash.toUpperCase();
-            };
-            
-            
-            function getSalt(length) {
-                let result = '';
-                const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-                const charactersLength = characters.length;
-                let counter = 0;
-                while (counter < length) {
-                  result += characters.charAt(Math.floor(Math.random() * charactersLength));
-                  counter += 1;
-                }
-                return result;
-            }
-
-
-
-            let getHashedLoginParams = function (userSalt) {
-                
-                let formData = $('#login-submit-form').serializeArray().reduce(function (obj, item) {
-                    obj[item.name] = item.value;
-                    return obj;
-                }, {});
-                
-                let clientSalt = getSalt(32);
-                let hashedpw = get256Hash (clientSalt + get256Hash(get256Hash(formData['pgf02']) + userSalt));
-                delete formData['pgf02'];
-                formData['pgf03']= hashedpw;
-                formData['clientSalt'] = clientSalt;
-                return formData;
-                
-                
-
-            };
-
-            let requestXAuth = function (loginTypeParams) {
-                showProgress();
-                hideError();
-                actionBlocker.blockActions();
-                let hashedLoginParams = getHashedLoginParams(loginTypeParams['userSalt']);
-
-
-
-                $.ajax({
-                    type: 'POST',
-                    url: "https://faisanet.mib.com.mv/aAuth/xAuth",
-                    data: hashedLoginParams,
-                    success: function (data, textStatus, request) {
-                        actionBlocker.unblockActions();
-                        //hideProgress();
-                        let responseData = (JSON.parse(request.responseText));
-                        console.log(data, textStatus, request);
-                        console.log(responseData);
-
-                        hideProgress();
-
-
-                        if (responseData.otpVerified == 0) {
-                            window.location = 'https://faisanet.mib.com.mv/auth2FA';
-                            return;
-                        }
-
-                        let landingPageOption = responseData.landingPage;
-                        let landingPage = getLandingPage(landingPageOption);
-
-
-                        switch (responseData.reasonCode) {
-                            case "101":
-                            {
-                                //individual account login
-                                window.location = landingPage;
-                                break;
-                            }
-                            case "102":
-                            {
-                                //profiles
-                                window.location = "https://faisanet.mib.com.mv/profiles";
-                                break;
-
-                            }
-                            default:
-                            {
-
-                                //profiles
-                                window.location = "https://faisanet.mib.com.mv/profiles";
-
-                            }
-                        }
-                    },
-                    error: function (request, textStatus, errorThrown) {
-                        actionBlocker.unblockActions();
-                        hideProgress();
-
-
-
-                        let responseData = (JSON.parse(request.responseText));
-                        displayError(responseData.reasonText);
-
-
-
-
-                    }
-                });
-            };
-
-
-
-
-            let requestSimpleAuth = function () {
-                showProgress();
-                hideError();
-                actionBlocker.blockActions();
-                let formData = $('#login-submit-form').serializeArray().reduce(function (obj, item) {
-                    obj[item.name] = item.value;
-                    return obj;
-                }, {});
-
-
-                $.ajax({
-                    type: 'POST',
-                    url: "https://faisanet.mib.com.mv/aAuth",
-                    data: formData,
-                    success: function (data, textStatus, request) {
-                        actionBlocker.unblockActions();
-                        //hideProgress();
-                        let responseData = (JSON.parse(request.responseText));
-                        console.log(data, textStatus, request);
-                        console.log(responseData);
-
-                        hideProgress();
-
-
-                        if (responseData.otpVerified == 0) {
-                            window.location = 'https://faisanet.mib.com.mv/auth2FA';
-                            return;
-                        }
-
-                        let landingPageOption = responseData.landingPage;
-                        let landingPage = getLandingPage(landingPageOption);
-
-
-                        switch (responseData.reasonCode) {
-                            case "101":
-                            {
-                                //individual account login
-                                window.location = landingPage;
-                                break;
-                            }
-                            case "102":
-                            {
-                                //profiles
-                                window.location = "https://faisanet.mib.com.mv/profiles";
-                                break;
-
-                            }
-                            default:
-                            {
-
-                                //profiles
-                                window.location = "https://faisanet.mib.com.mv/profiles";
-
-                            }
-                        }
-                    },
-                    error: function (request, textStatus, errorThrown) {
-                        actionBlocker.unblockActions();
-                        hideProgress();
-
-
-
-                        let responseData = (JSON.parse(request.responseText));
-                        displayError(responseData.reasonText);
-
-
-
-
-                    }
-                });
-            };
-
-
-
-
-            $("#login-submit").click(function (e) {
-                $('#error-info').hide('slow');
-                e.preventDefault();
-                requestAuthType();
-                //hashPassword();
-                //requestSimpleAuth();
-
-            });

compose.yml

@@ -0,0 +1,12 @@
+services:
+  keepalive:
+    env_file: .env
+    image: git.shihaam.dev/shihaam/mib-payment-verify/keepalive
+ cookieserver:
+    env_file: .env
+    image: git.shihaam.dev/shihaam/mib-payment-verify/cookieserver
+  api:
+    env_file: .env
+    image: git.shihaam.dev/shihaam/mib-payment-verify/api
+    ports:
+      - 5000:5000

fetchname.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+source .env 2> /dev/null
+
+accountNo=$1
+
+COOKIE=$(curl -s $COOKIE_SERVER/getcookie)
+IBSID=$(echo $COOKIE | jq -r .IBSID)
+QL_0=$(echo $COOKIE | jq -r .ql_0)
+
+curl -s 'https://faisanet.mib.com.mv/ajaxBeneficiary/getAccountName' \
+  -H "cookie: ql_0=${QL_0}; IBSID=${IBSID}" \
+  --data-raw "accountNo=${accountNo}"

generate_totp.py

@@ -1,6 +0,0 @@
-import pyotp
-import sys
-
-seed = sys.argv[1]
-totp = pyotp.TOTP(seed)
-print(totp.now())

getcookie.py

@@ -0,0 +1,158 @@
+from flask import Flask, jsonify, request
+import os
+import pyotp
+import time
+from urllib.parse import urlencode
+from bs4 import BeautifulSoup
+import requests
+from dotenv import load_dotenv
+
+class MIBLogin:
+    def __init__(self):
+        self.base_url = "https://faisanet.mib.com.mv"
+        self.headers = {
+            "User-Agent": "Mozilla/5.0 (ismath-said-will) give-real-api/so-i-wont-have-to-do-this AppleWebKit/537.36 (KHTML, like Gecko) Safari/537.36",
+            "Accept": "*/*"
+        }
+        self.last_cookie = None
+        self.last_renewal_time = 0
+        self.create_new_session()
+
+    def create_new_session(self):
+        self.session = requests.Session()
+
+    def get_login_page(self):
+        response = self.session.get(f"{self.base_url}/auth", headers=self.headers)
+        soup = BeautifulSoup(response.text, 'html.parser')
+        rtag_input = soup.find('input', {'name': 'rTag'})
+        if not rtag_input:
+            raise ValueError("Failed to find rTag input field in login page.")
+        return rtag_input['value']
+
+    def get_auth_type(self, rtag, username, retain=1):
+        data = {'rTag': rtag, 'pgf01': username, 'retain': retain}
+        headers = {**self.headers, 'Content-Type': 'application/x-www-form-urlencoded'}
+        response = self.session.post(
+            f"{self.base_url}/aAuth/getAuthType",
+            headers=headers,
+            data=urlencode(data)
+        )
+        return response.json()
+
+    def login(self, username, password, retain=1):
+        rtag = self.get_login_page()
+        self.get_auth_type(rtag, username, retain)
+
+        data = {'rTag': rtag, 'pgf01': username, 'pgf02': password, 'retain': retain}
+        headers = {**self.headers, 'Content-Type': 'application/x-www-form-urlencoded'}
+        self.session.post(
+            f"{self.base_url}/aAuth",
+            headers=headers,
+            data=urlencode(data)
+        )
+
+    def auth_2fa(self, totp_seed):
+        self.session.get(f"{self.base_url}/auth2FA", headers=self.headers)
+        totp = pyotp.TOTP(totp_seed)
+
+        data = {'otpType': 3, 'otp': totp.now()}
+        headers = {**self.headers, 'Content-Type': 'application/x-www-form-urlencoded'}
+        self.session.post(
+            f"{self.base_url}/aAuth2FA/verifyOTP",
+            headers=headers,
+            data=urlencode(data)
+        )
+
+        cookies = {
+            cookie.name: cookie.value 
+            for cookie in self.session.cookies 
+            if cookie.name in ['IBSID', 'ql_0']
+        }
+        self.last_cookie = cookies
+        self.last_renewal_time = time.time()
+        return cookies
+
+    def get_profile_rtag(self):
+        url = f"{self.base_url}/profiles"
+        response = self.session.get(url, headers=self.headers)
+        if response.status_code == 200:
+            soup = BeautifulSoup(response.text, 'html.parser')
+            profile_card = soup.find('div', {'class': 'card profile-card smooth smooth-shadow'})
+            if profile_card:
+                return profile_card.get('data-rt')
+            else:
+                raise ValueError("Failed to fetch profile rTag.")
+        else:
+            raise ValueError(f"Failed to retrieve profiles page. Status code: {response.status_code}")
+
+    def switch_profile(self, profile_id, profile_type):
+        rtag = self.get_profile_rtag()
+        url = f"{self.base_url}/aProfileHandler/switchProfile"
+        data = {'rTag': rtag, 'profileId': profile_id, 'profileType': profile_type}
+        headers = {**self.headers, 'Content-Type': 'application/x-www-form-urlencoded'}
+
+        response = self.session.post(url, headers=headers, data=urlencode(data))
+        if response.status_code == 200:
+            result = response.json()
+            if result.get("success"):
+                print("Profile switched successfully.")
+            else:
+                raise ValueError("Failed to switch profile: " + result.get("reasonText", "Unknown error"))
+        else:
+            raise ValueError(f"Profile switch failed with status code: {response.status_code}")
+
+    def clear_cookie(self):
+        self.last_cookie = None
+        self.create_new_session()
+
+# Initialize Flask app
+app = Flask(__name__)
+mib = MIBLogin()
+load_dotenv()
+
+def renew_cookie_internal():
+    try:
+        print(f"Starting cookie renewal process...")
+        mib.clear_cookie()
+        mib.login(os.getenv('USERNAME'), os.getenv('PASSWORD'))
+        cookies = mib.auth_2fa(os.getenv('TOTP_SEED'))
+
+        # Profile selection after successful login and 2FA
+        mib.switch_profile(os.getenv('PROFILE_ID'), os.getenv('PROFILE_TYPE'))
+        print(f"Cookie renewal and profile switch completed successfully")
+        return cookies
+    except Exception as e:
+        print(f"Error during cookie renewal: {str(e)}")
+        return {"error": str(e)}
+
+@app.route('/getcookie', methods=['GET'])
+def get_cookie():
+    client_ip = request.remote_addr
+    print(f"Providing cookie to: {client_ip}")
+
+    if mib.last_cookie:
+        return jsonify(mib.last_cookie)
+    else:
+        cookies = renew_cookie_internal()
+        if "error" in cookies:
+            return jsonify(cookies), 500
+        return jsonify(cookies)
+
+@app.route('/newcookie', methods=['GET'])
+def new_cookie():
+    client_ip = request.remote_addr
+    current_time = time.time()
+
+    # Check if less than 60 seconds since last renewal
+    if current_time - mib.last_renewal_time < 60:
+        print(f"Providing existing cookie to {client_ip} (last renewal was {int(current_time - mib.last_renewal_time)} seconds ago)")
+        return jsonify(mib.last_cookie)
+
+    print(f"Renewing cookie as requested by: {client_ip}")
+    cookies = renew_cookie_internal()
+    if "error" in cookies:
+        return jsonify(cookies), 500
+    return jsonify(cookies)
+
+if __name__ == '__main__':
+    app.run(host='0.0.0.0', port=5000)

keepalive.sh

@@ -1,16 +1,40 @@
 #!/bin/bash
 
-if [ -f .env ]; then
-   source .env
-else
-   echo .env file not found, using env
-fi
+request_new_cookie(){
+curl -s $COOKIE_SERVER/newcookie > /dev/null
+}
 
 while true; do
+    source .env 2> /dev/null
 
-curl 'https://faisanet.mib.com.mv/aProfile/keepAlive' \
-  -X 'POST' \
-  -H "cookie: prefTheme=1; ql_0=${QL_0}; IBSID=${IBSID}; dashboardStatsMode=1; _zwaf_ua=Brave; time-tracker=600"
+    # Get current date and time
+    CURRENT_TIME=$(date -u '+%Y-%m-%dT%H:%M:%S.%3NZ')
 
-sleep 30
+    COOKIE=$(curl -s $COOKIE_SERVER/getcookie)
+    IBSID=$(echo $COOKIE | jq -r .IBSID)
+    QL_0=$(echo $COOKIE | jq -r .ql_0)
+
+    # Make the keep-alive request
+    KEEP_ALIVE=$(curl -s 'https://faisanet.mib.com.mv/aProfile/keepAlive' \
+        -X 'POST' \
+        -H "cookie: ql_0=${QL_0}; IBSID=${IBSID}")
+
+    # Check for session expiration
+    SUCCESS=$(echo "$KEEP_ALIVE" | jq -r .success)
+    RESPONSE_CODE=$(echo "$KEEP_ALIVE" | jq -r .responseCode)
+
+    if [[ "$SUCCESS" == "false" && "$RESPONSE_CODE" == "3" ]]; then
+        echo "Session expired. Requesting new cookie..."
+        request_new_cookie
+        continue # Restart the loop
+    fi
+
+    # Remove the last closing brace from KEEP_ALIVE
+    KEEP_ALIVE_MODIFIED=${KEEP_ALIVE%?}
+
+    # Combine timestamp with the keep-alive response
+    echo "$KEEP_ALIVE_MODIFIED, \"timestamp\":\"$CURRENT_TIME\"}"
+
+    # Sleep for the specified duration
+    sleep $SLEEP
 done

tx.sh

@@ -1,12 +1,13 @@
 #!/bin/bash
 
-if [ -f .env ]; then
-   source .env
-else
-   echo .env file not found, using env
-fi
+source .env 2> /dev/null
+
+COOKIE=$(curl -s $COOKIE_SERVER/getcookie)
+IBSID=$(echo $COOKIE | jq -r .IBSID)
+QL_0=$(echo $COOKIE | jq -r .ql_0)
 
 curl 'https://faisanet.mib.com.mv/ajaxAccounts/trxHistory' \
-  -H "cookie: prefTheme=1; ql_0=${QL_0}; IBSID=${IBSID}; dashboardStatsMode=1; _zwaf_ua=Brave" \
-  --data-raw 'accountNo=90101400028321000&trxNo=&trxType=0&sortTrx=date&sortDir=desc&fromDate=&toDate=&start=1&end=2&includeCount=1' -s \
-  | sed 's/"benefName":"BML - /"benefName":"/g'
+  -H "cookie: ql_0=${QL_0}; IBSID=${IBSID}" \
+  --data-raw "accountNo=${ACCOUNT_NUMBER}&trxNo=&trxType=0&sortTrx=date&sortDir=desc&fromDate=&toDate=&start=1&end=20&includeCount=1" -s \
+  | sed 's/"benefName":"BML - /"benefName":"/g' \
+  | jq '.data |= map(select(.baseAmount | tonumber > 0))'