Merge branch 'main' into common

sugyan · Nov 21, 2024 · cc53f84 · cc53f84
2 parents 6f48a9a + ac1ad3f
commit cc53f84
Show file tree

Hide file tree

Showing 155 changed files with 2,074 additions and 1,442 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,12 +26,12 @@ keywords = ["atproto", "bluesky"]
 
 [workspace.dependencies]
 # Intra-workspace dependencies
-atrium-api = { version = "0.24.7", path = "atrium-api", default-features = false }
+atrium-api = { version = "0.24.8", path = "atrium-api", default-features = false }
 atrium-common = { version = "0.1.0", path = "atrium-common" }
 atrium-identity = { version = "0.1.0", path = "atrium-oauth/identity" }
-atrium-xrpc = { version = "0.11.6", path = "atrium-xrpc" }
-atrium-xrpc-client = { version = "0.5.9", path = "atrium-xrpc-client" }
-bsky-sdk = { version = "0.1.12", path = "bsky-sdk" }
+atrium-xrpc = { version = "0.12.0", path = "atrium-xrpc" }
+atrium-xrpc-client = { version = "0.5.10", path = "atrium-xrpc-client" }
+bsky-sdk = { version = "0.1.13", path = "bsky-sdk" }
 
 # DAG-CBOR codec
 ipld-core = { version = "0.4.1", default-features = false, features = ["std"] }

diff --git a/atrium-api/CHANGELOG.md b/atrium-api/CHANGELOG.md
@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.24.8](https://github.com/sugyan/atrium/compare/atrium-api-v0.24.7...atrium-api-v0.24.8) - 2024-11-19
+
+### Added
+
+- Update API, based on the latest lexicon schemas ([#256](https://github.com/sugyan/atrium/pull/256))
+- Update XrpcClient, add AuthorizationToken ([#248](https://github.com/sugyan/atrium/pull/248))
+- Replace OnceCell with static OnceLock for regex compilation ([#250](https://github.com/sugyan/atrium/pull/250))
+
 ## [0.24.7](https://github.com/sugyan/atrium/compare/atrium-api-v0.24.6...atrium-api-v0.24.7) - 2024-10-28
 
 ### Added

diff --git a/atrium-api/Cargo.toml b/atrium-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "atrium-api"
-version = "0.24.7"
+version = "0.24.8"
 authors = ["sugyan <[email protected]>"]
 edition.workspace = true
 rust-version.workspace = true

diff --git a/atrium-api/src/agent/inner.rs b/atrium-api/src/agent/inner.rs
@@ -1,13 +1,17 @@
 use super::{Session, SessionStore};
 use crate::did_doc::DidDocument;
-use crate::types::string::Did;
-use crate::types::TryFromUnknown;
-use atrium_xrpc::error::{Error, Result, XrpcErrorKind};
-use atrium_xrpc::{HttpClient, OutputDataOrBytes, XrpcClient, XrpcRequest};
+use crate::types::{string::Did, TryFromUnknown};
+use atrium_xrpc::{
+    error::{Error, Result, XrpcErrorKind},
+    types::AuthorizationToken,
+    HttpClient, OutputDataOrBytes, XrpcClient, XrpcRequest,
+};
 use http::{Method, Request, Response};
 use serde::{de::DeserializeOwned, Serialize};
-use std::fmt::Debug;
-use std::sync::{Arc, RwLock};
+use std::{
+    fmt::Debug,
+    sync::{Arc, RwLock},
+};
 use tokio::sync::{Mutex, Notify};
 
 struct WrapperClient<S, T> {
@@ -72,13 +76,13 @@ where
     fn base_uri(&self) -> String {
         self.store.get_endpoint()
     }
-    async fn authentication_token(&self, is_refresh: bool) -> Option<String> {
+    async fn authorization_token(&self, is_refresh: bool) -> Option<AuthorizationToken> {
         self.store.get_session().await.map(|session| {
-            if is_refresh {
+            AuthorizationToken::Bearer(if is_refresh {
                 session.data.refresh_jwt
             } else {
                 session.data.access_jwt
-            }
+            })
         })
     }
     async fn atproto_proxy_header(&self) -> Option<String> {