Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions src-tauri/src/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ pub enum AuthMode {
/// Using an OpenAI API key
ApiKey,
/// Using ChatGPT OAuth tokens
#[serde(alias = "chat_gpt", alias = "chatgpt", alias = "chat_g_pt")]
ChatGPT,
}

Expand All @@ -252,6 +253,7 @@ pub enum AuthData {
key: String,
},
/// ChatGPT OAuth authentication
#[serde(alias = "chat_gpt", alias = "chatgpt", alias = "chat_g_pt")]
ChatGPT {
/// JWT ID token containing user info
id_token: String,
Expand Down Expand Up @@ -547,3 +549,42 @@ mod tests {
assert!(settings.close_behavior_prompt_enabled);
}
}

#[cfg(test)]
mod auth_deserialization_tests {
use super::*;

#[test]
fn test_legacy_chatgpt_spellings_deserialize() {
let legacy_spellings = ["chat_g_p_t", "chat_g_pt", "chat_gpt", "chatgpt"];

for spelling in legacy_spellings {
let mode_json = format!("\"{}\"", spelling);
let mode: Result<AuthMode, _> = serde_json::from_str(&mode_json);
assert_eq!(
mode.expect(&format!("Failed to deserialize AuthMode for {}", spelling)),
AuthMode::ChatGPT
);

let data_json = format!(
r#"{{"type": "{}", "id_token": "id", "access_token": "acc", "refresh_token": "ref", "account_id": null}}"#,
spelling
);
let data: Result<AuthData, _> = serde_json::from_str(&data_json);
match data.expect(&format!("Failed to deserialize AuthData for {}", spelling)) {
AuthData::ChatGPT {
id_token,
access_token,
refresh_token,
account_id,
} => {
assert_eq!(id_token, "id");
assert_eq!(access_token, "acc");
assert_eq!(refresh_token, "ref");
assert!(account_id.is_none());
}
_ => panic!("Expected AuthData::ChatGPT"),
}
}
}
}