(20241216) Payment auth bug fix.

api/blueprints/finstitutions/payments/auth.py

@@ -170,33 +170,21 @@ async def authorize_payment_gateway(
 
     if inbound_data.client == "safaricomMPesaExpress":
 
-        auth_token = CoreAuthTokenModel(
-            serviceType = "paymentGateway",
-            client = inbound_data.client,
-            authType = "auth",
-            auth = inbound_data.auth.model_dump(),
-            user = kwargs.get("session_info"),
-            clientUserId = {
-                "businessShortCode": inbound_data.auth.businessShortCode
-            },
-            status = "active",
-            syncFreq = 60
-        )
-
-        token_id = await current_app.core_auth_token_controller.get_token_id(
+        success = await current_app.payment_controller.set_token_direct(
             db_conn = current_app.sql_writer,
             mongo_conn = current_app.data_mongo,
-            auth_token = auth_token,
-            token_notes = {},
-            session_token = inbound_headers["X-Session-Token"]
-        )
-
-        success = await current_app.core_auth_token_controller.set_token(
-            db_conn = current_app.sql_writer,
-            mongo_conn = current_app.data_mongo,
-            token_id = token_id,
-            auth_token = auth_token,
-            token_notes = {},
+            auth_token = CoreAuthTokenModel(
+                serviceType = "paymentGateway",
+                client = inbound_data.client,
+                authType = "auth",
+                auth = inbound_data.auth.model_dump(),
+                user = kwargs.get("session_info"),
+                clientUserId = {
+                    "businessShortCode": inbound_data.auth.businessShortCode
+                },
+                status = "active",
+                syncFreq = 60
+            ),
             session_token = inbound_headers["X-Session-Token"]
         )
 

api/blueprints/mail/retrieve/get.py

@@ -63,7 +63,7 @@ from utils_v2.api.async_quart import (
 
 # GMail-related utils:
 from utils_v2.goog.gmail.gmail_client import SCOPES_GMAIL_MAIL_MANAGEMENT
-from utils_v2.goog.models.data.auth_tokens import GoogleAuthTokens
+from utils_v2.goog.models.auth_tokens import GoogleAuthTokens
 
 # Common:
 from shared import constants

api/blueprints/mail/retrieve/list.py

@@ -64,7 +64,7 @@ from utils_v2.api.async_quart import (
 
 # GMail-related utils:
 from utils_v2.goog.gmail.gmail_client import SCOPES_GMAIL_MAIL_MANAGEMENT
-from utils_v2.goog.models.data.auth_tokens import GoogleAuthTokens
+from utils_v2.goog.models.auth_tokens import GoogleAuthTokens
 
 # Common:
 from shared import constants

api/blueprints/mail/sync/sync_v2.py

@@ -64,7 +64,7 @@ from utils_v2.api.async_quart import (
 
 # GMail-related utils:
 from utils_v2.goog.gmail.gmail_client import SCOPES_GMAIL_MAIL_MANAGEMENT
-from utils_v2.goog.models.data.auth_tokens import GoogleAuthTokens
+from utils_v2.goog.models.auth_tokens import GoogleAuthTokens
 
 # Common:
 from shared import constants

api/blueprints/mail/tags/update.py

@@ -63,7 +63,7 @@ from utils_v2.api.async_quart import (
 
 # GMail-related utils:
 from utils_v2.goog.gmail.gmail_client import SCOPES_GMAIL_MAIL_MANAGEMENT
-from utils_v2.goog.models.data.auth_tokens import GoogleAuthTokens
+from utils_v2.goog.models.auth_tokens import GoogleAuthTokens
 
 # Common:
 from shared import constants

api/blueprints/sms/auth.py

@@ -166,7 +166,7 @@ async def authorize_sms_client(
 
     if inbound_data.smsClient == "nimbusSmsIndia":
 
-        success = await current_app.sms_controller.set_token(
+        success = await current_app.sms_controller.set_token_direct(
             db_conn = current_app.sql_writer,
             mongo_conn = current_app.data_mongo,
             auth_token = CoreAuthTokenModel(
@@ -193,7 +193,7 @@ async def authorize_sms_client(
 
     elif inbound_data.smsClient == "savvyBulkSmsKenya":
 
-        success = await current_app.sms_controller.set_token(
+        success = await current_app.sms_controller.set_token_direct(
             db_conn = current_app.sql_writer,
             mongo_conn = current_app.data_mongo,
             auth_token = CoreAuthTokenModel(

api/main.py

@@ -63,13 +63,14 @@ from utils_v2.api.async_quart import (
 from utils_v2.goog.gmail.gmail_client import AsyncGMailClient
 
 # Core Controller Models:
-from controllers.core.message import MessageController
-from controllers.core.auth_token import AuthTokenController
+from controllers.core.message import CoreMessageController
+from controllers.core.auth_token import CoreAuthTokenController
 from controllers.core.ai.llm import LLMController
 
 # API Controller Models:
 from controllers.api.mail import MailController
 from controllers.api.sms import SMSController
+from controllers.api.payment import PaymentController
 
 # # Old Behaviour Models:
 # from controllers.mail.oauth_v3 import MailOAuthModel
@@ -328,7 +329,7 @@ async def app_startup(**kwargs):
     # ┃ ┏┓┏┓┏┓  ┃┃┃┏┓┏┫┏┓┃┏
     # ┗┛┗┛┛ ┗   ┛ ┗┗┛┗┻┗ ┗┛
 
-    current_app.core_auth_token_controller = AuthTokenController(
+    current_app.core_auth_token_controller = CoreAuthTokenController(
         cache = current_app.module_cache,
         alert_url = current_app.script_data["alerts"]["url"],
         http_client = current_app.http_client,
@@ -336,7 +337,7 @@ async def app_startup(**kwargs):
         debug_prefix = "Message (CM) | ",
         debug_only_errors = True
     )
-    current_app.core_message_controller = MessageController(
+    current_app.core_message_controller = CoreMessageController(
         cache = current_app.module_cache,
         alert_url = current_app.script_data["alerts"]["url"],
         http_client = current_app.http_client,
@@ -351,6 +352,7 @@ async def app_startup(**kwargs):
 
     current_app.mail_controller = MailController()
     current_app.sms_controller = SMSController()
+    current_app.payment_controller = PaymentController()
 
     # ┏┓                      ┓  ┏┓┓•
     # ┃ ┏┓┏┓┏┓┏┓┏╋┏┓┏┓┏  ┏┓┏┓┏┫  ┃ ┃┓┏┓┏┓╋┏