From 136373471997b062052369cabb8de68eb879b324 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nuno=20G=C3=B3is?= Date: Thu, 4 Jul 2024 08:23:39 +0100 Subject: [PATCH] refactor: InvalidTokenOnClosedMode -> InvalidTokenWithStrictBehavior --- server/src/error.rs | 6 +++--- server/src/http/feature_refresher.rs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/src/error.rs b/server/src/error.rs index fa4340d9..d1202013 100644 --- a/server/src/error.rs +++ b/server/src/error.rs @@ -105,7 +105,7 @@ pub enum EdgeError { EdgeTokenParseError, InvalidBackupFile(String, String), InvalidServerUrl(String), - InvalidTokenOnClosedMode, + InvalidTokenWithStrictBehavior, HealthCheckError(String), JsonParseError(String), NoFeaturesFile, @@ -207,7 +207,7 @@ impl Display for EdgeError { EdgeError::NotReady => { write!(f, "Edge is not ready to serve requests") } - EdgeError::InvalidTokenOnClosedMode => write!(f, "Edge is running in closed mode and the token is not subsumed by any registered tokens"), + EdgeError::InvalidTokenWithStrictBehavior => write!(f, "Edge is running with strict behavior and the token is not subsumed by any registered tokens"), } } } @@ -245,7 +245,7 @@ impl ResponseError for EdgeError { EdgeError::ClientCacheError => StatusCode::INTERNAL_SERVER_ERROR, EdgeError::FrontendExpectedToBeHydrated(_) => StatusCode::INTERNAL_SERVER_ERROR, EdgeError::NotReady => StatusCode::SERVICE_UNAVAILABLE, - EdgeError::InvalidTokenOnClosedMode => StatusCode::FORBIDDEN, + EdgeError::InvalidTokenWithStrictBehavior => StatusCode::FORBIDDEN, } } diff --git a/server/src/http/feature_refresher.rs b/server/src/http/feature_refresher.rs index 670fcdce..f1a98a89 100644 --- a/server/src/http/feature_refresher.rs +++ b/server/src/http/feature_refresher.rs @@ -230,7 +230,7 @@ impl FeatureRefresher { _ => { if self.strict { debug!("Strict behavior: Token is not subsumed by any registered tokens. Returning error"); - Err(EdgeError::InvalidTokenOnClosedMode) + Err(EdgeError::InvalidTokenWithStrictBehavior) } else { debug!("Dynamic behavior: Had never seen this environment. Configuring fetcher"); self.register_and_hydrate_token(&token).await;