Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
76 changes: 45 additions & 31 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions docs/src/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ The following configuration options are available.
| <span id="SYNC_TOKENSERVER__NODE_TYPE"></span>SYNC_TOKENSERVER__NODE_TYPE | spanner | Storage backend type reported in token response for telemetry. Valid values: "mysql", "postgres", "spanner" |
| <span id="SYNC_TOKENSERVER__STATSD_LABEL"></span>SYNC_TOKENSERVER__STATSD_LABEL | syncstorage.tokenserver | StatsD metrics label prefix |
| <span id="SYNC_TOKENSERVER__TOKEN_DURATION"></span>SYNC_TOKENSERVER__TOKEN_DURATION | 3600 | Token TTL (1 hour) |
| <span id="SYNC_TOKENSERVER__FXA_WEBHOOK_ENABLED"></span>SYNC_TOKENSERVER__FXA_WEBHOOK_ENABLED | false | Enable the FxA webhook endpoint. When disabled, the route is not registered. |

### Tokenserver+FxA Integration

Expand Down
1 change: 1 addition & 0 deletions syncserver/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ woothee = "0.13"

[dev-dependencies]
temp-env.workspace = true
tokenserver-auth = { path = "../tokenserver-auth", features = ["test-support"] }

[target.'cfg(target_os = "linux")'.dependencies]
slog-journald = "2.2.0"
Expand Down
25 changes: 23 additions & 2 deletions syncserver/src/server/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,18 @@ macro_rules! build_app {
web::resource("/1.0/{application}/{version}")
.route(web::get().to(tokenserver::handlers::get_tokenserver_result)),
)
.configure(|cfg| {
let fxa_webhook_enabled = $tokenserver_state
.as_ref()
.map(|s: &tokenserver::ServerState| s.fxa_webhook_enabled)
.unwrap_or(false);
if fxa_webhook_enabled {
cfg.service(
web::resource("/1.0/webhooks/fxa/events")
.route(web::post().to(tokenserver::handlers::handle_fxa_events)),
);
}
})
// Dockerflow
// Remember to update .::web::middleware::DOCKER_FLOW_ENDPOINTS
// when applying changes to endpoint names.
Expand Down Expand Up @@ -253,7 +265,8 @@ macro_rules! build_app {

#[macro_export]
macro_rules! build_app_without_syncstorage {
($state: expr, $secrets: expr, $cors: expr, $metrics: expr) => {
($state: expr, $secrets: expr, $cors: expr, $metrics: expr) => {{
let fxa_webhook_enabled = $state.fxa_webhook_enabled;
App::new()
.app_data(Data::new($state))
.app_data(Data::new($secrets))
Expand All @@ -276,6 +289,14 @@ macro_rules! build_app_without_syncstorage {
web::resource("/1.0/{application}/{version}")
.route(web::get().to(tokenserver::handlers::get_tokenserver_result)),
)
.configure(move |cfg| {
if fxa_webhook_enabled {
cfg.service(
web::resource("/1.0/webhooks/fxa/events")
.route(web::post().to(tokenserver::handlers::handle_fxa_events)),
);
}
})
// Dockerflow
// Remember to update .::web::middleware::DOCKER_FLOW_ENDPOINTS
// when applying changes to endpoint names.
Expand Down Expand Up @@ -319,7 +340,7 @@ macro_rules! build_app_without_syncstorage {
SwaggerUi::new("/swagger-ui/{_:.*}")
.url("/api-doc/openapi.json", ApiDoc::openapi()),
)
};
}};
}

impl Server {
Expand Down
Loading
Loading