From c2262790161f5b29be4c7db5c0d3df5ad0fb7ab9 Mon Sep 17 00:00:00 2001 From: Blake Blackshear Date: Fri, 14 Jun 2024 17:54:21 -0500 Subject: [PATCH] fixup auth mode check --- frigate/api/app.py | 6 ++---- frigate/app.py | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/frigate/api/app.py b/frigate/api/app.py index 8002ecb7e..e97509998 100644 --- a/frigate/api/app.py +++ b/frigate/api/app.py @@ -21,7 +21,7 @@ from frigate.api.export import ExportBp from frigate.api.media import MediaBp from frigate.api.preview import PreviewBp from frigate.api.review import ReviewBp -from frigate.config import AuthModeEnum, FrigateConfig +from frigate.config import FrigateConfig from frigate.const import CONFIG_DIR from frigate.events.external import ExternalEventProcessor from frigate.models import Event, Timeline @@ -86,9 +86,7 @@ def create_app( app.plus_api = plus_api app.camera_error_image = None app.stats_emitter = stats_emitter - app.jwt_token = ( - get_jwt_secret() if frigate_config.auth.mode == AuthModeEnum.native else None - ) + app.jwt_token = get_jwt_secret() if frigate_config.auth.enabled else None # update the request_address with the x-forwarded-for header from nginx app.wsgi_app = ProxyFix(app.wsgi_app, x_for=1) # initialize the rate limiter for the login endpoint diff --git a/frigate/app.py b/frigate/app.py index e2716a8a2..7e845f44a 100644 --- a/frigate/app.py +++ b/frigate/app.py @@ -27,7 +27,7 @@ from frigate.comms.dispatcher import Communicator, Dispatcher from frigate.comms.inter_process import InterProcessCommunicator from frigate.comms.mqtt import MqttClient from frigate.comms.ws import WebSocketClient -from frigate.config import AuthModeEnum, FrigateConfig +from frigate.config import FrigateConfig from frigate.const import ( CACHE_DIR, CLIPS_DIR, @@ -593,7 +593,7 @@ class FrigateApp: ) def init_auth(self) -> None: - if self.config.auth.mode == AuthModeEnum.native: + if self.config.auth.enabled: if User.select().count() == 0: password = secrets.token_hex(16) password_hash = hash_password(