Impl new, From, FromStr for Uuid

Author: Hinton

crates/bitwarden-uniffi/src/vault/ciphers.rs

@@ -41,7 +41,7 @@ impl CiphersClient {
     ) -> Result<CipherView> {
         Ok(self
             .0
-            .move_to_organization(cipher, OrganizationId(organization_id))
+            .move_to_organization(cipher, OrganizationId::new(organization_id))
             .map_err(Error::Cipher)?)
     }
 }

crates/bitwarden-uuid-macro/src/lib.rs

@@ -22,18 +22,38 @@ pub fn uuid(input: TokenStream) -> TokenStream {
         #[repr(transparent)]
         #vis struct #ident(
             #[tsify(type = #tsify_type)]
-            pub uuid::Uuid
+            uuid::Uuid
         );
 
         #[cfg(not(feature = "wasm"))]
         #[derive(serde::Serialize, serde::Deserialize)]
         #[repr(transparent)]
         #vis struct #ident(
-            pub uuid::Uuid
+            uuid::Uuid
         );
 
         #[cfg(feature = "uniffi")]
         uniffi::custom_newtype!(#ident, uuid::Uuid);
+
+        impl #ident {
+            pub fn new(value: uuid::Uuid) -> Self {
+                Self(value)
+            }
+        }
+
+        impl std::str::FromStr for #ident {
+            type Err = uuid::Error;
+
+            fn from_str(s: &str) -> Result<Self, Self::Err> {
+                uuid::Uuid::from_str(s).map(Self)
+            }
+        }
+
+        impl From<#ident> for uuid::Uuid {
+            fn from(value: #ident) -> Self {
+                value.0
+            }
+        }
     };
 
     TokenStream::from(expanded)

crates/bitwarden-vault/src/cipher/cipher_client.rs

@@ -64,7 +64,7 @@ impl CiphersClient {
         organization_id: OrganizationId,
     ) -> Result<CipherView, CipherError> {
         let key_store = self.client.internal.get_key_store();
-        cipher_view.move_to_organization(&mut key_store.context(), organization_id.0)?;
+        cipher_view.move_to_organization(&mut key_store.context(), organization_id.into())?;
         Ok(cipher_view)
     }