Update rac_check.py

app/__init__.py

@@ -1,21 +1,17 @@
-from flask import Flask, jsonify
+from flask import Flask
 import os
 from flask_swagger_ui import get_swaggerui_blueprint
 from flask_cors import CORS
 from app.config import Config
-from app.api.routes import api, auth_bp
+from app.api.routes import api
 from app.errors import register_error_handlers
-from flask_jwt_extended import JWTManager
 
 def create_app():
     """ Factory function to create a Flask app instance """
     app = Flask(__name__)
-    
-   
 
     # Load configuration
     app.config.from_object(Config)
-    jwt = JWTManager(app)
 
     CORS(app)
 
@@ -25,36 +21,11 @@ def create_app():
 
     # Register blueprints with /api prefix for the main API routes
     app.register_blueprint(api, url_prefix='/api')
-    # Register blueprints with /auth prefix for the authentication routes
-    app.register_blueprint(auth_bp, url_prefix='/api/Auth')
 
     swagger_ui_blueprint = get_swaggerui_blueprint(SWAGGER_URL, API_URL)
     app.register_blueprint(swagger_ui_blueprint, url_prefix=SWAGGER_URL)
-    
-    def jwt_error(message, code=401):
-        return jsonify({
-            "status": "error",
-            "message": message
-        }), code
 
 
-    @jwt.unauthorized_loader
-    def unauthorized_response(callback):
-        return jwt_error("Unauthorized access")
-
-    @jwt.expired_token_loader
-    def expired_token_callback(jwt_header, jwt_payload):
-        return jwt_error("Expired token")
-
-    @jwt.invalid_token_loader
-    def invalid_token_callback(error):
-        return jwt_error("Invalid authentication token.", 422)
-
-    @jwt.revoked_token_loader
-    def revoked_token_callback(jwt_header, jwt_payload):
-        return jwt_error("This token has been revoked. Please log in again.")
-
-   
     # Error Handlers
     register_error_handlers(app)
 

app/api/middlewares/__init__.py

@@ -1,3 +1,3 @@
 from .verify_api_key import require_api_key
 from .app_id_checker import require_app_id
-from .cors import enforce_json
+from .cors import enforce_json

app/api/middlewares/cors.py

@@ -1,5 +1,4 @@
 from flask import request, jsonify
-from app.utils.logger import logger
 
 
 def enforce_json():

app/api/routes/__init__.py

@@ -1,2 +1 @@
 from .routes import api 
-from .authentication import auth_bp

app/api/routes/authentication.py

@@ -1,24 +0,0 @@
-from flask import Blueprint, request, jsonify
-from app.utils.logger import logger
-from app.api.middlewares import  enforce_json
-from app.api.services.generate_token import GenerateTokenService
-
-
-auth_bp = Blueprint("api/Auth", __name__)
-
-# Enforce json
-@auth_bp.before_request
-def cors_middleware():
-    """Middleware applied globally to all API routes in this blueprint"""
-    return enforce_json()
-
-@auth_bp.route('/generate-token', methods=['POST'])
-def get_token():
-    try:
-        data = request.get_json()
-        logger.info(f"GenerateToken request received: {data}")
-        response = GenerateTokenService.process_request(data)
-        return response
-    except Exception as e:
-        logger.exception("Unhandled exception in /GenerateToken route", exc_info=e)
-        return jsonify({"message": "Unhandled server error"}), 500

app/api/routes/routes.py

@@ -1,5 +1,4 @@
 from flask import Flask, Blueprint, request, jsonify,  send_from_directory
-import sys
 import os
 from app.api.services import (
     RACCheckService,
@@ -14,10 +13,7 @@ from app.api.services import (
     CompleteRACcheckService
 )
 from app.utils.logger import logger
-from app.api.middlewares import  enforce_json
-from flask_jwt_extended import (jwt_required)
-
-
+from app.api.middlewares import require_api_key, require_app_id, enforce_json 
 
 
 api = Blueprint("api", __name__)
@@ -45,11 +41,10 @@ def serve_paths(filename):
 
 # RACCheck Endpoint
 @api.route('/rac-check', methods=['POST'])
-@jwt_required()
+@require_api_key
+@require_app_id
 def rac_check():
-    logger.info("RACCheck request received")
     try:
-        logger.info("RACCheck inside try request received")
         data = request.get_json()
         response = RACCheckService.process_request(data)
         return response
@@ -59,7 +54,8 @@ def rac_check():
 
 # CompleteRACcheck Endpoint
 @api.route('/CompleteRACcheck', methods=['POST'])
-@jwt_required()
+@require_api_key
+@require_app_id
 def complete_rac_check():
     try:
         data = request.get_json()
@@ -71,7 +67,8 @@ def complete_rac_check():
 
 # Disbursement Endpoint
 @api.route('/DisburseLoan', methods=['POST'])
-@jwt_required()
+@require_api_key
+@require_app_id
 def disbursement():
     try:
         data = request.get_json()
@@ -84,7 +81,8 @@ def disbursement():
 
 # CollectLoan Endpoint
 @api.route('/CollectLoan', methods=['POST'])
-@jwt_required()
+@require_api_key
+@require_app_id
 def collect_loan():
     try:
         data = request.get_json()
@@ -97,7 +95,8 @@ def collect_loan():
 
 # TransactionVerify Endpoint
 @api.route('/TransactionVerify', methods=['POST'])
-@jwt_required()
+@require_api_key
+@require_app_id
 def transaction_verify():
     try:
         data = request.get_json()
@@ -110,7 +109,8 @@ def transaction_verify():
 
 # PenalCharge Endpoint
 @api.route('/CollectPenalFee', methods=['POST'])
-@jwt_required()
+@require_api_key
+@require_app_id
 def penal_charge():
     try:
         data = request.get_json()
@@ -124,7 +124,8 @@ def penal_charge():
 
 # RevokeEnableConsent Endpoint
 @api.route('/RevokeEnableConsent', methods=['POST'])
-@jwt_required()
+@require_api_key
+@require_app_id
 def revoke_enable_consent():
     data = request.get_json()
     # logger.info(f"RevokeEnableConsent request received: {data}")
@@ -133,7 +134,8 @@ def revoke_enable_consent():
 
 # TokenValidation Endpoint
 @api.route('/TokenValidation', methods=['POST'])
-@jwt_required()
+@require_api_key
+@require_app_id
 def token_validation():
     data = request.get_json()
     # logger.info(f"TokenValidation request received: {data}")
@@ -142,7 +144,8 @@ def token_validation():
 
 # LienCheck Endpoint
 @api.route('/LienCheck', methods=['POST'])
-@jwt_required()
+@require_api_key
+@require_app_id
 def lien_check():
     data = request.get_json()
     # logger.info(f"LienCheck request received: {data}")
@@ -151,42 +154,15 @@ def lien_check():
 
 # NewTransactionCheck Endpoint
 @api.route('/NewTransactionCheck', methods=['POST'])
-@jwt_required()
+@require_api_key
+@require_app_id
 def new_transaction_check():
     data = request.get_json()
     # logger.info(f"NewTransactionCheck request received: {data}")
     response = NewTransactionCheckService.process_request(data)
     return response
 
-
 # Health Check Endpoint
-@api.route('/system-health-check', methods=['GET'])
-@jwt_required()
+@api.route('/health', methods=['GET'])
 def health_check():
-    """Basic system health check"""
-    try:
-        checks = {
-            "python_version": sys.version_info >= (3, 6), 
-            "disk_space": os.statvfs('/').f_bavail * os.statvfs('/').f_frsize > 500 * 1024 * 1024, 
-            "system_operational": True
-        }
-        
-        if all(checks.values()):
-            return jsonify({
-                "status": "Active",
-                "responseCode": "00",
-                "responseMessage": "Successful"
-            }), 200
-        else:
-            return jsonify({
-                "status": "Degraded",
-                "responseCode": "01",
-                "responseMessage": "System check failed"
-            }), 200
-            
-    except Exception as e:
-        return jsonify({
-            "status": "Error",
-            "responseCode": "99",
-            "responseMessage": f"Health check failed: {str(e)}"
-        }), 500
+    return {"status": "ok"} , 200

app/api/schemas/collect_loan.py

@@ -16,20 +16,15 @@ class CollectLoanSchema(Schema):
     comment = fields.Str(allow_none=True)          
 
 class CollectLoanResponseSchema(Schema):
+    responseCode = fields.Str(allow_none=True)
+    responseDescr = fields.Str(allow_none=True)
+    fullDescription = fields.Str(allow_none=True)
     transactionId = fields.Str(allow_none=True)
-    fbnTransactionId = fields.Str(allow_none=True)
     debtId = fields.Str(allow_none=True)
     customerId = fields.Str(allow_none=True)
     accountId = fields.Str(allow_none=True)
     productId = fields.Str(allow_none=True)
     amountCollected = fields.Float(required=True)
-    interestCollected = fields.Float(required=True)
-    penalChargeCollected = fields.Float(required=True)
-    lienAmount = fields.Float(required=True)
     countryId = fields.Str(allow_none=True)
     comment = fields.Str(allow_none=True)
-    responseCode = fields.Str(allow_none=True)
     responseMessage = fields.Str(allow_none=True)
-    responseDescr = fields.Str(allow_none=True)
-    fullDescription = fields.Str(allow_none=True)
-

app/api/schemas/disbursement.py

@@ -2,7 +2,7 @@ from marshmallow import Schema, fields
 
 class DisbursementSchema(Schema):
     transactionId = fields.Str(required=False, allow_none=True)
-    fbnTransactionId = fields.Str(required=False, allow_none=True)
+    FbnTransactionId = fields.Str(required=False, allow_none=True)
     debtId = fields.Str(required=False, allow_none=True)
     customerId = fields.Str(required=False, allow_none=True)
     accountId = fields.Str(required=False, allow_none=True)
@@ -14,7 +14,6 @@ class DisbursementSchema(Schema):
     collectAmountVAT = fields.Float(required=True)
     countryId = fields.Str(required=False, allow_none=True)
     comment = fields.Str(required=False, allow_none=True)
-    
 
 
 class DisburseLoanResponseSchema(Schema):
@@ -32,12 +31,5 @@ class DisburseLoanResponseSchema(Schema):
     countryId = fields.Str(allow_none=True)
     responseCode = fields.Str(allow_none=True)
     responseMessage = fields.Str(allow_none=True)
-    disburseResult = fields.Str(allow_none=True)
-    disburseDate = fields.Str(allow_none=True)
-    disburseVerify = fields.Str(allow_none=True)
-    disburseDescription = fields.Str(allow_none=True)
-    verifyResult = fields.Str(allow_none=True)
-    verifyDescription = fields.Str(allow_none=True)
-    
 
     

app/api/schemas/generate_token.py

@@ -1,18 +0,0 @@
-from marshmallow import Schema, fields
-
-
-class GenerateTokenRequestSchema(Schema):
-    username = fields.Str(required=True)
-    password = fields.Str(required=True)
-    grant_type = fields.Str(required=True)
-    
-
-class GenerateTokenResponseSchema(Schema):
-    access_token = fields.Str(required=True)
-    token_type = fields.Str(required=True)
-    expires_in = fields.Int(required=True)
-    userName = fields.Str(required=False, allow_none=True)
-    ipaddress = fields.Str(required=False, allow_none=True)
-    errorMessage = fields.Str(required=False, allow_none=True)
-    issued = fields.DateTime(required=False, allow_none=True)
-    expires = fields.DateTime(required=False, allow_none=True)

app/api/services/__init__.py

@@ -8,4 +8,3 @@ from app.api.services.token_validation import TokenValidationService
 from app.api.services.lien_check import LienCheckService
 from app.api.services.new_transaction_check import NewTransactionCheckService
 from app.api.services.complete_rac_check_service import CompleteRACcheckService
-from app.api.services.generate_token import GenerateTokenService

app/api/services/collect_loan.py

@@ -1,23 +1,21 @@
-import random
 from flask import request, jsonify
 from marshmallow import ValidationError
 from app.utils.logger import logger
 from app.api.helpers.response_helper import ResponseHelper
-from app.api.schemas.collect_loan import CollectLoanSchema, CollectLoanResponseSchema
-from app.config import Config
+from app.api.schemas.collect_loan import CollectLoanSchema, CollectLoanResponseSchema   
 
-"""
-Process the CollectLoan request.
-
-Args:
-    data (dict): The request data.
-
-Returns:
-    tuple: JSON response and status code.
-"""
 class CollectLoanService:
     @staticmethod
     def process_request(data):
+        """
+        Process the CollectLoan request.
+
+        Args:
+            data (dict): The request data.
+
+        Returns:
+            tuple: JSON response and status code.
+        """
         try:
             logger.info("Processing CollectLoan request")
 
@@ -25,63 +23,21 @@ class CollectLoanService:
             schema = CollectLoanSchema()
             validated_data = schema.load(data)
 
-            amountForCollection =  validated_data.get("collectAmount")
-            productId = validated_data.get("productId")
-            customerId = validated_data.get("customerId")
-            amountCollected = amountForCollection
-            responseDescr= "Loan Collection Successful EMULATOR"
-            fullDescription= "Loan collection completed successfully EMULATOR"
-            responseMessage= "Loan collection completed successfully EMULATOR"
-            interestCollected = amountForCollection * 0.03 
-            lienAmount = validated_data.get("lienAmount", 0)
-
-            isValid = not (
-                int(customerId[-1]) in [2, 7, 9]
-            )
-            if Config.MIN_AMOUNT_FOR_COLLECTION <= amountForCollection <= Config.MAX_AMOUNT_FOR_COLLECTION:
-                amountCollected = amountForCollection if lienAmount >= amountForCollection else 0
-                responseDescr = "Partial Loan Collection Successful EMULATOR"
-                fullDescription = "Partial Loan collection completed successfully EMULATOR"
-                responseMessage = "Partial Loan collection completed successfully EMULATOR"
-
-                response_data = {
-                    "transactionId": validated_data.get("transactionId"),
-                    "fbnTransactionId": validated_data.get("fbnTransactionId"),
-                    "debtId": validated_data.get("debtId"),
-                    "customerId": validated_data.get("customerId"),
-                    "accountId": validated_data.get("accountId"),
-                    "productId": validated_data.get("productId"),
-                    "amountCollected": amountCollected,
-                    "interestCollected": interestCollected,
-                    "penalChargeCollected": 0,
-                    "lienAmount": lienAmount if amountCollected == 0 else 0,
-                    "countryId": validated_data.get("countryId"),
-                    "comment": validated_data.get("comment", "Testing CollectionLoanRequest EMULATOR"),
-                    "responseCode": "00",
-                    "responseDescr": responseDescr,
-                    "fullDescription": fullDescription,
-                    "responseMessage": responseMessage
-                }
-
-            else:
-                response_data = {
-                    "transactionId": validated_data.get("transactionId"),
-                    "fbnTransactionId": validated_data.get("fbnTransactionId"),
-                    "debtId": validated_data.get("debtId"),
-                    "customerId": validated_data.get("customerId"),
-                    "accountId": validated_data.get("accountId"),
-                    "productId": validated_data.get("productId"),
-                    "amountCollected": amountCollected,
-                    "interestCollected": interestCollected,
-                    "penalChargeCollected": 0,
-                    "amountCollected": amountCollected,
-                    "countryId": validated_data.get("countryId"),
-                    "comment": validated_data.get("comment", "Testing CollectionLoanRequest EMULATOR"),
-                    "responseCode": "00",
-                    "responseDescr": responseDescr,
-                    "fullDescription": fullDescription,
-                    "responseMessage": responseMessage
-                }
+            # Simulated processing logic
+            response_data = {
+                "transactionId": validated_data.get("transactionId", "T002"),
+                "debtId": validated_data.get("debtId", "273194670"),
+                "customerId": validated_data.get("customerId", "CN621868"),
+                "accountId": validated_data.get("accountId", "2017821799"),
+                "productId": validated_data.get("productId", "101"),
+                "amountCollected": validated_data.get("collectAmount", 60000.00),
+                "countryId": validated_data.get("countryId", "01"),
+                "comment": validated_data.get("comment", "Testing CollectionLoanRequest"),
+                "responseCode": "00",
+                "responseDescr": "Loan Collection Successful",
+                "fullDescription": "Loan collection completed successfully",
+                "responseMessage": "Loan collection completed successfully"
+            }
 
             # Validate and serialize the response data
             response_schema = CollectLoanResponseSchema()

app/api/services/disbursement.py

@@ -2,7 +2,6 @@ from flask import request, jsonify
 from marshmallow import ValidationError
 from app.utils.logger import logger
 from app.api.schemas.disbursement import DisbursementSchema, DisburseLoanResponseSchema
-import datetime
 
 class DisbursementService:
     @staticmethod
@@ -27,7 +26,7 @@ class DisbursementService:
             # For demo purposes, we simulate a response using the validated data
             response_data = {
                 "transactionId": validated_data.get("transactionId"),
-                "fbnTransactionId": validated_data.get("fbnTransactionId"),  # Example or generated value
+                "FbnTransactionId": validated_data.get("FbnTransactionId"),  # Example or generated value
                 "debtId": validated_data.get("debtId"),
                 "customerId": validated_data.get("customerId"),
                 "accountId": validated_data.get("accountId"),
@@ -39,13 +38,7 @@ class DisbursementService:
                 "collectAmountVAT": validated_data.get("collectAmountVAT"),
                 "countryId": validated_data.get("countryId"),
                 "responseCode": "00",  # success code example
-                "responseMessage": "Loan Request Completed Successfully!",
-                "disburseVerify": datetime.datetime.now().isoformat(),
-                "verifyResult": "00",
-                "verifyDescription": "Collect Status retrieved successfully.",
-                "disburseDate": datetime.datetime.now().isoformat(),
-                "disburseResult": "00",
-                "disburseDescription": "Loan Request Completed Successfully!",
+                "responseMessage": "Loan Request Completed Successfully!"
             }
 
             # Serialize response

app/api/services/generate_token.py

@@ -1,89 +0,0 @@
-import datetime
-from datetime import timedelta
-from flask import request, jsonify
-from marshmallow import ValidationError
-from app.utils.logger import logger
-from app.api.helpers.response_helper import ResponseHelper
-from app.api.schemas.generate_token import GenerateTokenRequestSchema, GenerateTokenResponseSchema
-from app.config import Config
-from flask_jwt_extended import (
-    create_access_token,
-)
-
-
-class GenerateTokenService:
-    USERNAME = Config.BANK_CALL_BASIC_AUTH_USERNAME
-    PASSWORD = Config.BANK_CALL_BASIC_AUTH_PASSWORD
-    TYPE = Config.BANK_GRANT_TYPE
-    @staticmethod
-    def process_request(data):
-        """
-        Process the GenerateToken request.
-
-        Args:
-            data (dict): The request JSON payload.
-
-        Returns:
-            tuple: (JSON response, status code)
-        """
-        try:
-            logger.info("Processing GenerateToken request")
-
-            # Step 1: Validate input using schema
-            schema = GenerateTokenRequestSchema()
-            validated_data = schema.load(data)
-            
-            logger.info(f"Validated data: {validated_data}")
-
-            username = validated_data.get("username")
-            password = validated_data.get("password")
-            grant_type = validated_data.get("grant_type")
-            
-            if password != GenerateTokenService.PASSWORD or username != GenerateTokenService.USERNAME or grant_type != GenerateTokenService.TYPE:
-                return {
-                    "message": "Invalid credentials",
-                    "status": 401
-                }
-               
-            expires_in = 1800
-            identity = username
-            # Step 2: Generate JWT token
-            access_token = create_access_token(identity=identity, expires_delta=timedelta(seconds=expires_in))
-
-            # Step 3: Get client IP address
-            ipaddress = request.remote_addr or "127.0.0.1"
-
-            # Step 4: Build response timestamps
-            issued_time = datetime.datetime.utcnow()
-            expires_time = issued_time + datetime.timedelta(seconds=expires_in)
-
-            # Step 5: Construct response payload
-            response_data = {
-                "access_token": access_token,
-                "token_type": "bearer",
-                "expires_in": expires_in,
-                "userName": username,
-                "ipaddress": ipaddress,
-                "errorMessage": "",
-                "issued": issued_time,
-                "expires": expires_time
-            }
-
-            # Serialize with response schema
-            response_schema = GenerateTokenResponseSchema()
-            response_json = response_schema.dump(response_data)
-
-            return jsonify(response_json), 200
-
-        except ValidationError as err:
-            logger.error(f"Validation Error: {err.messages}")
-            return jsonify({
-                "message": "Validation exception",
-                "errors": err.messages
-            }), 422
-
-        except Exception as e:
-            logger.error(f"An error occurred while generating token: {str(e)}", exc_info=True)
-            return jsonify({
-                "message": "Internal Server Error"
-            }), 500

app/api/services/rac_check.py

@@ -25,64 +25,53 @@ class RACCheckService:
             schema = RACCheckSchema()
             validated_data = schema.load(data)
 
-            customer_id = validated_data["customerId"]
-            is_valid = True
-
-
-            try:
-                salary_count = int(str(customer_id)[-1]) + 1
-                if salary_count < 1 or salary_count > 6:
-                    salary_count = 3 
-            except ValueError:
-                salary_count = 3 
-
-            salary_payments = {}
-            total_salary = 0
-
-            for i in range(1, salary_count + 1):
-                salary = (((salary_count + i) * 7919) % 200000 + 10000) * 5
-                salary_payments[f"salarypaymenT_{i}"] = salary
-                total_salary += salary
-
-            average_salary = total_salary // salary_count if salary_count > 0 else 0
-
+            # Simulated RAC check logic — create racResponse manually or via logic
+            # rac_response = {
+            #     "hasSalaryAccount": True,
+            #     "bvnValidated": True,
+            #     "creditBureauCheck": False,
+            #     "crmsCheck": True,
+            #     "accountStatus": True,
+            #     "hasLien": False,
+            #     "noBouncedCheck": True,
+            #     "isWhitelisted": True,
+            #     "hasPastDueLoan": False
+            # }
 
             rac_response = {
                 "procesS_DATE": datetime.strptime("2025-06-05", "%Y-%m-%d").date(),
                 "ciF_ID": "416405737",
-                "customeR_id": customer_id,
+                "customeR_id": "7032744",
                 "salaccT_1": "4142904114",
                 "alerT_PHONE": "2348039301606",
-                "averagE_SALARY": average_salary,
+                "averagE_SALARY": 5000,
                 "loaN_OUSTANDING_BAL": 0,
                 "emi": 1000,
                 "eliG_AMT": 25000,
-                "rule1_45day_sal": is_valid,
-                "rule2_2m_sal": is_valid,
-                "rule3_no_bounced_check": is_valid,
-                "rule4_current_loan_payments": True if is_valid is False else is_valid,
-                "rule5_no_past_due_fadv_loan": is_valid,
-                "rule6_no_past_due_other_loan": is_valid,
-                "rule7_consistent_salary_amount": is_valid,
-                "rule8_whitelisted": True if is_valid is False else is_valid,
-                "rule9_regular_account": True if is_valid is False else is_valid,
-                "rule10_bvn_validation": is_valid,
-                "rule11_CRC_no_delinquency": is_valid,
-                "rule12_CRMS_no_delinquency": True if is_valid is False else is_valid,
-                "rule13_BVN_ignore": is_valid,
-                "rule14_no_lien": is_valid,
-                "rule15_null_ignore": True if is_valid is False else is_valid,
-                "overalL_ELIG": is_valid
-                # "salarypaymenT_1": 180000,
-                # "salarypaymenT_2": 50000,
-                # "salarypaymenT_3": 70000,
-                # "salarypaymenT_4": 0,
-                # "salarypaymenT_5": 0,
-                # "salarypaymenT_6": 0
+                "rule1_45day_sal": True,
+                "rule2_2m_sal": True,
+                "rule3_no_bounced_check": True,
+                "rule4_current_loan_payments": True,
+                "rule5_no_past_due_fadv_loan": True,
+                "rule6_no_past_due_other_loan": True,
+                "rule7_consistent_salary_amount": True,
+                "rule8_whitelisted": True,
+                "rule9_regular_account": True,
+                "rule10_bvn_validation": True,
+                "rule11_CRC_no_delinquency": True,
+                "rule12_CRMS_no_delinquency": True,
+                "rule13_BVN_ignore": True,
+                "rule14_no_lien": True,
+                "rule15_null_ignore": True,
+                "overalL_ELIG": True,
+                "salarypaymenT_1": 180000,
+                "salarypaymenT_2": 50000,
+                "salarypaymenT_3": 70000,
+                "salarypaymenT_4": 0,
+                "salarypaymenT_5": 0,
+                "salarypaymenT_6": 0
             }
 
-            rac_response.update(salary_payments)
-
 
             full_response = {
                 "transactionId": validated_data["transactionId"],

app/config.py

@@ -1,7 +1,5 @@
 import os
-from re import M
 from dotenv import load_dotenv
-from datetime import timedelta
 
 class Config:
     """Base configuration for Flask app"""
@@ -10,15 +8,8 @@ class Config:
     API_URL = '/api/swagger.json'
 
     DEBUG = True
-    JWT_SECRET_KEY = os.getenv("JWT_SECRET_KEY", "753fc155-6a63-4314-bd97-ae91d61dbafe")
-    JWT_ACCESS_TOKEN_EXPIRES = timedelta(seconds=int(os.getenv("JWT_ACCESS_TOKEN_EXPIRES", 1800)))
     VALID_APP_ID = os.getenv("VALID_APP_ID", "app1")
     VALID_API_KEY = os.getenv("VALID_API_KEY", "test-api-key-12345")
-    MIN_AMOUNT_FOR_COLLECTION = int(os.getenv("MIN_AMOUNT_FOR_COLLECTION", 10000))
-    MAX_AMOUNT_FOR_COLLECTION = int(os.getenv("MAX_AMOUNT_FOR_COLLECTION", 25000))
-    BANK_CALL_BASIC_AUTH_USERNAME = os.environ.get("BANK_CALL_BASIC_AUTH_USERNAME", "simbrella")
-    BANK_CALL_BASIC_AUTH_PASSWORD = os.environ.get("BANK_CALL_BASIC_AUTH_PASSWORD", "G7$k9@pL2!qR")
-    BANK_GRANT_TYPE = os.getenv("BANK_GRANT_TYPE", "password")
 
     # SQLALCHEMY_DATABASE_URI =os.environ.get("DATABASE_URL", "database_url")
     # SQLALCHEMY_TRACK_MODIFICATIONS = False

app/swagger/digifi_swagger.json

@@ -28,15 +28,6 @@
     }
   ],
   "tags": [
-    {
-       "name": "Auth",
-      "description": "Get access token for verification",
-      "externalDocs": {
-        "description": "Find out more",
-        "url": "https://www.simbrellang.net"
-      }
-
-    },
     {
       "name": "RACCheck",
       "description": "Risk Acceptance Criteria Request",
@@ -119,12 +110,6 @@
     }
   ],
   "paths": {
-    "/api/Auth/generate-token": {
-      "$ref": "swagger/paths/GenerateToken.json"
-    },
-    "/api/system-health-check": {
-     "$ref": "swagger/paths/HealthCheck.json"
-    },
     "/api/rac-check": {
       "$ref": "swagger/paths/RACCheck.json"
     },
@@ -158,12 +143,6 @@
   },
   "components": {
     "schemas": {
-      "GenerateTokenRequest": {
-        "$ref": "./schemas/GenerateTokenRequest.json"
-      },
-      "GenerateTokenResponse": {
-        "$ref": "./schemas/GenerateTokenResponse.json"
-      },
       "RACCheckRequest": {
         "$ref": "./schemas/RACCheckRequest.json"
       },
@@ -235,18 +214,24 @@
       }
     },
     "securitySchemes": {
-  "BearerAuth": {
-    "type": "http",
-    "scheme": "bearer",
-    "bearerFormat": "JWT",
-    "description": "Standard Authorization header using the Bearer scheme. Example: 'Bearer {token}'"
-  }
-}   
+      "api_key": {
+        "type": "apiKey",
+        "name": "x-api-key",
+        "in": "header"
+      },
+      "app_id": {
+        "type": "apiKey",
+        "name": "App-Id",
+        "in": "header"
+      }
+    }
   },
- 
-"security": [
-  {
-    "BearerAuth": []
-  }
-]
+  "security": [
+    {
+      "api_key": []
+    },
+    {
+      "app_id": []
+    }
+  ]
 }

app/swagger/paths/GenerateToken.json

@@ -1,56 +0,0 @@
-{
-    "post": {
-      "tags": [
-        "GenerateToken"
-      ],
-      "summary": "Generate Access Token Request",
-      "description": "Generate Access Token Request",
-      "operationId": "GenerateToken",
-      "requestBody": {
-        "required": true,
-        "content": {
-          "application/json": {
-            "schema": {
-              "$ref": "../schemas/GenerateTokenRequest.json"
-            }
-          },
-          "application/xml": {
-            "schema": {
-              "$ref": "../schemas/GenerateTokenRequest.json"
-            }
-          },
-          "application/x-www-form-urlencoded": {
-            "schema": {
-              "$ref": "../schemas/GenerateTokenRequest.json"
-            }
-          }
-        }
-      },
-      "responses": {
-        "200": {
-          "description": "GenerateToken Successful",
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "../schemas/GenerateTokenResponse.json"
-              }
-            },
-            "application/xml": {
-              "schema": {
-                "$ref": "../schemas/GenerateTokenResponse.json"
-              }
-            }
-          }
-        },
-        "400": {
-          "description": "Invalid request"
-        },
-        "422": {
-          "description": "Validation exception"
-        },
-        "500": {
-          "description": "Internal server error"
-        }
-      }
-    }
-  }

app/swagger/paths/HealthCheck.json

@@ -1,19 +0,0 @@
-{
-    "get": {
-        "tags": ["System"],
-        "summary": "System Health Check",
-        "description": "Returns the current health status of the system",
-        "responses": {
-          "200": {
-            "description": "Successful operation",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "../schemas/HealthCheckResponse.json"
-                }
-              }
-            }
-          }
-        }
-      }
-  }

app/swagger/schemas/DisbursementResponse.json

@@ -70,38 +70,6 @@
       "type": "string",
       "example": "Loan Request Completed Successfully!",
       "nullable": true
-    },
-    "disburseDate": {
-      "type": "string",
-      "format": "date-time",
-      "example": "2023-10-01T12:00:00Z",
-      "nullable": true
-    },
-    "disburseResult": {
-      "type": "string",
-      "example": "00",
-      "nullable": true
-    },
-    "disburseDescription": {
-      "type": "string",
-      "example": "Loan Request Completed Successfully!",
-      "nullable": true
-    },
-    "disburseVerify": {
-      "type": "string",
-      "format": "date-time",
-      "example": "2023-10-01T12:00:00Z",
-      "nullable": true
-    },
-    "verifyResult": {
-      "type": "string",
-      "example": "00",
-      "nullable": true
-    },
-    "verifyDescription": {
-      "type": "string",
-      "example": "Collect Status retrieved successfully.",
-      "nullable": true
     }
   },
   "required": [

app/swagger/schemas/GenerateTokenRequest.json

@@ -1,21 +0,0 @@
-{
-    "type": "object",
-    "properties": {
-        "username": {
-            "type": "string"
-        },
-        "password": {
-            "type": "string"
-        },
-        "grant_type":{
-            "type":"string"
-
-        }
-      
-    },
-    "required": [
-        "username",
-        "password",
-        "grant_type"
-    ]
-}

app/swagger/schemas/GenerateTokenResponse.json

@@ -1,41 +0,0 @@
-{
-    "type": "object",
-    "properties": {
-        "access_token": {
-            "type": "string",
-            "format": "eyjhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwic3ViIjoiYWRtaW4ifQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c"
-        },
-        "token_type": {
-            "type": "string",
-            "format": "bearer"
-        },
-        "expires_in": {
-            "type": "integer",
-            "format": "1800"
-        },
-        "userName": {
-            "type": "string",
-            "format": "sinbrella"
-        },
-        "ipaddress": {
-            "type": "string",
-            "format": "127.0.0.1"
-        },
-        "errorMessage":{
-            "type":"string"
-
-        },
-        "issued": {
-            "type": "string",
-            "format":"date-time"
-
-        },
-        "expires": {
-            "type": "string",
-            "format": "date-time"
-        }
-    },
-    "xml": {
-        "name": "##default"
-    }
-}

app/swagger/schemas/HealthCheckRequest.json

@@ -1,17 +0,0 @@
-{
-  "type": "object",
-  "properties": {
-    "status": {
-      "type": "string",
-      "example": "Active"
-    },
-    "responseCode": {
-      "type": "string",
-      "example": "00"
-    },
-    "responseMessage": {
-      "type": "string",
-      "example": "Successful"
-    }
-  }
-}

app/swagger/schemas/HealthCheckResponse.json

@@ -1,17 +0,0 @@
-{
-  "type": "object",
-  "properties": {
-    "status": {
-      "type": "string",
-      "example": "Active"
-    },
-    "responseCode": {
-      "type": "string",
-      "example": "00"
-    },
-    "responseMessage": {
-      "type": "string",
-      "example": "Successful"
-    }
-  }
-}

requirements.txt

@@ -6,8 +6,6 @@ Flask-Cors==3.0.10
 gunicorn
 flask-swagger-ui
 python-dotenv
-flask-jwt-extended==4.7.1
-