Let joiners see their own enrolment requests

migrations/069_join_requests_user_index.sql

@@ -0,0 +1 @@
+CREATE INDEX IF NOT EXISTS team_join_requests_user_team_created ON team_join_requests (user_id, team_id, created_at DESC);

src/enrollment.rs

@@ -115,6 +115,13 @@ impl Serialize for RedeemOutcome {
     }
 }
 
+#[derive(serde::Serialize)]
+pub struct RedeemResponse {
+    #[serde(flatten)]
+    pub outcome: RedeemOutcome,
+    pub team_id: Uuid,
+}
+
 #[derive(sqlx::FromRow)]
 struct PendingRequest {
     user_id: Uuid,
@@ -295,11 +302,17 @@ pub(crate) async fn try_admit(
     if team_locked(pool, team_id).await? {
         return Err(EnrollError::Unavailable);
     }
+    let tell_requester = || {
+        if approved_by.is_some() {
+            notifier.notify_my_join_requests_changed(user_id);
+        }
+    };
 
     if is_member(&mut tx, team_id, user_id).await? {
         decide_pending(&mut tx, request_id, team_id, "approved", approved_by).await?;
         tx.commit().await?;
         notify_join_requests_changed(pool, notifier, team_id).await;
+        tell_requester();
         return Ok(RedeemOutcome::Member);
     }
 
@@ -339,6 +352,7 @@ pub(crate) async fn try_admit(
             tx.commit().await?;
             if changed {
                 notify_join_requests_changed(pool, notifier, team_id).await;
+                tell_requester();
             }
             if approved_by.is_some() && reason == PendingReason::SeatLimit {
                 return Err(EnrollError::NoSeat);
@@ -367,6 +381,7 @@ pub(crate) async fn try_admit(
             .await;
             notify_member_added(pool, notifier, team_id, user_id).await;
             notify_join_requests_changed(pool, notifier, team_id).await;
+            tell_requester();
             Ok(RedeemOutcome::Admitted)
         }
     }
@@ -385,7 +400,7 @@ pub(crate) async fn admit_verified_requests(pool: &PgPool, notifier: &SyncNotifi
     });
     for request_id in requests {
         match try_admit(pool, notifier, request_id, None).await {
-            Ok(_) => {}
+            Ok(_) => notifier.notify_my_join_requests_changed(user_id),
             Err(err @ (EnrollError::DomainMismatch | EnrollError::NotFound | EnrollError::Unavailable)) => {
                 warn!(?err, request_id = %request_id, "Join request not admitted after email verification");
             }

src/main.rs

@@ -498,6 +498,7 @@ async fn main() {
         .route("/v1/teams/:team_id", delete(routes::teams::delete_team).patch(routes::teams::rename_team))
         .route("/v1/teams/:team_id/billing-owner", put(routes::team_ownership::transfer_billing_owner))
         .merge(enrollment_routes())
+        .route("/v1/enrollment/requests", get(routes::team_enrollment::my_requests))
         .route(
             "/v1/teams/:team_id/lock-policy",
             put(routes::team_lock_policy::set_lock_policy).delete(routes::team_lock_policy::clear_lock_policy),

src/routes/auth.rs

@@ -18,7 +18,7 @@ use crate::auth::{
     password::{hash_auth_key, verify_auth_key},
     AuthUser,
 };
-use crate::enrollment::{admit_verified_requests, domain_allowed, redeem_for, RedeemOutcome};
+use crate::enrollment::{admit_verified_requests, domain_allowed, redeem_for, RedeemResponse};
 use crate::rate_limit::{
     check_budget, ClientIp, EnrollmentRegisterLimiter, EnrollmentResolveLimiter, RateLimiter, RegisterRateLimiter,
     ResendVerificationRateLimiter,
@@ -277,7 +277,7 @@ pub struct RegisterResponse {
     #[serde(flatten)]
     session: AuthResponse,
     #[serde(skip_serializing_if = "Option::is_none")]
-    enrollment: Option<RedeemOutcome>,
+    enrollment: Option<RedeemResponse>,
 }
 
 #[derive(Serialize)]
@@ -411,6 +411,7 @@ pub async fn register(
     let enrollment = match &token {
         Some(token) => redeem_for(&pool, &notifier, token, session.user_id, public_key.as_deref())
             .await
+            .map(|outcome| RedeemResponse { outcome, team_id: token.team_id })
             .map_err(|err| warn!(?err, user_id = %session.user_id, "Enrolment redeem after registration failed"))
             .ok(),
         None => None,