fix: test & lint

Author: darkskygit

packages/backend/native/src/auth_session.rs

@@ -111,14 +111,14 @@ pub(crate) fn sign_auth_session_access_token(
     serde_json::to_vec(&AccessTokenHeader {
       alg: "HS256",
       typ: "JWT",
-      kid: &key_id,
+      kid: key_id,
     })
     .map_err(|_| "access_token_encode_failed")?,
   );
   let claims = URL_SAFE_NO_PAD.encode(
     serde_json::to_vec(&AccessTokenClaims {
-      sub: &user_id,
-      sid: &auth_session_id,
+      sub: user_id,
+      sid: auth_session_id,
       typ: ACCESS_TOKEN_TYPE,
       iss: ACCESS_TOKEN_ISSUER,
       aud: ACCESS_TOKEN_AUDIENCE,

packages/backend/native/src/runtime/backend_runtime/auth_session/mod.rs

@@ -17,7 +17,7 @@ mod types;
 
 use serde_json::Value;
 use session::{decision_time, lock_refresh_tokens, lock_user};
-use types::{AuthSessionCommand, PrincipalInput};
+use types::{AuthSessionCommand, PrincipalInput, TokenPairSession};
 
 use super::{BackendRuntime, RuntimeError, RuntimeResult, to_napi_error};
 

packages/backend/native/src/runtime/backend_runtime/auth_session/principal.rs

@@ -105,7 +105,7 @@ async fn access_token(
     user_session_expires_at: row.expires_at,
   }) {
     SessionState::Active => Ok(PrincipalResult::Valid {
-      principal: row.into_principal(Some(auth_session_id)),
+      principal: Box::new(row.into_principal(Some(auth_session_id))),
       refreshed_expires_at: None,
     }),
     SessionState::Expired => Ok(PrincipalResult::AuthSessionExpired),
@@ -184,7 +184,7 @@ async fn cookie(
     .await
     .map_err(|error| RuntimeError::database("commit cookie principal", error))?;
   Ok(PrincipalResult::Valid {
-    principal: row.into_principal(None),
+    principal: Box::new(row.into_principal(None)),
     refreshed_expires_at,
   })
 }

packages/backend/native/src/runtime/backend_runtime/auth_session/refresh.rs

@@ -6,7 +6,7 @@ use sqlx::{PgPool, Row};
 use subtle::ConstantTimeEq;
 
 use super::{
-  RuntimeError, RuntimeResult,
+  RuntimeError, RuntimeResult, TokenPairSession,
   session::{decision_time, lock_refresh_tokens, lock_user, lock_user_session, token_pair},
   successor::SuccessorKey,
   types::RefreshResult,
@@ -164,11 +164,12 @@ pub(super) async fn refresh(
         &mut tx,
         config,
         &row.user_id,
-        &row.auth_session_id,
         candidate,
         refresh_expires_at,
-        row.absolute_expires_at,
-        None,
+        TokenPairSession {
+          id: row.auth_session_id.clone(),
+          absolute_expires_at: row.absolute_expires_at,
+        },
         now,
       )
       .await?;
@@ -216,15 +217,16 @@ pub(super) async fn refresh(
         &mut tx,
         config,
         &row.user_id,
-        &row.auth_session_id,
         crate::auth_session::AuthSessionRefreshToken {
           token,
           id: replacement.id,
           secret_hash: replacement.secret_hash,
         },
         replacement.expires_at,
-        row.absolute_expires_at,
-        None,
+        TokenPairSession {
+          id: row.auth_session_id.clone(),
+          absolute_expires_at: row.absolute_expires_at,
+        },
         now,
       )
       .await?;

packages/backend/native/src/runtime/backend_runtime/auth_session/session.rs

@@ -150,18 +150,20 @@ pub(super) async fn exchange(
     .execute(&mut *tx)
     .await
     .map_err(|error| RuntimeError::database("consume auth session exchange", error))?;
-  let pair = token_pair(
+  let mut pair = token_pair(
     &mut tx,
     config,
     &user_id,
-    &auth_session_id,
     refresh,
     idle_expires_at,
-    absolute_expires_at,
-    Some(is_new_device),
+    TokenPairSession {
+      id: auth_session_id,
+      absolute_expires_at,
+    },
     now,
   )
   .await?;
+  pair.is_new_device = Some(is_new_device);
   tx.commit()
     .await
     .map_err(|error| RuntimeError::database("commit auth session exchange", error))?;
@@ -172,18 +174,16 @@ pub(super) async fn token_pair(
   connection: &mut PgConnection,
   config: &super::super::BackendRuntimeConfig,
   user_id: &str,
-  auth_session_id: &str,
   refresh: AuthSessionRefreshToken,
   refresh_expires_at: DateTime<Utc>,
-  absolute_expires_at: DateTime<Utc>,
-  is_new_device: Option<bool>,
+  session: TokenPairSession,
   now: DateTime<Utc>,
 ) -> RuntimeResult<TokenPair> {
   let signing_key = keyring::active(connection, config).await?;
   let expires_at = access_token_deadline(now, config.auth.access_token_ttl_seconds);
   let access_token = sign_auth_session_access_token(
     user_id,
-    auth_session_id,
+    &session.id,
     &signing_key.id,
     &signing_key.secret,
     now.timestamp(),
@@ -197,11 +197,8 @@ pub(super) async fn token_pair(
     expires_in: config.auth.access_token_ttl_seconds,
     refresh_token: refresh.token,
     refresh_expires_at,
-    session: TokenPairSession {
-      id: auth_session_id.to_string(),
-      absolute_expires_at,
-    },
-    is_new_device,
+    session,
+    is_new_device: None,
   })
 }
 

packages/backend/native/src/runtime/backend_runtime/auth_session/types.rs

@@ -298,7 +298,7 @@ pub(super) struct Principal {
 #[serde(tag = "status", rename_all = "snake_case")]
 pub(super) enum PrincipalResult {
   Valid {
-    principal: Principal,
+    principal: Box<Principal>,
     #[serde(rename = "refreshedExpiresAt")]
     refreshed_expires_at: Option<DateTime<Utc>>,
   },

packages/backend/native/src/runtime/backend_runtime/doc_writer.rs

@@ -122,7 +122,6 @@ async fn append_authorized_updates(
         &input.workspace_id,
         Some(permission_doc_id),
         &command,
-        deployment,
       )
       .await
       .map_err(super::to_napi_error)?;
@@ -147,7 +146,6 @@ async fn append_authorized_updates(
         &input.workspace_id,
         None,
         &DomainCommand::CreateDoc,
-        deployment,
       )
       .await
       .map_err(super::to_napi_error)?;