Merge origin/master into codex/wechat

server-rs/crates/api-server/src/wechat_auth.rs

@@ -22,6 +22,7 @@ use crate::{
     auth_payload::map_auth_user_payload,
     auth_session::{
         attach_set_cookie_header, build_refresh_session_cookie_header, create_auth_session,
+        record_daily_login_tracking_event_after_auth_success,
     },
     http_error::AppError,
     platform_errors::{attach_retry_after, map_wechat_provider_error},
@@ -75,6 +76,7 @@ pub async fn start_wechat_login(
 
 pub async fn handle_wechat_callback(
     State(state): State<AppState>,
+    Extension(request_context): Extension<RequestContext>,
     headers: HeaderMap,
     Query(query): Query<WechatCallbackQuery>,
 ) -> Result<impl IntoResponse, AppError> {
@@ -142,6 +144,13 @@ pub async fn handle_wechat_callback(
                 &session_client,
                 AuthLoginMethod::Wechat,
             )?;
+            record_daily_login_tracking_event_after_auth_success(
+                &state,
+                &request_context,
+                &result.user.id,
+                AuthLoginMethod::Wechat,
+            )
+            .await;
             state
                 .sync_auth_store_snapshot_to_spacetime()
                 .await
@@ -209,6 +218,13 @@ pub async fn bind_wechat_phone(
         &session_client,
         AuthLoginMethod::Wechat,
     )?;
+    record_daily_login_tracking_event_after_auth_success(
+        &state,
+        &request_context,
+        &result.user.id,
+        AuthLoginMethod::Wechat,
+    )
+    .await;
     state
         .sync_auth_store_snapshot_to_spacetime()
         .await
@@ -443,6 +459,12 @@ fn map_wechat_bind_phone_error(error: module_auth::PhoneAuthError) -> AppError {
         module_auth::PhoneAuthError::UserNotFound => {
             AppError::from_status(StatusCode::UNAUTHORIZED).with_message(error.to_string())
         }
+        module_auth::PhoneAuthError::SmsProviderInvalidConfig(_) => {
+            AppError::from_status(StatusCode::SERVICE_UNAVAILABLE).with_message(error.to_string())
+        }
+        module_auth::PhoneAuthError::SmsProviderUpstream(_) => {
+            AppError::from_status(StatusCode::BAD_GATEWAY).with_message(error.to_string())
+        }
         module_auth::PhoneAuthError::Store(_) | module_auth::PhoneAuthError::PasswordHash(_) => {
             AppError::from_status(StatusCode::INTERNAL_SERVER_ERROR).with_message(error.to_string())
         }