Page MenuHomePhabricator
Files F2929579

D13586.id44920.diff
No OneTemporary
Actions

D13586.id44920.diff
View Options

diff --git a/services/tunnelbroker/src/notifs/fcm/mod.rs b/services/tunnelbroker/src/notifs/fcm/mod.rs
--- a/services/tunnelbroker/src/notifs/fcm/mod.rs
+++ b/services/tunnelbroker/src/notifs/fcm/mod.rs
@@ -45,50 +45,57 @@
let token = message.token.clone();
debug!("Sending FCM notif to {}", token);
- let mut headers = HeaderMap::new();
- headers.insert(
- reqwest::header::CONTENT_TYPE,
- HeaderValue::from_static("application/json"),
- );
-
- let bearer = self.token.get_auth_bearer().await?;
- headers.insert(AUTHORIZATION, HeaderValue::from_str(&bearer)?);
-
- let url = format!(
- "https://fcm.googleapis.com/v1/projects/{}/messages:send",
- self.config.project_id
- );
-
let msg_wrapper = FCMMessageWrapper { message };
let payload = serde_json::to_string(&msg_wrapper).unwrap();
+ let mut is_retry = false;
- let response = self
- .http_client
- .post(&url)
- .headers(headers)
- .body(payload)
- .send()
- .await?;
+ loop {
+ let mut headers = HeaderMap::new();
+ headers.insert(
+ reqwest::header::CONTENT_TYPE,
+ HeaderValue::from_static("application/json"),
+ );
+ let bearer = self.token.get_auth_bearer(is_retry).await?;
+ headers.insert(AUTHORIZATION, HeaderValue::from_str(&bearer)?);
- match response.status() {
- StatusCode::OK => {
- debug!("Successfully sent FCM notif to {}", token);
- Ok(())
- }
- error_status => {
- let body = response
- .text()
- .await
- .unwrap_or_else(|error| format!("Error occurred: {}", error));
- error!(
- errorType = error_types::FCM_ERROR,
- "Failed sending FCM notification to: {}. Status: {}. Body: {}",
- token,
- error_status,
- body
- );
- let fcm_error = FCMErrorResponse::from_status(error_status, body);
- Err(FCMError(fcm_error))
+ let url = format!(
+ "https://fcm.googleapis.com/v1/projects/{}/messages:send",
+ self.config.project_id
+ );
+
+ let response = self
+ .http_client
+ .post(&url)
+ .headers(headers)
+ .body(payload.clone())
+ .send()
+ .await?;
+
+ match response.status() {
+ StatusCode::OK => {
+ debug!("Successfully sent FCM notif to {}", token);
+ return Ok(());
+ }
+ StatusCode::UNAUTHORIZED if !is_retry => {
+ is_retry = true;
+ debug!("Retrying after first 401 to regenerate token.");
+ continue;
+ }
+ error_status => {
+ let body = response
+ .text()
+ .await
+ .unwrap_or_else(|error| format!("Error occurred: {}", error));
+ error!(
+ errorType = error_types::FCM_ERROR,
+ "Failed sending FCM notification to: {}. Status: {}. Body: {}",
+ token,
+ error_status,
+ body
+ );
+ let fcm_error = FCMErrorResponse::from_status(error_status, body);
+ return Err(FCMError(fcm_error));
+ }
}
}
}
diff --git a/services/tunnelbroker/src/notifs/fcm/token.rs b/services/tunnelbroker/src/notifs/fcm/token.rs
--- a/services/tunnelbroker/src/notifs/fcm/token.rs
+++ b/services/tunnelbroker/src/notifs/fcm/token.rs
@@ -40,8 +40,11 @@
})
}
- pub async fn get_auth_bearer(&self) -> Result<String, Error> {
- if self.fcm_token_needs_generation().await {
+ pub async fn get_auth_bearer(
+ &self,
+ force_regenerate: bool,
+ ) -> Result<String, Error> {
+ if force_regenerate || self.fcm_token_needs_generation().await {
self.generate_fcm_token().await?;
}

File Metadata

Mime Type
text/plain
Expires
Thu, Oct 10, 3:21 PM (21 h, 57 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2270790
Default Alt Text
D13586.id44920.diff (3 KB)

Event Timeline