simplify api-auth: remove DeviceFingerprint/UserId, only insert Claims; remove Cargo.lock stubs

Co-Authored-By: yujonglee <yujonglee.dev@gmail.com>

Author: devin-ai-integration[bot]

Cargo.lock

@@ -2,16 +2,22 @@ use std::collections::BTreeMap;
 
 use axum::{extract::Request, middleware::Next, response::Response};
 
+use hypr_api_auth::Claims;
 pub use hypr_api_auth::{AuthState, require_auth};
-use hypr_api_auth::{Claims, DeviceFingerprint, UserId};
+
+const DEVICE_FINGERPRINT_HEADER: &str = "x-device-fingerprint";
 
 pub async fn sentry_and_analytics(mut request: Request, next: Next) -> Response {
-    if let Some(claims) = request.extensions().get::<Claims>() {
-        let device_fingerprint = request.extensions().get::<DeviceFingerprint>();
+    let device_fingerprint = request
+        .headers()
+        .get(DEVICE_FINGERPRINT_HEADER)
+        .and_then(|h| h.to_str().ok())
+        .map(String::from);
 
+    if let Some(claims) = request.extensions().get::<Claims>() {
         sentry::configure_scope(|scope| {
             scope.set_user(Some(sentry::User {
-                id: device_fingerprint.map(|f| f.0.clone()),
+                id: device_fingerprint.clone(),
                 email: claims.email.clone(),
                 username: Some(claims.sub.clone()),
                 ..Default::default()
@@ -31,24 +37,17 @@ pub async fn sentry_and_analytics(mut request: Request, next: Next) -> Response
             );
             scope.set_context("user_claims", sentry::protocol::Context::Other(ctx));
         });
-    }
-
-    let fingerprint = request
-        .extensions()
-        .get::<DeviceFingerprint>()
-        .map(|f| f.0.clone());
-    let user_id = request.extensions().get::<UserId>().map(|u| u.0.clone());
 
-    if let Some(fingerprint) = fingerprint {
+        let user_id = claims.sub.clone();
         request
             .extensions_mut()
-            .insert(hypr_analytics::DeviceFingerprint(fingerprint));
+            .insert(hypr_analytics::AuthenticatedUserId(user_id));
     }
 
-    if let Some(user_id) = user_id {
+    if let Some(fingerprint) = device_fingerprint {
         request
             .extensions_mut()
-            .insert(hypr_analytics::AuthenticatedUserId(user_id));
+            .insert(hypr_analytics::DeviceFingerprint(fingerprint));
     }
 
     next.run(request).await

apps/ai/src/auth.rs

@@ -21,7 +21,7 @@ use hypr_analytics::AnalyticsClientBuilder;
 use auth::AuthState;
 use env::env;
 
-pub use hypr_api_auth::DEVICE_FINGERPRINT_HEADER;
+pub const DEVICE_FINGERPRINT_HEADER: &str = "x-device-fingerprint";
 
 fn app() -> Router {
     let env = env();

apps/ai/src/main.rs

@@ -8,14 +8,6 @@ use hypr_supabase_auth::{Error as SupabaseAuthError, SupabaseAuth};
 
 pub use hypr_supabase_auth::Claims;
 
-pub const DEVICE_FINGERPRINT_HEADER: &str = "x-device-fingerprint";
-
-#[derive(Clone, Debug)]
-pub struct DeviceFingerprint(pub String);
-
-#[derive(Clone, Debug)]
-pub struct UserId(pub String);
-
 #[derive(Clone)]
 pub struct AuthState {
     inner: SupabaseAuth,
@@ -71,12 +63,6 @@ pub async fn require_auth(
         .and_then(|h| h.to_str().ok())
         .ok_or(SupabaseAuthError::MissingAuthHeader)?;
 
-    let device_fingerprint = request
-        .headers()
-        .get(DEVICE_FINGERPRINT_HEADER)
-        .and_then(|h| h.to_str().ok())
-        .map(String::from);
-
     let token =
         SupabaseAuth::extract_token(auth_header).ok_or(SupabaseAuthError::InvalidAuthHeader)?;
 
@@ -85,17 +71,8 @@ pub async fn require_auth(
         .require_entitlement(token, &state.required_entitlement)
         .await?;
 
-    let user_id = claims.sub.clone();
     request.extensions_mut().insert(claims);
 
-    if let Some(fingerprint) = device_fingerprint {
-        request
-            .extensions_mut()
-            .insert(DeviceFingerprint(fingerprint));
-    }
-
-    request.extensions_mut().insert(UserId(user_id));
-
     Ok(next.run(request).await)
 }