Skip to content

Commit f36c0bf

Browse files
committed
fixes test for oauth ser deser
1 parent c3900d9 commit f36c0bf

File tree

2 files changed

+21
-2
lines changed

2 files changed

+21
-2
lines changed

crates/chat-cli/src/auth/builder_id.rs

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,34 @@ use crate::database::secret_store::{
5858
SecretStore,
5959
};
6060

61-
#[derive(Debug, Copy, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
61+
#[derive(Debug, Copy, Clone, PartialEq, Eq, serde::Deserialize)]
6262
pub enum OAuthFlow {
6363
DeviceCode,
6464
// This must remain backwards compatible
6565
#[serde(alias = "PKCE")]
6666
Pkce,
6767
}
6868

69+
// Implement Serialize manually to ensure proper serialization
70+
impl serde::Serialize for OAuthFlow {
71+
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
72+
where
73+
S: serde::Serializer,
74+
{
75+
match *self {
76+
OAuthFlow::DeviceCode => serializer.serialize_str("DeviceCode"),
77+
OAuthFlow::Pkce => serialize_pkce(serializer),
78+
}
79+
}
80+
}
81+
82+
fn serialize_pkce<S>(serializer: S) -> Result<S::Ok, S::Error>
83+
where
84+
S: serde::Serializer,
85+
{
86+
serializer.serialize_str("PKCE")
87+
}
88+
6989
impl std::fmt::Display for OAuthFlow {
7090
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
7191
match *self {

crates/chat-cli/src/cli/chat/conversation_state.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -895,7 +895,6 @@ mod tests {
895895
};
896896
use crate::cli::chat::tool_manager::ToolManager;
897897
use crate::database::Database;
898-
use crate::platform::Env;
899898

900899
fn assert_conversation_state_invariants(state: FigConversationState, assertion_iteration: usize) {
901900
if let Some(Some(msg)) = state.history.as_ref().map(|h| h.first()) {

0 commit comments

Comments
 (0)