Use the lowercase hyphenated formatter (default) when returning UUIDs

mozilla-services · Jul 21, 2020 · 5cd962b · 5cd962b
1 parent a363c51
commit 5cd962b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/autoendpoint/src/routers/fcm/router.rs b/autoendpoint/src/routers/fcm/router.rs
@@ -70,14 +70,7 @@ impl FcmRouter {
         notification: &Notification,
     ) -> ApiResult<HashMap<&'static str, String>> {
         let mut message_data = HashMap::new();
-        message_data.insert(
-            "chid",
-            notification
-                .subscription
-                .channel_id
-                .to_simple_ref()
-                .to_string(),
-        );
+        message_data.insert("chid", notification.subscription.channel_id.to_string());
 
         // Only add the other headers if there's data
         if let Some(data) = &notification.data {
@@ -326,7 +319,7 @@ mod tests {
                     "message": {
                         "android": {
                             "data": {
-                                "chid": channel_id().to_simple().to_string()
+                                "chid": CHANNEL_ID
                             },
                             "ttl": "60s"
                         },
@@ -360,7 +353,7 @@ mod tests {
                     "message": {
                         "android": {
                             "data": {
-                                "chid": channel_id().to_simple().to_string(),
+                                "chid": CHANNEL_ID,
                                 "body": "test-data",
                                 "con": "test-encoding",
                                 "enc": "test-encryption",

diff --git a/autoendpoint/src/routes/registration.rs b/autoendpoint/src/routes/registration.rs
@@ -70,8 +70,8 @@ pub async fn register_uaid_route(
 
     trace!("Finished registering UAID {}", user.uaid);
     Ok(HttpResponse::Ok().json(serde_json::json!({
-        "uaid": user.uaid.to_simple().to_string(),
-        "channelID": channel_id.to_simple().to_string(),
+        "uaid": user.uaid,
+        "channelID": channel_id,
         "endpoint": endpoint_url,
         "secret": secret
     })))