fix some errors that occurred during refactor
This commit is contained in:
parent
fc1fdaaaf1
commit
f783ff66cf
@ -157,7 +157,6 @@ pub async fn serve(port: u16, proxy_app: Arc<Web3ProxyApp>) -> anyhow::Result<()
|
|||||||
.route("/user/keys", get(users::rpc_keys_get))
|
.route("/user/keys", get(users::rpc_keys_get))
|
||||||
.route("/user/keys", post(users::rpc_keys_management))
|
.route("/user/keys", post(users::rpc_keys_management))
|
||||||
.route("/user/keys", put(users::rpc_keys_management))
|
.route("/user/keys", put(users::rpc_keys_management))
|
||||||
.route("/user/referral_link", get(users::user_referral_link_get))
|
|
||||||
.route("/user/revert_logs", get(users::user_revert_logs_get))
|
.route("/user/revert_logs", get(users::user_revert_logs_get))
|
||||||
.route(
|
.route(
|
||||||
"/user/stats/aggregate",
|
"/user/stats/aggregate",
|
||||||
|
@ -743,86 +743,6 @@ pub async fn rpc_keys_management(
|
|||||||
Ok(Json(uk).into_response())
|
Ok(Json(uk).into_response())
|
||||||
}
|
}
|
||||||
|
|
||||||
/// the JSON input to the `referral_link` handler
|
|
||||||
#[debug_handle]
|
|
||||||
pub async fn user_referral_link_get(
|
|
||||||
Extension(app): Extension<Arc<Web3ProxyApp>>,
|
|
||||||
TypedHeader(Authorization(bearer)): TypedHeader<Authorization<Bearer>>,
|
|
||||||
Query(params): Query<HashMap<String, String>>,
|
|
||||||
) -> FrontendResult {
|
|
||||||
|
|
||||||
// First get the bearer token and check if the user is logged in
|
|
||||||
let (user, _semaphore) = app.bearer_is_authorized(bearer).await?;
|
|
||||||
|
|
||||||
let db_replica = app
|
|
||||||
.db_replica()
|
|
||||||
.context("getting replica db for user's revert logs")?;
|
|
||||||
|
|
||||||
// Second, check if the user is a premium user
|
|
||||||
let user_tier: UserTier = user_tier::Entity::find()
|
|
||||||
.filter(user_tier::Column::UserId.eq(user.id))
|
|
||||||
.one(db_replica.conn())
|
|
||||||
.await?
|
|
||||||
.ok_or(
|
|
||||||
FrontendErrorResponse::StatusCode(
|
|
||||||
StatusCode::BAD_REQUEST,
|
|
||||||
"Could not find user in db although bearer token is there!".to_string(),
|
|
||||||
None,
|
|
||||||
)
|
|
||||||
)?;
|
|
||||||
|
|
||||||
// TODO: This shouldn't be hardcoded. Also, it should be an enum, not sth like this ...
|
|
||||||
if user_tier.title != "Premium" {
|
|
||||||
return Err(anyhow::anyhow!("User is not premium. Must be premium to create referrals.").into());
|
|
||||||
}
|
|
||||||
|
|
||||||
// Then get the referral token
|
|
||||||
let user_referral: Option<Referral> = refferal::Entity::find()
|
|
||||||
.filter(refferal::Column::UserId.eq(user.id))
|
|
||||||
.one(db_replica.conn())
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
let (referral_code, status_code) = match user_referral {
|
|
||||||
Some(x) => (x.referral_code, StatusCode::OK),
|
|
||||||
None => {
|
|
||||||
|
|
||||||
// Connect to the database for mutable write
|
|
||||||
let db_conn = app
|
|
||||||
.db_conn()?;
|
|
||||||
|
|
||||||
let rand_string = rand::thread_rng()
|
|
||||||
.gen_ascii_chars()
|
|
||||||
.take(32)
|
|
||||||
.collect::<String>();
|
|
||||||
let referral_code = fmt!("llamanodes-{}", rand_string);
|
|
||||||
|
|
||||||
let txn = db_conn.begin().await?;
|
|
||||||
|
|
||||||
// Create a new referral code
|
|
||||||
let referral_entry = referral::ActiveModel {
|
|
||||||
referral_code: referral_code,
|
|
||||||
used_referral_code: None,
|
|
||||||
user_id: user.id,
|
|
||||||
..Default::default()
|
|
||||||
};
|
|
||||||
referral_entry.insert(&txn).await?;
|
|
||||||
txn.commit().await?;
|
|
||||||
(referral_code, StatusCode::CREATED)
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
let response_json = json!({
|
|
||||||
"referral_code": referral_code,
|
|
||||||
"bearer_token": user_bearer_token,
|
|
||||||
"user": user,
|
|
||||||
});
|
|
||||||
|
|
||||||
let response = (status_code, Json(response_json)).into_response();
|
|
||||||
Ok(response)
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/// `GET /user/revert_logs` -- Use a bearer token to get the user's revert logs.
|
/// `GET /user/revert_logs` -- Use a bearer token to get the user's revert logs.
|
||||||
#[debug_handler]
|
#[debug_handler]
|
||||||
pub async fn user_revert_logs_get(
|
pub async fn user_revert_logs_get(
|
||||||
|
Loading…
Reference in New Issue
Block a user