Merge pull request #1 from codex/profile-redeem-code

profile redeem code and dev password registration

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

@@ -94,9 +94,10 @@ use crate::{
     runtime_chat::stream_runtime_npc_chat_turn,
     runtime_inventory::get_runtime_inventory_state,
     runtime_profile::{
+        admin_disable_profile_redeem_code, admin_upsert_profile_redeem_code,
         create_profile_recharge_order, get_profile_dashboard, get_profile_play_stats,
         get_profile_recharge_center, get_profile_referral_invite_center, get_profile_wallet_ledger,
-        redeem_profile_referral_invite_code,
+        redeem_profile_referral_invite_code, redeem_profile_reward_code,
     },
     runtime_save::{
         delete_runtime_snapshot, get_runtime_snapshot, list_profile_save_archives,
@@ -143,6 +144,20 @@ pub fn build_router(state: AppState) -> Router {
                 require_admin_auth,
             )),
         )
+        .route(
+            "/admin/api/profile/redeem-codes",
+            post(admin_upsert_profile_redeem_code).route_layer(middleware::from_fn_with_state(
+                state.clone(),
+                require_admin_auth,
+            )),
+        )
+        .route(
+            "/admin/api/profile/redeem-codes/disable",
+            post(admin_disable_profile_redeem_code).route_layer(middleware::from_fn_with_state(
+                state.clone(),
+                require_admin_auth,
+            )),
+        )
         .route(
             "/healthz",
             get(|Extension(request_context): Extension<_>| async move {
@@ -851,6 +866,20 @@ pub fn build_router(state: AppState) -> Router {
                 require_bearer_auth,
             )),
         )
+        .route(
+            "/api/runtime/profile/redeem-codes/redeem",
+            post(redeem_profile_reward_code).route_layer(middleware::from_fn_with_state(
+                state.clone(),
+                require_bearer_auth,
+            )),
+        )
+        .route(
+            "/api/profile/redeem-codes/redeem",
+            post(redeem_profile_reward_code).route_layer(middleware::from_fn_with_state(
+                state.clone(),
+                require_bearer_auth,
+            )),
+        )
         .route(
             "/api/runtime/profile/play-stats",
             get(get_profile_play_stats).route_layer(middleware::from_fn_with_state(
@@ -1357,6 +1386,36 @@ mod tests {
         assert_eq!(response.status(), StatusCode::UNAUTHORIZED);
     }
 
+    #[tokio::test]
+    async fn password_entry_dev_auto_register_creates_unknown_phone_when_enabled() {
+        let config = AppConfig {
+            dev_password_entry_auto_register_enabled: true,
+            ..AppConfig::default()
+        };
+        let app = build_router(AppState::new(config).expect("state should build"));
+
+        let first_response =
+            password_login_request(app.clone(), "13800138023", TEST_PASSWORD).await;
+        let first_status = first_response.status();
+        let first_body = first_response
+            .into_body()
+            .collect()
+            .await
+            .expect("first response body should collect")
+            .to_bytes();
+        let first_payload: Value =
+            serde_json::from_slice(&first_body).expect("first response body should be valid json");
+        let second_response = password_login_request(app, "13800138023", TEST_PASSWORD).await;
+
+        assert_eq!(first_status, StatusCode::OK);
+        assert!(first_payload["token"].as_str().is_some());
+        assert_eq!(
+            first_payload["user"]["loginMethod"],
+            Value::String("password".to_string())
+        );
+        assert_eq!(second_response.status(), StatusCode::OK);
+    }
+
     #[tokio::test]
     async fn password_entry_logs_in_existing_phone_user_and_sets_refresh_cookie() {
         let state = AppState::new(AppConfig::default()).expect("state should build");

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

@@ -29,6 +29,7 @@ pub struct AppConfig {
     pub refresh_cookie_same_site: String,
     pub refresh_session_ttl_days: u32,
     pub auth_store_path: PathBuf,
+    pub dev_password_entry_auto_register_enabled: bool,
     pub sms_auth_enabled: bool,
     pub sms_auth_provider: String,
     pub sms_endpoint: String,
@@ -118,6 +119,7 @@ impl Default for AppConfig {
             refresh_cookie_same_site: "Lax".to_string(),
             refresh_session_ttl_days: 30,
             auth_store_path: PathBuf::from(DEFAULT_AUTH_STORE_PATH),
+            dev_password_entry_auto_register_enabled: false,
             sms_auth_enabled: false,
             sms_auth_provider: "mock".to_string(),
             sms_endpoint: "dypnsapi.aliyuncs.com".to_string(),
@@ -273,6 +275,11 @@ impl AppConfig {
         if let Some(auth_store_path) = read_first_non_empty_env(&["GENARRATIVE_AUTH_STORE_PATH"]) {
             config.auth_store_path = PathBuf::from(auth_store_path);
         }
+        if let Some(enabled) =
+            read_first_bool_env(&["GENARRATIVE_DEV_PASSWORD_ENTRY_AUTO_REGISTER_ENABLED"])
+        {
+            config.dev_password_entry_auto_register_enabled = enabled;
+        }
 
         if let Some(sms_auth_enabled) = read_first_bool_env(&["SMS_AUTH_ENABLED"]) {
             config.sms_auth_enabled = sms_auth_enabled;

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

@@ -26,14 +26,19 @@ pub async fn password_entry(
     headers: HeaderMap,
     Json(payload): Json<PasswordEntryRequest>,
 ) -> Result<impl IntoResponse, AppError> {
-    let result = state
-        .password_entry_service()
-        .execute(PasswordEntryInput {
-            phone_number: payload.phone,
-            password: payload.password,
-        })
-        .await
-        .map_err(map_password_entry_error)?;
+    let input = PasswordEntryInput {
+        phone_number: payload.phone,
+        password: payload.password,
+    };
+    let result = if state.config.dev_password_entry_auto_register_enabled {
+        state
+            .password_entry_service()
+            .execute_with_dev_registration(input)
+            .await
+    } else {
+        state.password_entry_service().execute(input).await
+    }
+    .map_err(map_password_entry_error)?;
     let session_client = resolve_session_client_context(&headers);
     let signed_session = create_password_auth_session(&state, &result.user, &session_client)?;
     state

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

@@ -7,30 +7,36 @@ use axum::{
 use module_runtime::{
     PROFILE_RECHARGE_PAYMENT_CHANNEL_MOCK, RuntimeProfileMembershipBenefitRecord,
     RuntimeProfileRechargeCenterRecord, RuntimeProfileRechargeOrderRecord,
-    RuntimeProfileRechargeProductRecord, RuntimeProfileWalletLedgerSourceType,
-    RuntimeReferralInviteCenterRecord, RuntimeReferralRedeemRecord,
+    RuntimeProfileRechargeProductRecord, RuntimeProfileRedeemCodeMode,
+    RuntimeProfileRedeemCodeRecord, RuntimeProfileRewardCodeRedeemRecord,
+    RuntimeProfileWalletLedgerSourceType, RuntimeReferralInviteCenterRecord,
+    RuntimeReferralRedeemRecord,
 };
 use serde_json::{Value, json};
 use shared_contracts::runtime::{
+    AdminDisableProfileRedeemCodeRequest, AdminUpsertProfileRedeemCodeRequest,
     CreateProfileRechargeOrderRequest, CreateProfileRechargeOrderResponse,
     PROFILE_WALLET_LEDGER_SOURCE_TYPE_ASSET_GENERATION_CONSUME,
     PROFILE_WALLET_LEDGER_SOURCE_TYPE_ASSET_GENERATION_REFUND,
     PROFILE_WALLET_LEDGER_SOURCE_TYPE_INVITE_INVITEE_REWARD,
     PROFILE_WALLET_LEDGER_SOURCE_TYPE_INVITE_INVITER_REWARD,
     PROFILE_WALLET_LEDGER_SOURCE_TYPE_POINTS_RECHARGE,
+    PROFILE_WALLET_LEDGER_SOURCE_TYPE_REDEEM_CODE_REWARD,
     PROFILE_WALLET_LEDGER_SOURCE_TYPE_SNAPSHOT_SYNC, ProfileDashboardSummaryResponse,
     ProfileMembershipBenefitResponse, ProfileMembershipResponse, ProfilePlayStatsResponse,
     ProfilePlayedWorkSummaryResponse, ProfileRechargeCenterResponse, ProfileRechargeOrderResponse,
-    ProfileRechargeProductResponse, ProfileReferralInviteCenterResponse,
-    ProfileWalletLedgerEntryResponse, ProfileWalletLedgerResponse,
-    RedeemProfileReferralInviteCodeRequest, RedeemProfileReferralInviteCodeResponse,
+    ProfileRechargeProductResponse, ProfileRedeemCodeAdminResponse,
+    ProfileReferralInviteCenterResponse, ProfileWalletLedgerEntryResponse,
+    ProfileWalletLedgerResponse, RedeemProfileReferralInviteCodeRequest,
+    RedeemProfileReferralInviteCodeResponse, RedeemProfileRewardCodeRequest,
+    RedeemProfileRewardCodeResponse,
 };
 use spacetime_client::SpacetimeClientError;
 use time::OffsetDateTime;
 
 use crate::{
-    api_response::json_success_body, auth::AuthenticatedAccessToken, http_error::AppError,
-    request_context::RequestContext, state::AppState,
+    admin::AuthenticatedAdmin, api_response::json_success_body, auth::AuthenticatedAccessToken,
+    http_error::AppError, request_context::RequestContext, state::AppState,
 };
 
 pub async fn get_profile_dashboard(
@@ -118,6 +124,9 @@ fn format_profile_wallet_ledger_source_type(
         RuntimeProfileWalletLedgerSourceType::AssetGenerationRefund => {
             PROFILE_WALLET_LEDGER_SOURCE_TYPE_ASSET_GENERATION_REFUND
         }
+        RuntimeProfileWalletLedgerSourceType::RedeemCodeReward => {
+            PROFILE_WALLET_LEDGER_SOURCE_TYPE_REDEEM_CODE_REWARD
+        }
     }
 }
 
@@ -228,6 +237,99 @@ pub async fn redeem_profile_referral_invite_code(
     ))
 }
 
+pub async fn redeem_profile_reward_code(
+    State(state): State<AppState>,
+    Extension(request_context): Extension<RequestContext>,
+    Extension(authenticated): Extension<AuthenticatedAccessToken>,
+    Json(payload): Json<RedeemProfileRewardCodeRequest>,
+) -> Result<Json<Value>, Response> {
+    let user_id = authenticated.claims().user_id().to_string();
+    let redeemed_at_micros = OffsetDateTime::now_utc().unix_timestamp_nanos() / 1_000;
+    let record = state
+        .spacetime_client()
+        .redeem_profile_reward_code(user_id, payload.code, redeemed_at_micros as i64)
+        .await
+        .map_err(|error| {
+            runtime_profile_error_response(
+                &request_context,
+                map_runtime_profile_client_error(error),
+            )
+        })?;
+
+    Ok(json_success_body(
+        Some(&request_context),
+        build_redeem_profile_reward_code_response(record),
+    ))
+}
+
+pub async fn admin_upsert_profile_redeem_code(
+    State(state): State<AppState>,
+    Extension(request_context): Extension<RequestContext>,
+    Extension(admin): Extension<AuthenticatedAdmin>,
+    Json(payload): Json<AdminUpsertProfileRedeemCodeRequest>,
+) -> Result<Json<Value>, Response> {
+    let updated_at_micros = OffsetDateTime::now_utc().unix_timestamp_nanos() / 1_000;
+    let mode = parse_profile_redeem_code_mode(&payload.mode).map_err(|error| {
+        runtime_profile_error_response(
+            &request_context,
+            AppError::from_status(StatusCode::BAD_REQUEST).with_message(error),
+        )
+    })?;
+    let record = state
+        .spacetime_client()
+        .admin_upsert_profile_redeem_code(
+            admin.session().subject.clone(),
+            payload.code,
+            mode,
+            payload.reward_points,
+            payload.max_uses,
+            payload.enabled,
+            payload.allowed_user_ids,
+            payload.allowed_public_user_codes,
+            updated_at_micros as i64,
+        )
+        .await
+        .map_err(|error| {
+            runtime_profile_error_response(
+                &request_context,
+                map_runtime_profile_client_error(error),
+            )
+        })?;
+
+    Ok(json_success_body(
+        Some(&request_context),
+        build_profile_redeem_code_admin_response(record),
+    ))
+}
+
+pub async fn admin_disable_profile_redeem_code(
+    State(state): State<AppState>,
+    Extension(request_context): Extension<RequestContext>,
+    Extension(admin): Extension<AuthenticatedAdmin>,
+    Json(payload): Json<AdminDisableProfileRedeemCodeRequest>,
+) -> Result<Json<Value>, Response> {
+    let updated_at_micros = OffsetDateTime::now_utc().unix_timestamp_nanos() / 1_000;
+    let record = state
+        .spacetime_client()
+        .admin_disable_profile_redeem_code(
+            admin.session().subject.clone(),
+            payload.code,
+            updated_at_micros as i64,
+        )
+        .await
+        .map_err(|error| {
+            runtime_profile_error_response(
+                &request_context,
+                map_runtime_profile_client_error(error),
+            )
+        })?;
+
+    Ok(json_success_body(
+        Some(&request_context),
+        build_profile_redeem_code_admin_response(record),
+    ))
+}
+
 pub async fn get_profile_play_stats(
     State(state): State<AppState>,
     Extension(request_context): Extension<RequestContext>,
@@ -396,6 +498,49 @@ fn build_redeem_profile_referral_invite_code_response(
     }
 }
 
+fn build_redeem_profile_reward_code_response(
+    record: RuntimeProfileRewardCodeRedeemRecord,
+) -> RedeemProfileRewardCodeResponse {
+    RedeemProfileRewardCodeResponse {
+        wallet_balance: record.wallet_balance,
+        amount_granted: record.amount_granted,
+        ledger_entry: ProfileWalletLedgerEntryResponse {
+            id: record.ledger_entry.wallet_ledger_id,
+            amount_delta: record.ledger_entry.amount_delta,
+            balance_after: record.ledger_entry.balance_after,
+            source_type: format_profile_wallet_ledger_source_type(record.ledger_entry.source_type)
+                .to_string(),
+            created_at: record.ledger_entry.created_at,
+        },
+    }
+}
+
+fn parse_profile_redeem_code_mode(raw: &str) -> Result<RuntimeProfileRedeemCodeMode, String> {
+    match raw.trim().to_ascii_lowercase().as_str() {
+        "public" => Ok(RuntimeProfileRedeemCodeMode::Public),
+        "unique" => Ok(RuntimeProfileRedeemCodeMode::Unique),
+        "private" => Ok(RuntimeProfileRedeemCodeMode::Private),
+        _ => Err("兑换码类型无效".to_string()),
+    }
+}
+
+fn build_profile_redeem_code_admin_response(
+    record: RuntimeProfileRedeemCodeRecord,
+) -> ProfileRedeemCodeAdminResponse {
+    ProfileRedeemCodeAdminResponse {
+        code: record.code,
+        mode: record.mode.as_str().to_string(),
+        reward_points: record.reward_points,
+        max_uses: record.max_uses,
+        global_used_count: record.global_used_count,
+        enabled: record.enabled,
+        allowed_user_ids: record.allowed_user_ids,
+        created_by: record.created_by,
+        created_at: record.created_at,
+        updated_at: record.updated_at,
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use module_runtime::RuntimeProfileWalletLedgerSourceType;