lib/shared/device-list-utils.test.js
279 ↗	(On Diff #40753)	can we avoid `any` here and use something like `JestMatcher`?
283 ↗	(On Diff #40753)	looks like a hack but if there isn't any better solution for it probably it's okay as it's only for testing purpose

This revision is now accepted and ready to land.Jun 3 2024, 4:51 AM

Narrow down matcher type

Harbormaster completed remote builds in B29478: Diff 41024.Jun 6 2024, 1:24 AM

bartek added inline comments.Jun 6 2024, 1:49 AM

lib/shared/device-list-utils.test.js
279 ↗	(On Diff #40753)	Checked Flow types of jest matcher and they use `any` 😶 Can narrow down to `Object` which is better
283 ↗	(On Diff #40753)	It is a hack, but thanks to this it also checks one more thing: raw device list JSON should always be ordered: `{ devices, timestamp }`, The order matters because it's signed in this form. Thanks to this, we can serialize and deserialize it at various points and the signature should still be valid

Closed by commit rCOMM5946d727ba67: [lib] Add unit tests for functions modifying device list (authored by bartek). · Explain WhyJun 6 2024, 1:50 AM

This revision was automatically updated to reflect the committed changes.

bartek added a commit: rCOMM5946d727ba67: [lib] Add unit tests for functions modifying device list.

Revision Contents
Changeset List

Path

Size

lib/

shared/

device-list-utils.test.js

83 lines

Diff 41029

View Options

lib/shared/device-list-utils.test.js

Show First 20 Lines • Show All 138 Lines • ▼ Show 20 Lines	) -> Self {
Self {		Self {
user_id: user_id.into(),		user_id: user_id.into(),
device_ids,		device_ids,
timestamp: update_info.timestamp.unwrap_or_else(Utc::now),		timestamp: update_info.timestamp.unwrap_or_else(Utc::now),
current_primary_signature: update_info.current_signature.clone(),		current_primary_signature: update_info.current_signature.clone(),
last_primary_signature: update_info.last_signature.clone(),		last_primary_signature: update_info.last_signature.clone(),
}		}
}		}

		pub fn has_device(&self, device_id: &String) -> bool {
		self.device_ids.contains(device_id)
		}

		pub fn is_primary_device(&self, device_id: &String) -> bool {
		self
		.device_ids
		.first()
		.filter(\|it\| *it == device_id)
		.is_some()
		}

		pub fn has_secondary_device(&self, device_id: &String) -> bool {
		self.has_device(device_id) && !self.is_primary_device(device_id)
		}
}		}

// helper structs for converting to/from attribute values for sort key (a.k.a itemID)		// helper structs for converting to/from attribute values for sort key (a.k.a itemID)
pub struct DeviceIDAttribute(pub String);		pub struct DeviceIDAttribute(pub String);
struct DeviceListKeyAttribute(DateTime<Utc>);		struct DeviceListKeyAttribute(DateTime<Utc>);

impl From<DeviceIDAttribute> for AttributeValue {		impl From<DeviceIDAttribute> for AttributeValue {
fn from(value: DeviceIDAttribute) -> Self {		fn from(value: DeviceIDAttribute) -> Self {
▲ Show 20 Lines • Show All 656 Lines • ▼ Show 20 Lines	self
&content_one_time_keys,		&content_one_time_keys,
&notif_one_time_keys,		&notif_one_time_keys,
)		)
.await?;		.await?;

Ok(())		Ok(())
}		}

		/// Removes device data from devices table. If the device doesn't exist,
		/// it is a no-op. This does not update the device list; the device ID
		/// should be removed from the device list separately.
		#[tracing::instrument(skip_all)]
		pub async fn remove_device_data(
		&self,
		user_id: impl Into<String>,
		device_id: impl Into<String>,
		) -> Result<(), Error> {
		let user_id = user_id.into();
		let device_id = device_id.into();

		self
		.client
		.delete_item()
		.table_name(devices_table::NAME)
		.key(ATTR_USER_ID, AttributeValue::S(user_id))
		.key(ATTR_ITEM_ID, DeviceIDAttribute(device_id).into())
		.send()
		.await
		.map_err(\|e\| {
		error!(
		errorType = error_types::DEVICE_LIST_DB_LOG,
		"Failed to delete device data: {:?}", e
		);
		Error::AwsSdk(e.into())
		})?;

		Ok(())
		}

/// Registers primary device for user, stores its signed device list		/// Registers primary device for user, stores its signed device list
pub async fn register_primary_device(		pub async fn register_primary_device(
&self,		&self,
user_id: impl Into<String>,		user_id: impl Into<String>,
device_key_upload: FlattenedDeviceKeyUpload,		device_key_upload: FlattenedDeviceKeyUpload,
code_version: u64,		code_version: u64,
login_time: DateTime<Utc>,		login_time: DateTime<Utc>,
initial_device_list: DeviceListUpdate,		initial_device_list: DeviceListUpdate,
▲ Show 20 Lines • Show All 793 Lines • Show Last 20 Lines

[lib] Add unit tests for functions modifying device listClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 41029

lib/shared/device-list-utils.test.js

[lib] Add unit tests for functions modifying device list
ClosedPublic
Actions

Revision Contents
Changeset List