CR: Names

Author: pblazej

livekit-api/src/access_token.rs

@@ -152,7 +152,7 @@ pub struct Claims {
 }
 
 impl Claims {
-    pub fn with_unverified(token: &str) -> Result<Self, AccessTokenError> {
+    pub fn from_unverified(token: &str) -> Result<Self, AccessTokenError> {
         let mut validation = jsonwebtoken::Validation::new(jsonwebtoken::Algorithm::HS256);
         validation.validate_exp = true;
         #[cfg(test)]
@@ -408,7 +408,7 @@ mod tests {
 
     #[test]
     fn test_unverified_token() {
-        let claims = Claims::with_unverified(TEST_TOKEN).expect("Failed to parse token");
+        let claims = Claims::from_unverified(TEST_TOKEN).expect("Failed to parse token");
 
         assert_eq!(claims.sub, "identity");
         assert_eq!(claims.name, "name");
@@ -432,7 +432,7 @@ mod tests {
             .to_jwt()
             .unwrap();
 
-        let claims = Claims::with_unverified(&token).expect("Failed to parse fresh token");
+        let claims = Claims::from_unverified(&token).expect("Failed to parse fresh token");
         assert_eq!(claims.sub, "test");
         assert_eq!(claims.name, "test");
         assert_eq!(claims.video.room, "test-room");
@@ -441,7 +441,7 @@ mod tests {
         let parts: Vec<&str> = token.split('.').collect();
         let malformed_token = format!("{}.{}.wrongsignature", parts[0], parts[1]);
 
-        let claims = Claims::with_unverified(&malformed_token).expect("Failed to parse token with wrong signature");
+        let claims = Claims::from_unverified(&malformed_token).expect("Failed to parse token with wrong signature");
         assert_eq!(claims.sub, "test");
         assert_eq!(claims.name, "test");
     }

livekit-uniffi/python_test/main.py

@@ -15,13 +15,13 @@ def main():
 
     credentials = ApiCredentials(key="devkey", secret="secret")
 
-    jwt = generate_token(
+    jwt = token_generate(
         options=TokenOptions(room_name="test", identity="some_participant"),
         credentials=credentials,
     )
     print(f"Generated JWT: {jwt}")
 
-    decoded_grants = verify_token(
+    decoded_grants = token_verify(
         token=jwt,
         credentials=credentials,
     )

livekit-uniffi/src/access_token.rs

@@ -140,7 +140,7 @@ pub struct TokenOptions {
 /// variables `LIVEKIT_API_KEY` and `LIVEKIT_SECRET` respectively.
 ///
 #[uniffi::export]
-pub fn generate_token(
+pub fn token_generate(
     options: TokenOptions,
     credentials: Option<ApiCredentials>,
 ) -> Result<String, AccessTokenError> {
@@ -187,7 +187,7 @@ pub fn generate_token(
 /// variables `LIVEKIT_API_KEY` and `LIVEKIT_SECRET` respectively.
 ///
 #[uniffi::export]
-pub fn verify_token(
+pub fn token_verify(
     token: &str,
     credentials: Option<ApiCredentials>,
 ) -> Result<Claims, AccessTokenError> {
@@ -208,7 +208,7 @@ pub fn verify_token(
 /// WARNING: Do not use this for authentication - the signature is not verified!
 ///
 #[uniffi::export]
-pub fn unverified_token(token: &str) -> Result<Claims, AccessTokenError> {
-    let claims = access_token::Claims::with_unverified(token)?;
+pub fn token_claims_from_unverified(token: &str) -> Result<Claims, AccessTokenError> {
+    let claims = access_token::Claims::from_unverified(token)?;
     Ok(claims.into())
 }