feat: add hashed_fxa_uid to HawkPayload

syncserver/src/server/test.rs

@@ -174,6 +174,7 @@ fn create_hawk_header(method: &str, port: u16, path: &str) -> String {
         user_id: 42,
         fxa_uid: format!("xxx_test_uid_{}", *RAND_UID),
         fxa_kid: format!("xxx_test_kid_{}", *RAND_UID),
+        hashed_fxa_uid: format!("xxx_test_hashed_fxa_uid_{}", *RAND_UID),
         hashed_device_id: "xxx_test".to_owned(),
         tokenserver_origin: Default::default(),
     };

syncserver/src/web/auth.rs

@@ -53,6 +53,9 @@ pub struct HawkPayload {
     #[serde(default)]
     pub fxa_kid: String,
 
+    #[serde(default)]
+    pub hashed_fxa_uid: String,
+
     #[serde(default)]
     pub hashed_device_id: String,
 
@@ -156,6 +159,7 @@ impl HawkPayload {
             user_id,
             fxa_uid: "xxx_test".to_owned(),
             fxa_kid: "xxx_test".to_owned(),
+            hashed_fxa_uid: "xxx_test".to_owned(),
             hashed_device_id: "xxx_test".to_owned(),
             tokenserver_origin: Default::default(),
         }
@@ -508,6 +512,7 @@ mod tests {
                     user_id: 1,
                     fxa_uid: "319b98f9961ff1dbdd07313cd6ba925a".to_owned(),
                     fxa_kid: "de697ad66d845b2873c9d7e13b8971af".to_owned(),
+                    hashed_fxa_uid: "0e8df5d41398a389913bd8402435649518af46493da1d4a437a46dc1784c501a".to_owned(),
                     hashed_device_id: "2bcb92f4d4698c3d7b083a3c698a16ccd78bc2a8d20a96e4bb128ddceaf4e0b6".to_owned(),
                     tokenserver_origin: Default::default(),
                 },

syncserver/src/web/extractors.rs

@@ -994,6 +994,7 @@ pub struct HawkIdentifier {
     /// For NoSQL database backends that require randomly distributed primary keys
     pub fxa_uid: String,
     pub fxa_kid: String,
+    pub hashed_fxa_uid: String,
     pub tokenserver_origin: TokenserverOrigin,
 }
 
@@ -1004,6 +1005,7 @@ impl HawkIdentifier {
             legacy_id: 0,
             fxa_uid: "cmd".to_owned(),
             fxa_kid: "cmd".to_owned(),
+            hashed_fxa_uid: "cmd".to_owned(),
             tokenserver_origin: TokenserverOrigin::default(),
         }
     }
@@ -1106,6 +1108,7 @@ impl HawkIdentifier {
             legacy_id: payload.user_id,
             fxa_uid: payload.fxa_uid,
             fxa_kid: payload.fxa_kid,
+            hashed_fxa_uid: payload.hashed_fxa_uid,
             tokenserver_origin: payload.tokenserver_origin,
         };
         Ok(user_id)
@@ -1118,6 +1121,7 @@ impl From<HawkIdentifier> for UserIdentifier {
             legacy_id: hawk_id.legacy_id,
             fxa_uid: hawk_id.fxa_uid,
             fxa_kid: hawk_id.fxa_kid,
+            hashed_fxa_uid: hawk_id.hashed_fxa_uid,
         }
     }
 }

syncstorage-db-common/src/lib.rs

@@ -277,4 +277,5 @@ pub struct UserIdentifier {
     /// For NoSQL database backends that require randomly distributed primary keys
     pub fxa_uid: String,
     pub fxa_kid: String,
+    pub hashed_fxa_uid: String,
 }

syncstorage-db/src/tests/support.rs

@@ -130,5 +130,6 @@ pub fn hid(user_id: u32) -> UserIdentifier {
         legacy_id: u64::from(user_id),
         fxa_uid: format!("xxx_unit_tests_fxa_uid{}", user_id),
         fxa_kid: format!("xxx_unit_tests_fxa_kid{}", user_id),
+        hashed_fxa_uid: format!("xxx_unit_tests_hashed_fxa_uid{}", user_id),
     }
 }