Tagging Crypto-Node.js for release

fix(crypto-nodejs): Fix the prep release script

.github/workflows/prep-crypto-nodejs-release.yml

@@ -61,7 +61,7 @@ jobs:
         uses: orhun/git-cliff-action@v1
         with:
           config: "${{ env.PKG_PATH }}/cliff.toml"
-          args: "${{ inputs.previous_version }}..HEAD"
+          args: "${{env.TAG_PREFIX}}${{ inputs.previous_version }}..HEAD"
         env:
           GIT_CLIFF_TAG: "${{ inputs.version }}"
           GIT_CLIFF_PREPEND: "${{ env.PKG_PATH }}/CHANGELOG.md"

Cargo.lock

@@ -2298,7 +2298,7 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
 
 [[package]]
 name = "matrix-sdk"
-version = "0.6.2"
+version = "0.6.0"
 dependencies = [
  "anyhow",
  "anymap2",
@@ -2372,7 +2372,7 @@ dependencies = [
 
 [[package]]
 name = "matrix-sdk-base"
-version = "0.6.1"
+version = "0.6.0"
 dependencies = [
  "assign",
  "async-stream",

bindings/matrix-sdk-crypto-nodejs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@matrix-org/matrix-sdk-crypto-nodejs",
-    "version": "0.1.0-beta.1",
+    "version": "0.1.0-beta.2",
     "main": "index.js",
     "types": "index.d.ts",
     "napi": {

crates/matrix-sdk-base/Cargo.toml

@@ -9,7 +9,7 @@ name = "matrix-sdk-base"
 readme = "README.md"
 repository = "https://github.com/matrix-org/matrix-rust-sdk"
 rust-version = "1.60"
-version = "0.6.1"
+version = "0.6.0"
 
 [package.metadata.docs.rs]
 all-features = true

crates/matrix-sdk-base/src/client.rs

@@ -96,8 +96,9 @@ impl fmt::Debug for BaseClient {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("Client")
             .field("session_meta", &self.store.session_meta())
+            .field("session_tokens", &self.store.session_tokens)
             .field("sync_token", &self.store.sync_token)
-            .finish_non_exhaustive()
+            .finish()
     }
 }
 

crates/matrix-sdk-base/src/session.rs

@@ -15,8 +15,6 @@
 
 //! User sessions.
 
-use std::fmt;
-
 use ruma::{api::client::session::refresh_token, OwnedDeviceId, OwnedUserId};
 use serde::{Deserialize, Serialize};
 
@@ -38,7 +36,7 @@ use serde::{Deserialize, Serialize};
 ///
 /// assert_eq!(session.device_id.as_str(), "MYDEVICEID");
 /// ```
-#[derive(Clone, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct Session {
     /// The access token used for this session.
     pub access_token: String,
@@ -68,15 +66,6 @@ impl Session {
     }
 }
 
-impl fmt::Debug for Session {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("Session")
-            .field("user_id", &self.user_id)
-            .field("device_id", &self.device_id)
-            .finish_non_exhaustive()
-    }
-}
-
 impl From<ruma::api::client::session::login::v3::Response> for Session {
     fn from(response: ruma::api::client::session::login::v3::Response) -> Self {
         Self {
@@ -99,7 +88,7 @@ pub struct SessionMeta {
 
 /// The mutable parts of the session: the access token and optional refresh
 /// token.
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub struct SessionTokens {
     /// The access token used for this session.
     pub access_token: String,
@@ -118,9 +107,3 @@ impl SessionTokens {
         }
     }
 }
-
-impl fmt::Debug for SessionTokens {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("SessionTokens").finish_non_exhaustive()
-    }
-}

crates/matrix-sdk-indexeddb/Cargo.toml

@@ -31,7 +31,7 @@ matrix-sdk-base = { version = "0.6.0", path = "../matrix-sdk-base", features = [
 matrix-sdk-crypto = { version = "0.6.0", path = "../matrix-sdk-crypto", features = ["js"], optional = true }
 matrix-sdk-store-encryption = { version = "0.2.0", path = "../matrix-sdk-store-encryption" }
 indexed_db_futures = "0.2.3"
-indexed_db_futures_nodejs = { version = "0.2.3", package = "indexed_db_futures", git = "https://github.com/Hywan/rust-indexed-db", branch = "feat-factory-nodejs", optional = true }
+indexed_db_futures_nodejs = { package = "indexed_db_futures", git = "https://github.com/Hywan/rust-indexed-db", branch = "feat-factory-nodejs", optional = true }
 ruma = "0.7.0"
 serde = "1.0.136"
 serde_json = "1.0.79"

crates/matrix-sdk/Cargo.toml

@@ -9,7 +9,7 @@ name = "matrix-sdk"
 readme = "README.md"
 repository = "https://github.com/matrix-org/matrix-rust-sdk"
 rust-version = "1.60"
-version = "0.6.2"
+version = "0.6.0"
 
 [package.metadata.docs.rs]
 features = ["docsrs"]
@@ -110,7 +110,7 @@ features = [
 optional = true
 
 [dependencies.matrix-sdk-base]
-version = "0.6.1"
+version = "0.6.0"
 path = "../matrix-sdk-base"
 default_features = false
 

crates/matrix-sdk/src/config/sync.rs

@@ -47,6 +47,7 @@ impl<'a> fmt::Debug for SyncSettings<'a> {
 
         opt_field!(filter);
         opt_field!(timeout);
+        opt_field!(token);
 
         s.field("full_state", &self.full_state).finish()
     }

crates/matrix-sdk/src/http_client.rs

@@ -105,10 +105,7 @@ impl HttpClient {
         HttpClient { inner, request_config }
     }
 
-    #[tracing::instrument(
-        skip(self, request, access_token),
-        fields(request_type = type_name::<Request>()),
-    )]
+    #[tracing::instrument(skip(self, request), fields(request_type = type_name::<Request>()))]
     pub async fn send<Request>(
         &self,
         request: Request,