Revert "[PM-12431] Temporarily un-export bitwarden_fido (#1072)"

This reverts commit 73d3ce8.
bitwarden · Sep 26, 2024 · 4b30a34 · 4b30a34
1 parent 73d3ce8
commit 4b30a34
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 20 deletions.
diff --git a/.github/workflows/publish-rust-crates.yml b/.github/workflows/publish-rust-crates.yml
@@ -72,7 +72,7 @@ jobs:
         env:
           PUBLISH_GRACE_SLEEP: 10
           CARGO_REGISTRY_TOKEN: ${{ steps.retrieve-secrets.outputs.cratesio-api-token }}
-        run: cargo-release release publish --exclude bw --exclude bws --exclude bitwarden-fido --execute --no-confirm
+        run: cargo-release release publish --exclude bw --exclude bws --execute --no-confirm
 
       - name: Update deployment status to Success
         if: ${{ inputs.release_type != 'Dry Run' && success() }}

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/bitwarden/Cargo.toml b/crates/bitwarden/Cargo.toml
@@ -30,8 +30,7 @@ uniffi = [
     "bitwarden-core/uniffi",
     "bitwarden-crypto/uniffi",
     "bitwarden-exporters/uniffi",
-    # PR #1072
-    # "bitwarden-fido/uniffi",
+    "bitwarden-fido/uniffi",
     "bitwarden-generators/uniffi",
     "bitwarden-send/uniffi",
     "bitwarden-vault/uniffi",
@@ -44,8 +43,7 @@ bitwarden-api-identity = { workspace = true }
 bitwarden-core = { workspace = true }
 bitwarden-crypto = { workspace = true }
 bitwarden-exporters = { workspace = true, optional = true }
-# PR #1072
-# bitwarden-fido = { workspace = true, optional = true }
+bitwarden-fido = { workspace = true, optional = true }
 bitwarden-generators = { workspace = true, optional = true }
 bitwarden-send = { workspace = true, optional = true }
 bitwarden-sm = { workspace = true, optional = true }

diff --git a/crates/bitwarden/src/error.rs b/crates/bitwarden/src/error.rs
@@ -37,8 +37,6 @@ pub enum Error {
     ExportError(#[from] ExportError),
 
     // Fido
-    /*
-    # PR #1072
     #[cfg(all(feature = "uniffi", feature = "internal"))]
     #[error(transparent)]
     MakeCredential(#[from] bitwarden_fido::MakeCredentialError),
@@ -59,7 +57,7 @@ pub enum Error {
     #[cfg(all(feature = "uniffi", feature = "internal"))]
     #[error(transparent)]
     Fido2Client(#[from] bitwarden_fido::Fido2ClientError),
-    */
+
     #[error("Internal error: {0}")]
     Internal(Cow<'static, str>),
 }

diff --git a/crates/bitwarden/src/lib.rs b/crates/bitwarden/src/lib.rs
@@ -79,18 +79,10 @@ pub mod internal {
         pub use bitwarden_vault::*;
     }
 
-    /*
-      PM-12431
-      # PR #1072
-
-      Temporarily un-export bitwarden_fido, as bitwarden_fido
-      is not ready for release yet. This will unblock the
-      1.0 releases.
-    */
-    // #[cfg(feature = "uniffi")]
-    // pub mod fido {
-    //     pub use bitwarden_fido::*;
-    // }
+    #[cfg(feature = "uniffi")]
+    pub mod fido {
+        pub use bitwarden_fido::*;
+    }
 }
 #[cfg(feature = "internal")]
 pub use internal::*;