allow non-uuid identities

api_client/src/lib.rs

@@ -25,7 +25,7 @@ use minimal_ds_types::{
     requests::{
         DeleteClientRequest, DeleteGroupRequest, FetchKeyPackageRequest, FetchMessagesRequest,
     },
-    AuthToken, ClientCredentials, DsClientId, DsGroupId,
+    AuthToken, ClientCredentials,
 };
 use mls_assist::messages::{AssistedMessageError, AssistedMessageOut};
 use openmls::{
@@ -40,6 +40,9 @@ use openmls::{
 use requests::{MinimalDsMessageOut, MinimalDsResponseIn, RegisterClientRequestOut};
 use reqwest::{Client, Url};
 
+// Re-export types
+pub use minimal_ds_types::{DsClientId, DsGroupId};
+
 pub mod errors;
 pub mod requests;
 

types/src/lib.rs

@@ -80,14 +80,12 @@ impl Deref for TlsUuid {
     TlsDeserializeBytes,
 )]
 pub struct DsClientId {
-    id: TlsUuid,
+    id: [u8; 32],
 }
 
 impl DsClientId {
-    pub fn new() -> Self {
-        Self {
-            id: Uuid::new_v4().into(),
-        }
+    pub fn new(bytes: &[u8]) -> Result<Self, DsClientIdError> {
+        bytes.try_into()
     }
 
     pub fn from_serialized_credential(
@@ -99,40 +97,36 @@ impl DsClientId {
         Self::try_from(identity.as_slice())
     }
 
-    pub fn as_bytes(&self) -> &[u8; 16] {
-        self.id.as_bytes()
+    pub fn as_bytes(&self) -> &[u8; 32] {
+        &self.id
     }
 }
 
 impl std::fmt::Display for DsClientId {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.id.deref())
+        write!(f, "{:?}", self.id)
     }
 }
 
 #[derive(Debug, Error)]
 pub enum DsClientIdError {
     #[error("Invalid Credential: {0}")]
     InvalidCredential(#[from] tls_codec::Error),
-    #[error(transparent)]
-    InvalidUuid(#[from] uuid::Error),
+    #[error("Too many bytes in the input. Expected 32 bytes.")]
+    TooManyBytes,
 }
 
 impl TryFrom<&[u8]> for DsClientId {
     type Error = DsClientIdError;
 
     fn try_from(bytes: &[u8]) -> Result<Self, Self::Error> {
-        let id = Uuid::from_slice(bytes)?.into();
+        let id = bytes
+            .try_into()
+            .map_err(|_| DsClientIdError::TooManyBytes)?;
         Ok(Self { id })
     }
 }
 
-impl From<Uuid> for DsClientId {
-    fn from(id: Uuid) -> Self {
-        Self { id: id.into() }
-    }
-}
-
 #[cfg(feature = "rusqlite")]
 impl ToSql for DsClientId {
     fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput<'_>> {