Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

collab: Make github_user_login required in LlmTokenClaims (#18882)

Browse source 
This PR makes the `github_user_login` field required in the
`LlmTokenClaims`.

We previously added this in
https://github.com/zed-industries/zed/pull/16316 and made it optional
for backwards-compatibility.

It's been more than long enough for all of the previous LLM tokens to
have expired, so we can now make the field required.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-10-08 20:03:33 -04:00 • committed by GitHub
parent f861479890
commit 801210cd50
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/collab/src/llm/token.rs
View file

@ -13,14 +13,8 @@ pub struct LlmTokenClaims {
pub exp: u64, pub exp: u64,
pub jti: String, pub jti: String,
pub user_id: u64, pub user_id: u64,
// This field is temporarily optional so it can be added pub github_user_login: String,
// in a backwards-compatible way. We can make it required
// once all of the LLM tokens have cycled (~1 hour after
// this change has been deployed).
#[serde(default)]
pub github_user_login: Option<String>,
pub is_staff: bool, pub is_staff: bool,
#[serde(default)]
pub has_llm_closed_beta_feature_flag: bool, pub has_llm_closed_beta_feature_flag: bool,
// This field is temporarily optional so it can be added // This field is temporarily optional so it can be added
// in a backwards-compatible way. We can make it required // in a backwards-compatible way. We can make it required
@ -54,7 +48,7 @@ impl LlmTokenClaims {
exp: (now + LLM_TOKEN_LIFETIME).timestamp() as u64, exp: (now + LLM_TOKEN_LIFETIME).timestamp() as u64,
jti: uuid::Uuid::new_v4().to_string(), jti: uuid::Uuid::new_v4().to_string(),
user_id: user_id.to_proto(), user_id: user_id.to_proto(),
github_user_login: Some(github_user_login), github_user_login,
is_staff, is_staff,
has_llm_closed_beta_feature_flag, has_llm_closed_beta_feature_flag,
has_llm_subscription: Some(has_llm_subscription), has_llm_subscription: Some(has_llm_subscription),