mirror of
https://github.com/bunny-lab-io/Borealis.git
synced 2025-12-16 04:05:48 -07:00
ENGINE: Migrated Enrollment Logic
This commit is contained in:
@@ -24,10 +24,10 @@ from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple
|
||||
from flask import Blueprint, jsonify, request, session
|
||||
from itsdangerous import BadSignature, SignatureExpired, URLSafeTimedSerializer
|
||||
|
||||
from Modules.guid_utils import normalize_guid
|
||||
from ....auth.guid_utils import normalize_guid
|
||||
|
||||
if TYPE_CHECKING: # pragma: no cover - typing helper
|
||||
from .. import LegacyServiceAdapters
|
||||
from .. import EngineServiceAdapters
|
||||
|
||||
|
||||
VALID_TTL_HOURS = {1, 3, 6, 12, 24}
|
||||
@@ -49,7 +49,7 @@ def _generate_install_code() -> str:
|
||||
class AdminDeviceService:
|
||||
"""Utility wrapper for admin device APIs."""
|
||||
|
||||
def __init__(self, app, adapters: "LegacyServiceAdapters") -> None:
|
||||
def __init__(self, app, adapters: "EngineServiceAdapters") -> None:
|
||||
self.app = app
|
||||
self.adapters = adapters
|
||||
self.db_conn_factory = adapters.db_conn_factory
|
||||
@@ -477,7 +477,7 @@ class AdminDeviceService:
|
||||
return self._set_approval_status(approval_id, "denied")
|
||||
|
||||
|
||||
def register_admin_endpoints(app, adapters: "LegacyServiceAdapters") -> None:
|
||||
def register_admin_endpoints(app, adapters: "EngineServiceAdapters") -> None:
|
||||
"""Register admin enrollment + approval endpoints."""
|
||||
|
||||
service = AdminDeviceService(app, adapters)
|
||||
@@ -532,3 +532,4 @@ def register_admin_endpoints(app, adapters: "LegacyServiceAdapters") -> None:
|
||||
return jsonify(payload), status
|
||||
|
||||
app.register_blueprint(blueprint)
|
||||
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
# ======================================================
|
||||
# Data\Engine\services\API\devices\enrollment.py
|
||||
# Description: Placeholder for device enrollment API bridge (not yet implemented).
|
||||
#
|
||||
# API Endpoints (if applicable): None
|
||||
# ======================================================
|
||||
|
||||
"Placeholder for API module devices/enrollment.py."
|
||||
@@ -41,8 +41,8 @@ from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple
|
||||
from flask import Blueprint, jsonify, request, session, g
|
||||
from itsdangerous import BadSignature, SignatureExpired, URLSafeTimedSerializer
|
||||
|
||||
from Modules.auth.device_auth import require_device_auth
|
||||
from Modules.guid_utils import normalize_guid
|
||||
from ....auth.device_auth import require_device_auth
|
||||
from ....auth.guid_utils import normalize_guid
|
||||
|
||||
try:
|
||||
import requests # type: ignore
|
||||
@@ -57,7 +57,7 @@ except ImportError: # pragma: no cover - fallback for minimal test environments
|
||||
requests = _RequestsStub() # type: ignore
|
||||
|
||||
if TYPE_CHECKING: # pragma: no cover - typing aide
|
||||
from .. import LegacyServiceAdapters
|
||||
from .. import EngineServiceAdapters
|
||||
|
||||
|
||||
def _safe_json(raw: Optional[str], default: Any) -> Any:
|
||||
@@ -340,7 +340,7 @@ def _device_upsert(
|
||||
class RepositoryHashCache:
|
||||
"""Lightweight GitHub head cache with on-disk persistence."""
|
||||
|
||||
def __init__(self, adapters: "LegacyServiceAdapters") -> None:
|
||||
def __init__(self, adapters: "EngineServiceAdapters") -> None:
|
||||
self._db_conn_factory = adapters.db_conn_factory
|
||||
self._service_log = adapters.service_log
|
||||
self._logger = adapters.context.logger
|
||||
@@ -617,7 +617,7 @@ class DeviceManagementService:
|
||||
"connection_endpoint",
|
||||
)
|
||||
|
||||
def __init__(self, app, adapters: "LegacyServiceAdapters") -> None:
|
||||
def __init__(self, app, adapters: "EngineServiceAdapters") -> None:
|
||||
self.app = app
|
||||
self.adapters = adapters
|
||||
self.db_conn_factory = adapters.db_conn_factory
|
||||
@@ -1513,7 +1513,7 @@ class DeviceManagementService:
|
||||
finally:
|
||||
conn.close()
|
||||
|
||||
def register_management(app, adapters: "LegacyServiceAdapters") -> None:
|
||||
def register_management(app, adapters: "EngineServiceAdapters") -> None:
|
||||
"""Register device management endpoints onto the Flask app."""
|
||||
|
||||
service = DeviceManagementService(app, adapters)
|
||||
@@ -1679,3 +1679,4 @@ def register_management(app, adapters: "LegacyServiceAdapters") -> None:
|
||||
return jsonify(payload), status
|
||||
|
||||
app.register_blueprint(blueprint)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user