From 34d606b72d56c38fea468bdd3ba8e4befbce4cf6 Mon Sep 17 00:00:00 2001
From: khushal <pskhushal@gmail.com>
Date: Tue, 25 Feb 2025 13:12:43 +0530
Subject: [PATCH] (20250225) Started accepting more fields to the verification
 API.

---
 .../software/mikrotik/mikrotik_hostpot_1000.py | 18 ++++++++++++++++++
 models/api/common/otp/timed_otp.py             |  6 +++++-
 models/common/otp/timed_otp.py                 |  2 +-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/controllers_v2/software/mikrotik/mikrotik_hostpot_1000.py b/controllers_v2/software/mikrotik/mikrotik_hostpot_1000.py
index e9dda76..418ae02 100644
--- a/controllers_v2/software/mikrotik/mikrotik_hostpot_1000.py
+++ b/controllers_v2/software/mikrotik/mikrotik_hostpot_1000.py
@@ -363,6 +363,24 @@ class MikroTikHotspot1000Controller(MikroTikController):
         all_messages.append(f"STEP 8 ({api_response.action}): {api_response.success}")
         if not api_response.success: all_success = False
 
+        # STEP 9-A
+        # Set up the Walled-Garden:
+        for index, url in enumerate([
+            "api.thecaoffice.com",
+            "cdn.jsdelivr.net"
+        ]):
+            api_response = await mikrotik_client.add_hotspot_walled_garden(
+                json_payload={
+                    "action": "allow",
+                    "dst-host": url,
+                    "comment": HS_COMMENT
+                }
+            )
+            print(f"STEP 9-A.{index}:", api_response.success, f"({api_response.action})")
+            print("MESSAGE:", api_response.message)
+            print("JSON:", api_response.data)
+            print("\n\n")
+
         # STEP 9:
         # Set up the Walled-Garden IP:
         api_response = await mikrotik_client.add_hotspot_walled_garden_ip(
diff --git a/models/api/common/otp/timed_otp.py b/models/api/common/otp/timed_otp.py
index 11d66b8..9a8885f 100644
--- a/models/api/common/otp/timed_otp.py
+++ b/models/api/common/otp/timed_otp.py
@@ -36,7 +36,7 @@ sys.path.append(".")
 sys.path.append("..")
 
 # For making data models:
-from pydantic import BaseModel, Field, field_validator, Extra
+from pydantic import BaseModel, Field, field_validator, Extra, EmailStr
 from typing import Optional, Any, Dict, List
 from typing_extensions import Annotated
 
@@ -189,6 +189,10 @@ class VerifyTimedOTPRequestData(BaseModel):
 
     id: str | Dict | List
     otp: str
+    username: str
+    password: str
+    email: EmailStr
+    phoneNo: str
 
     class Config:
         extra = "forbid"
diff --git a/models/common/otp/timed_otp.py b/models/common/otp/timed_otp.py
index 7e68d20..878d08d 100644
--- a/models/common/otp/timed_otp.py
+++ b/models/common/otp/timed_otp.py
@@ -36,7 +36,7 @@ sys.path.append(".")
 sys.path.append("..")
 
 # For making data models:
-from pydantic import BaseModel, Field, field_validator, Extra
+from pydantic import BaseModel, Field, field_validator, Extra, EmailStr
 from typing import Optional, Any, Dict, List
 from typing_extensions import Annotated