chk
/
AppFlowy-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: apply same change to other ws endpoint

This commit is contained in:
Bartosz Sypytkowski 2024-08-26 15:03:18 +02:00
parent 8d1d563076
commit 43f6f3bc61
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/ws.rs
View File

@ -86,6 +86,10 @@ pub async fn establish_ws_connection_v1(
}, },
}; };
if client_version < state.config.websocket.min_client_version {
return Err(AppError::Connect("Client version is too low".to_string()).into());
}
start_connect( start_connect(
&request, &request,
payload, payload,

15
src/config/config.rs
View File

@ -1,11 +1,14 @@
use anyhow::Context;
use infra::env_util::get_env_var;
use secrecy::{ExposeSecret, Secret};
use serde::Deserialize;
use sqlx::postgres::{PgConnectOptions, PgSslMode};
use std::fmt::Display; use std::fmt::Display;
use std::str::FromStr; use std::str::FromStr;
use anyhow::Context;
use secrecy::{ExposeSecret, Secret};
use semver::Version;
use serde::Deserialize;
use sqlx::postgres::{PgConnectOptions, PgSslMode};
use infra::env_util::get_env_var;
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct Config { pub struct Config {
pub app_env: Environment, pub app_env: Environment,
@ -166,6 +169,7 @@ pub fn get_configuration() -> Result<Config, anyhow::Error> {
websocket: WebsocketSetting { websocket: WebsocketSetting {
heartbeat_interval: get_env_var("APPFLOWY_WEBSOCKET_HEARTBEAT_INTERVAL", "6").parse()?, heartbeat_interval: get_env_var("APPFLOWY_WEBSOCKET_HEARTBEAT_INTERVAL", "6").parse()?,
client_timeout: get_env_var("APPFLOWY_WEBSOCKET_CLIENT_TIMEOUT", "60").parse()?, client_timeout: get_env_var("APPFLOWY_WEBSOCKET_CLIENT_TIMEOUT", "60").parse()?,
min_client_version: get_env_var("APPFLOWY_WEBSOCKET_CLIENT_MIN_VERSION", "0.5.0").parse()?,
}, },
redis_uri: get_env_var("APPFLOWY_REDIS_URI", "redis://localhost:6379").into(), redis_uri: get_env_var("APPFLOWY_REDIS_URI", "redis://localhost:6379").into(),
s3: S3Setting { s3: S3Setting {
@ -239,4 +243,5 @@ impl FromStr for Environment {
pub struct WebsocketSetting { pub struct WebsocketSetting {
pub heartbeat_interval: u8, pub heartbeat_interval: u8,
pub client_timeout: u8, pub client_timeout: u8,
pub min_client_version: Version,
} }