Skip to content

Commit bdf717e

Browse files
devin-ai-integration[bot]yujonglee
devin-ai-integration[bot]
and
yujonglee
committed
extract apps/ai/src/auth.rs into crates/api-auth
Co-Authored-By: yujonglee <yujonglee.dev@gmail.com>
1 parent 0ff839f commit bdf717e

File tree

8 files changed

+231
-111
lines changed

8 files changed

+231
-111
lines changed

‎Cargo.lock‎

Lines changed: 22 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ hypr-agc = { path = "crates/agc", package = "agc" }
2525
hypr-am = { path = "crates/am", package = "am" }
2626
hypr-am2 = { path = "crates/am2", package = "am2" }
2727
hypr-analytics = { path = "crates/analytics", package = "analytics" }
28+
hypr-api-auth = { path = "crates/api-auth", package = "api-auth" }
2829
hypr-api-integration = { path = "crates/api-integration", package = "api-integration" }
2930
hypr-api-subscription = { path = "crates/api-subscription", package = "api-subscription" }
3031
hypr-apple-note = { path = "crates/apple-note", package = "apple-note" }

‎apps/ai/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ edition = "2024"
55

66
[dependencies]
77
hypr-analytics = { workspace = true }
8+
hypr-api-auth = { workspace = true }
89
hypr-llm-proxy = { workspace = true }
9-
hypr-supabase-auth = { workspace = true }
1010
hypr-transcribe-proxy = { workspace = true }
1111
owhisper-client = { workspace = true }
1212

‎apps/ai/src/auth.rs‎

Lines changed: 43 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,116 +1,55 @@
11
use std::collections::BTreeMap;
22

3-
use axum::{
4-
extract::{Request, State},
5-
http::StatusCode,
6-
middleware::Next,
7-
response::{IntoResponse, Response},
8-
};
9-
use hypr_supabase_auth::{Error as SupabaseAuthError, SupabaseAuth};
10-
11-
const PRO_ENTITLEMENT: &str = "hyprnote_pro";
12-
pub const DEVICE_FINGERPRINT_HEADER: &str = "x-device-fingerprint";
13-
14-
#[derive(Clone)]
15-
pub struct AuthState {
16-
inner: SupabaseAuth,
17-
}
18-
19-
impl AuthState {
20-
pub fn new(supabase_url: &str) -> Self {
21-
Self {
22-
inner: SupabaseAuth::new(supabase_url),
23-
}
24-
}
25-
}
26-
27-
pub struct AuthError(SupabaseAuthError);
28-
29-
impl From<SupabaseAuthError> for AuthError {
30-
fn from(err: SupabaseAuthError) -> Self {
31-
Self(err)
32-
}
33-
}
34-
35-
impl IntoResponse for AuthError {
36-
fn into_response(self) -> Response {
37-
let (status, message) = match self.0 {
38-
SupabaseAuthError::MissingAuthHeader => {
39-
(StatusCode::UNAUTHORIZED, "missing_authorization_header")
40-
}
41-
SupabaseAuthError::InvalidAuthHeader => {
42-
(StatusCode::UNAUTHORIZED, "invalid_authorization_header")
43-
}
44-
SupabaseAuthError::JwksFetchFailed => {
45-
(StatusCode::INTERNAL_SERVER_ERROR, "jwks_fetch_failed")
46-
}
47-
SupabaseAuthError::InvalidToken => (StatusCode::UNAUTHORIZED, "invalid_token"),
48-
SupabaseAuthError::MissingEntitlement(_) => {
49-
(StatusCode::FORBIDDEN, "subscription_required")
50-
}
51-
};
52-
(status, message).into_response()
3+
use axum::{extract::Request, middleware::Next, response::Response};
4+
5+
pub use hypr_api_auth::{AuthState, require_auth};
6+
use hypr_api_auth::{Claims, DeviceFingerprint, UserId};
7+
8+
pub async fn sentry_and_analytics(mut request: Request, next: Next) -> Response {
9+
if let Some(claims) = request.extensions().get::<Claims>() {
10+
let device_fingerprint = request.extensions().get::<DeviceFingerprint>();
11+
12+
sentry::configure_scope(|scope| {
13+
scope.set_user(Some(sentry::User {
14+
id: device_fingerprint.map(|f| f.0.clone()),
15+
email: claims.email.clone(),
16+
username: Some(claims.sub.clone()),
17+
..Default::default()
18+
}));
19+
scope.set_tag("user.id", &claims.sub);
20+
21+
let mut ctx = BTreeMap::new();
22+
ctx.insert(
23+
"entitlements".into(),
24+
sentry::protocol::Value::Array(
25+
claims
26+
.entitlements
27+
.iter()
28+
.map(|e| sentry::protocol::Value::String(e.clone()))
29+
.collect(),
30+
),
31+
);
32+
scope.set_context("user_claims", sentry::protocol::Context::Other(ctx));
33+
});
5334
}
54-
}
55-
56-
pub async fn require_pro(
57-
State(state): State<AuthState>,
58-
mut request: Request,
59-
next: Next,
60-
) -> Result<Response, AuthError> {
61-
let auth_header = request
62-
.headers()
63-
.get("Authorization")
64-
.and_then(|h| h.to_str().ok())
65-
.ok_or(SupabaseAuthError::MissingAuthHeader)?;
66-
67-
let device_fingerprint = request
68-
.headers()
69-
.get(DEVICE_FINGERPRINT_HEADER)
70-
.and_then(|h| h.to_str().ok())
71-
.map(String::from);
72-
73-
let token =
74-
SupabaseAuth::extract_token(auth_header).ok_or(SupabaseAuthError::InvalidAuthHeader)?;
7535

76-
let claims = state
77-
.inner
78-
.require_entitlement(token, PRO_ENTITLEMENT)
79-
.await?;
36+
let fingerprint = request
37+
.extensions()
38+
.get::<DeviceFingerprint>()
39+
.map(|f| f.0.clone());
40+
let user_id = request.extensions().get::<UserId>().map(|u| u.0.clone());
8041

81-
sentry::configure_scope(|scope| {
82-
scope.set_user(Some(sentry::User {
83-
id: device_fingerprint.clone(),
84-
email: claims.email.clone(),
85-
username: Some(claims.sub.clone()),
86-
..Default::default()
87-
}));
88-
scope.set_tag("user.id", &claims.sub);
89-
90-
let mut ctx = BTreeMap::new();
91-
ctx.insert(
92-
"entitlements".into(),
93-
sentry::protocol::Value::Array(
94-
claims
95-
.entitlements
96-
.iter()
97-
.map(|e| sentry::protocol::Value::String(e.clone()))
98-
.collect(),
99-
),
100-
);
101-
scope.set_context("user_claims", sentry::protocol::Context::Other(ctx));
102-
});
103-
104-
if let Some(fingerprint) = device_fingerprint {
42+
if let Some(fingerprint) = fingerprint {
10543
request
10644
.extensions_mut()
10745
.insert(hypr_analytics::DeviceFingerprint(fingerprint));
10846
}
10947

110-
let user_id = claims.sub.clone();
111-
request
112-
.extensions_mut()
113-
.insert(hypr_analytics::AuthenticatedUserId(user_id));
48+
if let Some(user_id) = user_id {
49+
request
50+
.extensions_mut()
51+
.insert(hypr_analytics::AuthenticatedUserId(user_id));
52+
}
11453

115-
Ok(next.run(request).await)
54+
next.run(request).await
11655
}

‎apps/ai/src/main.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use hypr_analytics::AnalyticsClientBuilder;
2121
use auth::AuthState;
2222
use env::env;
2323

24-
pub use auth::DEVICE_FINGERPRINT_HEADER;
24+
pub use hypr_api_auth::DEVICE_FINGERPRINT_HEADER;
2525

2626
fn app() -> Router {
2727
let env = env();
@@ -37,16 +37,17 @@ fn app() -> Router {
3737
let llm_config =
3838
hypr_llm_proxy::LlmProxyConfig::new(&env.llm).with_analytics(analytics.clone());
3939
let stt_config = hypr_transcribe_proxy::SttProxyConfig::new(&env.stt).with_analytics(analytics);
40-
let auth_state = AuthState::new(&env.supabase_url);
40+
let auth_state = AuthState::new(&env.supabase_url, "hyprnote_pro");
4141

4242
let protected_routes = Router::new()
4343
.merge(hypr_transcribe_proxy::listen_router(stt_config.clone()))
4444
.merge(hypr_llm_proxy::chat_completions_router(llm_config.clone()))
4545
.nest("/stt", hypr_transcribe_proxy::router(stt_config))
4646
.nest("/llm", hypr_llm_proxy::router(llm_config))
47+
.route_layer(middleware::from_fn(auth::sentry_and_analytics))
4748
.route_layer(middleware::from_fn_with_state(
4849
auth_state,
49-
auth::require_pro,
50+
auth::require_auth,
5051
));
5152

5253
Router::new()

‎crates/api-auth/Cargo.toml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
[package]
2+
name = "api-auth"
3+
version = "0.1.0"
4+
edition = "2024"
5+
6+
[dependencies]
7+
hypr-supabase-auth = { workspace = true }
8+
9+
axum = { workspace = true }
10+
11+
[dev-dependencies]
12+
tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }

0 commit comments

Comments
 (0)