Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ref(projconfig): Unsupport v4 in the endpoint #2500

Merged
merged 2 commits into from
Sep 12, 2023
Merged

ref(projconfig): Unsupport v4 in the endpoint #2500

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae0267a
ref(projconfig): Unsupport v4 in the endpoint
iker-barriocanal Sep 8, 2023
b92fd9c
Merge branch 'master' into iker/ref/projconfig-v3only
iker-barriocanal Sep 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions relay-server/src/endpoints/project_configs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,6 @@ const ENDPOINT_V2: u16 = 2;
/// returned, or a further poll ensues.
const ENDPOINT_V3: u16 = 3;

/// V4 version of this endpoint.
///
/// Can be used for fetching global configs.
const ENDPOINT_V4: u16 = 4;

/// Helper to deserialize the `version` query parameter.
#[derive(Clone, Copy, Debug, Deserialize)]
struct VersionQuery {
Expand Down Expand Up @@ -76,9 +71,8 @@ impl ProjectStateWrapper {
/// made by an external relay who's public key is not configured as authorised on the project.
///
/// Version 3 also adds a list of projects whose response is pending. A [`ProjectKey`] should never
/// be in both collections. This list is always empty before V3.
///
/// Version 4 adds a global config [`GlobalConfig`] if `global` is enabled.
/// be in both collections. This list is always empty before V3. If `global` is
/// enabled, version 3 also responds with [`GlobalConfig`].
#[derive(Debug, Serialize)]
#[serde(rename_all = "camelCase")]
struct GetProjectStatesResponseWrapper {
Expand Down Expand Up @@ -176,7 +170,7 @@ async fn inner(

/// Returns `true` if the `?version` query parameter is compatible with this implementation.
fn is_compatible(Query(query): Query<VersionQuery>) -> bool {
query.version >= ENDPOINT_V2 && query.version <= ENDPOINT_V4
query.version >= ENDPOINT_V2 && query.version <= ENDPOINT_V3
}

/// Endpoint handler for the project configs endpoint.
Expand Down