feat: add NangoConnection<I> extractor for nango-powered integration routes

apps/api/src/main.rs

@@ -71,8 +71,12 @@ async fn app() -> Router {
     let auth_state_basic = AuthState::new(&env.supabase.supabase_url);
     let auth_state_support = AuthState::new(&env.supabase.supabase_url);
 
-    let calendar_config = hypr_api_calendar::CalendarConfig::new(&env.nango);
-    let nango_config = hypr_api_nango::NangoConfig::new(&env.nango);
+    let nango_config = hypr_api_nango::NangoConfig::new(
+        &env.nango,
+        &env.supabase,
+        Some(env.supabase.supabase_service_role_key.clone()),
+    );
+    let nango_connection_state = hypr_api_nango::NangoConnectionState::from_config(&nango_config);
     let subscription_config =
         hypr_api_subscription::SubscriptionConfig::new(&env.supabase, &env.stripe);
     let support_config = hypr_api_support::SupportConfig::new(
@@ -101,8 +105,9 @@ async fn app() -> Router {
 
     let pro_routes = Router::new()
         .merge(hypr_api_research::router(research_config))
-        .nest("/calendar", hypr_api_calendar::router(calendar_config))
+        .nest("/calendar", hypr_api_calendar::router())
         .nest("/nango", hypr_api_nango::router(nango_config.clone()))
+        .layer(axum::Extension(nango_connection_state))
         .route_layer(middleware::from_fn(auth::sentry_and_analytics))
         .route_layer(middleware::from_fn_with_state(
             auth_state_pro,

crates/api-calendar/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-hypr-api-env = { workspace = true }
+hypr-api-nango = { workspace = true }
 hypr-google-calendar = { workspace = true }
 hypr-nango = { workspace = true }
 
@@ -13,9 +13,7 @@ chrono = { workspace = true, features = ["serde"] }
 utoipa = { workspace = true }
 
 axum = { workspace = true }
-reqwest = { workspace = true, features = ["json"] }
 sentry = { workspace = true }
-tokio = { workspace = true }
 tracing = { workspace = true }
 
 serde = { workspace = true, features = ["derive"] }

crates/api-calendar/src/error.rs

@@ -30,6 +30,9 @@ pub enum CalendarError {
 
     #[error("Internal error: {0}")]
     Internal(String),
+
+    #[error(transparent)]
+    NangoConnection(#[from] hypr_api_nango::NangoConnectionError),
 }
 
 impl IntoResponse for CalendarError {
@@ -48,6 +51,7 @@ impl IntoResponse for CalendarError {
                     internal_message,
                 )
             }
+            Self::NangoConnection(err) => return err.into_response(),
         };
 
         let body = Json(ErrorResponse {

crates/api-calendar/src/lib.rs

@@ -1,9 +1,6 @@
-mod config;
 mod error;
 mod openapi;
 mod routes;
-mod state;
 
-pub use config::CalendarConfig;
 pub use openapi::openapi;
 pub use routes::router;

crates/api-calendar/src/openapi.rs

@@ -11,7 +11,6 @@ use crate::routes::ListEventsResponse;
     ),
     components(
         schemas(
-            crate::routes::calendar::ListCalendarsRequest,
             crate::routes::calendar::ListCalendarsResponse,
             crate::routes::calendar::ListEventsRequest,
             ListEventsResponse,

crates/api-calendar/src/routes/calendar.rs

@@ -1,14 +1,9 @@
-use axum::{Json, extract::State};
+use axum::Json;
+use hypr_api_nango::{GoogleCalendar, NangoConnection};
 use serde::{Deserialize, Serialize};
 use utoipa::ToSchema;
 
 use crate::error::{CalendarError, Result};
-use crate::state::AppState;
-
-#[derive(Debug, Deserialize, ToSchema)]
-pub struct ListCalendarsRequest {
-    pub connection_id: String,
-}
 
 #[derive(Debug, Serialize, ToSchema)]
 pub struct ListCalendarsResponse {
@@ -17,7 +12,6 @@ pub struct ListCalendarsResponse {
 
 #[derive(Debug, Deserialize, ToSchema)]
 pub struct ListEventsRequest {
-    pub connection_id: String,
     pub calendar_id: String,
     #[serde(default)]
     pub time_min: Option<String>,
@@ -42,7 +36,6 @@ pub struct ListEventsResponse {
 
 #[derive(Debug, Deserialize, ToSchema)]
 pub struct CreateEventRequest {
-    pub connection_id: String,
     pub calendar_id: String,
     pub summary: String,
     pub start: EventDateTime,
@@ -82,7 +75,6 @@ pub struct CreateEventResponse {
 #[utoipa::path(
     post,
     path = "/calendars",
-    request_body = ListCalendarsRequest,
     responses(
         (status = 200, description = "Calendars fetched", body = ListCalendarsResponse),
         (status = 401, description = "Unauthorized"),
@@ -91,15 +83,9 @@ pub struct CreateEventResponse {
     tag = "calendar",
 )]
 pub async fn list_calendars(
-    State(state): State<AppState>,
-    Json(payload): Json<ListCalendarsRequest>,
+    nango: NangoConnection<GoogleCalendar>,
 ) -> Result<Json<ListCalendarsResponse>> {
-    let proxy = state
-        .nango
-        .integration("google-calendar")
-        .connection(&payload.connection_id);
-    let http = hypr_nango::NangoHttpClient::new(proxy);
-    let client = hypr_google_calendar::GoogleCalendarClient::new(http);
+    let client = hypr_google_calendar::GoogleCalendarClient::new(nango.into_http());
 
     let response = client
         .list_calendars()
@@ -127,15 +113,10 @@ pub async fn list_calendars(
     tag = "calendar",
 )]
 pub async fn list_events(
-    State(state): State<AppState>,
+    nango: NangoConnection<GoogleCalendar>,
     Json(payload): Json<ListEventsRequest>,
 ) -> Result<Json<ListEventsResponse>> {
-    let proxy = state
-        .nango
-        .integration("google-calendar")
-        .connection(&payload.connection_id);
-    let http = hypr_nango::NangoHttpClient::new(proxy);
-    let client = hypr_google_calendar::GoogleCalendarClient::new(http);
+    let client = hypr_google_calendar::GoogleCalendarClient::new(nango.into_http());
 
     let time_min = payload
         .time_min
@@ -196,15 +177,10 @@ pub async fn list_events(
     tag = "calendar",
 )]
 pub async fn create_event(
-    State(state): State<AppState>,
+    nango: NangoConnection<GoogleCalendar>,
     Json(payload): Json<CreateEventRequest>,
 ) -> Result<Json<CreateEventResponse>> {
-    let proxy = state
-        .nango
-        .integration("google-calendar")
-        .connection(&payload.connection_id);
-    let http = hypr_nango::NangoHttpClient::new(proxy);
-    let client = hypr_google_calendar::GoogleCalendarClient::new(http);
+    let client = hypr_google_calendar::GoogleCalendarClient::new(nango.into_http());
 
     let req = hypr_google_calendar::CreateEventRequest {
         calendar_id: payload.calendar_id,

crates/api-calendar/src/routes/mod.rs

@@ -2,17 +2,11 @@ pub(crate) mod calendar;
 
 use axum::{Router, routing::post};
 
-use crate::config::CalendarConfig;
-use crate::state::AppState;
-
 pub use calendar::ListEventsResponse;
 
-pub fn router(config: CalendarConfig) -> Router {
-    let state = AppState::new(config);
-
+pub fn router() -> Router {
     Router::new()
         .route("/calendars", post(calendar::list_calendars))
         .route("/events", post(calendar::list_events))
         .route("/events/create", post(calendar::create_event))
-        .with_state(state)
 }

crates/api-nango/Cargo.toml

@@ -8,6 +8,8 @@ hypr-api-auth = { workspace = true }
 hypr-api-env = { workspace = true }
 hypr-nango = { workspace = true }
 
+chrono = { workspace = true }
+urlencoding = { workspace = true }
 utoipa = { workspace = true }
 
 axum = { workspace = true }

crates/api-nango/src/config.rs

@@ -1,14 +1,24 @@
-use hypr_api_env::NangoEnv;
+use hypr_api_env::{NangoEnv, SupabaseEnv};
 
 #[derive(Clone)]
 pub struct NangoConfig {
     pub nango: NangoEnv,
+    pub supabase_url: String,
+    pub supabase_anon_key: String,
+    pub supabase_service_role_key: Option<String>,
 }
 
 impl NangoConfig {
-    pub fn new(nango: &NangoEnv) -> Self {
+    pub fn new(
+        nango: &NangoEnv,
+        supabase: &SupabaseEnv,
+        supabase_service_role_key: Option<String>,
+    ) -> Self {
         Self {
             nango: nango.clone(),
+            supabase_url: supabase.supabase_url.clone(),
+            supabase_anon_key: supabase.supabase_anon_key.clone(),
+            supabase_service_role_key,
         }
     }
 }