wont shutdown
This commit is contained in:
parent
501ec21442
commit
17c42243d0
@ -28,7 +28,7 @@ use migration::sea_orm::{
|
|||||||
self, ActiveModelTrait, ColumnTrait, EntityTrait, IntoActiveModel, QueryFilter,
|
self, ActiveModelTrait, ColumnTrait, EntityTrait, IntoActiveModel, QueryFilter,
|
||||||
};
|
};
|
||||||
use migration::{Expr, OnConflict};
|
use migration::{Expr, OnConflict};
|
||||||
use serde::Deserialize;
|
use serde::{Deserialize, Serialize};
|
||||||
use serde_json::json;
|
use serde_json::json;
|
||||||
use siwe::{Message, VerificationOpts};
|
use siwe::{Message, VerificationOpts};
|
||||||
use std::ops::Add;
|
use std::ops::Add;
|
||||||
@ -38,11 +38,11 @@ use time_03::{Duration, OffsetDateTime};
|
|||||||
use tracing::{info, trace, warn};
|
use tracing::{info, trace, warn};
|
||||||
use ulid::Ulid;
|
use ulid::Ulid;
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
#[derive(Debug, Deserialize, Serialize)]
|
||||||
pub struct AdminIncreaseBalancePost {
|
pub struct AdminIncreaseBalancePost {
|
||||||
user_address: Address,
|
pub user_address: Address,
|
||||||
note: Option<String>,
|
pub note: Option<String>,
|
||||||
amount: Decimal,
|
pub amount: Decimal,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// `POST /admin/increase_balance` -- As an admin, modify a user's user-tier
|
/// `POST /admin/increase_balance` -- As an admin, modify a user's user-tier
|
||||||
|
@ -23,7 +23,7 @@ use migration::sea_orm::{
|
|||||||
QueryFilter, TransactionTrait,
|
QueryFilter, TransactionTrait,
|
||||||
};
|
};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use serde_json::json;
|
use serde_json::{json, Value};
|
||||||
use siwe::{Message, VerificationOpts};
|
use siwe::{Message, VerificationOpts};
|
||||||
use std::ops::Add;
|
use std::ops::Add;
|
||||||
use std::str::FromStr;
|
use std::str::FromStr;
|
||||||
@ -50,6 +50,16 @@ pub struct PostLogin {
|
|||||||
pub referral_code: Option<String>,
|
pub referral_code: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// TODO: use this type in the frontend
|
||||||
|
#[derive(Debug, Deserialize)]
|
||||||
|
pub struct LoginPostResponse {
|
||||||
|
pub bearer_token: Ulid,
|
||||||
|
pub rpc_keys: Value,
|
||||||
|
/// unknown data gets put here
|
||||||
|
#[serde(flatten, default = "HashMap::default")]
|
||||||
|
pub extra: HashMap<String, serde_json::Value>,
|
||||||
|
}
|
||||||
|
|
||||||
/// `GET /user/login/:user_address` or `GET /user/login/:user_address/:message_eip` -- Start the "Sign In with Ethereum" (siwe) login flow.
|
/// `GET /user/login/:user_address` or `GET /user/login/:user_address/:message_eip` -- Start the "Sign In with Ethereum" (siwe) login flow.
|
||||||
///
|
///
|
||||||
/// `message_eip`s accepted:
|
/// `message_eip`s accepted:
|
||||||
|
@ -1,6 +1,13 @@
|
|||||||
mod common;
|
mod common;
|
||||||
|
|
||||||
use crate::common::TestApp;
|
use crate::common::TestApp;
|
||||||
|
use ethers::prelude::Signer;
|
||||||
|
use ethers::types::Signature;
|
||||||
|
use rust_decimal::Decimal;
|
||||||
|
use std::str::FromStr;
|
||||||
|
use tracing::{debug, info, trace, warn};
|
||||||
|
use web3_proxy::frontend::admin::AdminIncreaseBalancePost;
|
||||||
|
use web3_proxy::frontend::users::authentication::{LoginPostResponse, PostLogin};
|
||||||
|
|
||||||
// #[cfg_attr(not(feature = "tests-needing-docker"), ignore)]
|
// #[cfg_attr(not(feature = "tests-needing-docker"), ignore)]
|
||||||
#[ignore = "under construction"]
|
#[ignore = "under construction"]
|
||||||
@ -11,13 +18,110 @@ async fn test_admin_imitate_user() {
|
|||||||
todo!();
|
todo!();
|
||||||
}
|
}
|
||||||
|
|
||||||
// #[cfg_attr(not(feature = "tests-needing-docker"), ignore)]
|
#[cfg_attr(not(feature = "tests-needing-docker"), ignore)]
|
||||||
#[ignore = "under construction"]
|
|
||||||
#[test_log::test(tokio::test)]
|
#[test_log::test(tokio::test)]
|
||||||
async fn test_admin_grant_credits() {
|
async fn test_admin_grant_credits() {
|
||||||
let x = TestApp::spawn(true).await;
|
let x = TestApp::spawn(true).await;
|
||||||
|
let r = reqwest::Client::new();
|
||||||
|
|
||||||
todo!();
|
// Setup variables that will be used
|
||||||
|
let login_post_url = format!("{}user/login", x.proxy_provider.url());
|
||||||
|
let increase_balance_post_url = format!("{}admin/increase_balance", x.proxy_provider.url());
|
||||||
|
|
||||||
|
// TODO: I should make a wallet an admin wallet first ...
|
||||||
|
let admin_wallet = x.wallet(1);
|
||||||
|
let user_wallet = x.wallet(2);
|
||||||
|
|
||||||
|
// Login the admin
|
||||||
|
let admin_login_get_url = format!(
|
||||||
|
"{}user/login/{:?}",
|
||||||
|
x.proxy_provider.url(),
|
||||||
|
admin_wallet.address()
|
||||||
|
);
|
||||||
|
let admin_login_message = r.get(admin_login_get_url).send().await.unwrap();
|
||||||
|
let admin_login_message = admin_login_message.text().await.unwrap();
|
||||||
|
// Sign the message and POST it to login as admin
|
||||||
|
let admin_signed: Signature = admin_wallet
|
||||||
|
.sign_message(&admin_login_message)
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
debug!(?admin_signed);
|
||||||
|
let admin_post_login_data = PostLogin {
|
||||||
|
msg: admin_login_message,
|
||||||
|
sig: admin_signed.to_string(),
|
||||||
|
referral_code: None,
|
||||||
|
};
|
||||||
|
debug!(?admin_post_login_data);
|
||||||
|
let admin_login_response = r
|
||||||
|
.post(&login_post_url)
|
||||||
|
.json(&admin_post_login_data)
|
||||||
|
.send()
|
||||||
|
.await
|
||||||
|
.unwrap()
|
||||||
|
.json::<LoginPostResponse>()
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
debug!(?admin_login_response);
|
||||||
|
|
||||||
|
// Also login the user (to create the user)
|
||||||
|
let user_login_get_url = format!(
|
||||||
|
"{}user/login/{:?}",
|
||||||
|
x.proxy_provider.url(),
|
||||||
|
user_wallet.address()
|
||||||
|
);
|
||||||
|
let user_login_message = r.get(user_login_get_url).send().await.unwrap();
|
||||||
|
let user_login_message = user_login_message.text().await.unwrap();
|
||||||
|
|
||||||
|
// Sign the message and POST it to login as admin
|
||||||
|
let user_signed: Signature = user_wallet.sign_message(&user_login_message).await.unwrap();
|
||||||
|
debug!(?user_signed);
|
||||||
|
let user_post_login_data = PostLogin {
|
||||||
|
msg: user_login_message,
|
||||||
|
sig: user_signed.to_string(),
|
||||||
|
referral_code: None,
|
||||||
|
};
|
||||||
|
debug!(?user_post_login_data);
|
||||||
|
let user_login_response = r
|
||||||
|
.post(login_post_url)
|
||||||
|
.json(&user_post_login_data)
|
||||||
|
.send()
|
||||||
|
.await
|
||||||
|
.unwrap()
|
||||||
|
.json::<LoginPostResponse>()
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
debug!(?user_login_response);
|
||||||
|
|
||||||
|
// Now I need to make the user an admin ...
|
||||||
|
|
||||||
|
// Login the user
|
||||||
|
// Use the bearer token of admin to increase user balance
|
||||||
|
let increase_balance_data = AdminIncreaseBalancePost {
|
||||||
|
user_address: user_wallet.address(), // set user address to increase balance
|
||||||
|
amount: Decimal::from(100), // set amount to increase
|
||||||
|
note: Some("Test increasing balance".to_string()),
|
||||||
|
};
|
||||||
|
let increase_balance_response = r
|
||||||
|
.post(increase_balance_post_url)
|
||||||
|
.json(&increase_balance_data)
|
||||||
|
.bearer_auth(admin_login_response.bearer_token)
|
||||||
|
.send()
|
||||||
|
.await
|
||||||
|
.unwrap()
|
||||||
|
.json::<serde_json::Value>()
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
debug!(?increase_balance_response);
|
||||||
|
|
||||||
|
// Check if the response is as expected
|
||||||
|
// assert_eq!(increase_balance_response["user"], user_wallet.address());
|
||||||
|
assert_eq!(
|
||||||
|
Decimal::from_str(increase_balance_response["amount"].as_str().unwrap()).unwrap(),
|
||||||
|
Decimal::from(100)
|
||||||
|
);
|
||||||
|
|
||||||
|
x.wait().await;
|
||||||
}
|
}
|
||||||
|
|
||||||
// #[cfg_attr(not(feature = "tests-needing-docker"), ignore)]
|
// #[cfg_attr(not(feature = "tests-needing-docker"), ignore)]
|
||||||
@ -25,6 +129,5 @@ async fn test_admin_grant_credits() {
|
|||||||
#[test_log::test(tokio::test)]
|
#[test_log::test(tokio::test)]
|
||||||
async fn test_admin_change_user_tier() {
|
async fn test_admin_change_user_tier() {
|
||||||
let x = TestApp::spawn(true).await;
|
let x = TestApp::spawn(true).await;
|
||||||
|
|
||||||
todo!();
|
todo!();
|
||||||
}
|
}
|
||||||
|
@ -8,17 +8,7 @@ use serde::Deserialize;
|
|||||||
use serde_json::Value;
|
use serde_json::Value;
|
||||||
use tracing::{debug, info, trace};
|
use tracing::{debug, info, trace};
|
||||||
use ulid::Ulid;
|
use ulid::Ulid;
|
||||||
use web3_proxy::frontend::users::authentication::PostLogin;
|
use web3_proxy::frontend::users::authentication::{LoginPostResponse, PostLogin};
|
||||||
|
|
||||||
/// TODO: use this type in the frontend
|
|
||||||
#[derive(Debug, Deserialize)]
|
|
||||||
struct LoginPostResponse {
|
|
||||||
pub bearer_token: Ulid,
|
|
||||||
pub rpc_keys: Value,
|
|
||||||
/// unknown data gets put here
|
|
||||||
#[serde(flatten, default = "HashMap::default")]
|
|
||||||
pub extra: HashMap<String, serde_json::Value>,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// TODO: 191 and the other message formats in another test
|
/// TODO: 191 and the other message formats in another test
|
||||||
#[cfg_attr(not(feature = "tests-needing-docker"), ignore)]
|
#[cfg_attr(not(feature = "tests-needing-docker"), ignore)]
|
||||||
|
Loading…
Reference in New Issue
Block a user