Comunic/comunicapiv3
1
0
Fork 0
mirror of https://gitlab.com/comunic/comunicapiv3 synced 2025-11-04 09:34:04 +00:00
Code Issues Projects Releases Wiki Activity

Mark new field as to remove

Browse Source
This commit is contained in:
Pierre HUBERT
2021-02-13 14:48:35 +01:00
parent 985abc3e99
commit becd54e8c6
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/api_data/login_success.rs
View File

@@ -11,13 +11,18 @@ struct LoginTokens {
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
pub struct LoginSuccess { pub struct LoginSuccess {
success: String, token: String,
// TODO : remove
tokens: LoginTokens, tokens: LoginTokens,
success: String,
} }
impl LoginSuccess { impl LoginSuccess {
pub fn new(token: &str) -> LoginSuccess { pub fn new(token: &str) -> LoginSuccess {
LoginSuccess { LoginSuccess {
token: token.to_string(),
success: "Login successful".to_string(), success: "Login successful".to_string(),
tokens: LoginTokens { tokens: LoginTokens {
token1: token.to_string(), token1: token.to_string(),

6
src/controllers/routes.rs
View File

@@ -134,12 +134,12 @@ pub fn get_routes() -> Vec<Route> {
// Account controller // Account controller
Route::limited_post_without_login("/account/create", Box::new(account_controller::create), LimitPolicy::SUCCESS(10)), Route::limited_post_without_login("/account/create", Box::new(account_controller::create), LimitPolicy::SUCCESS(10)),
Route::limited_post_without_login("/account/login", Box::new(account_controller::login_user), LimitPolicy::FAILURE(10)), Route::limited_post_without_login("/account/login", Box::new(account_controller::login_user), LimitPolicy::FAILURE(10)),
Route::limited_post_without_login("/user/connectUSER", Box::new(account_controller::login_user), LimitPolicy::FAILURE(10)), Route::limited_post_without_login("/user/connectUSER", Box::new(account_controller::login_user), LimitPolicy::FAILURE(10)), // TODO : remove
Route::post("/account/logout", Box::new(account_controller::logout_user)), Route::post("/account/logout", Box::new(account_controller::logout_user)),
Route::post("/user/disconnectUSER", Box::new(account_controller::logout_user)), Route::post("/user/disconnectUSER", Box::new(account_controller::logout_user)), // TODO : remove
Route::post("/account/disconnect_all_devices", Box::new(account_controller::disconnect_all_devices)), Route::post("/account/disconnect_all_devices", Box::new(account_controller::disconnect_all_devices)),
Route::post("/account/id", Box::new(account_controller::user_id)), Route::post("/account/id", Box::new(account_controller::user_id)),
Route::post("/user/getCurrentUserID", Box::new(account_controller::user_id)), Route::post("/user/getCurrentUserID", Box::new(account_controller::user_id)), // TODO : remove
Route::limited_post_without_login("/account/exists_email", Box::new(account_controller::exists_mail), LimitPolicy::ANY(30)), Route::limited_post_without_login("/account/exists_email", Box::new(account_controller::exists_mail), LimitPolicy::ANY(30)),
Route::limited_post_without_login("/account/has_security_questions", Box::new(account_controller::has_security_questions), LimitPolicy::FAILURE(10)), Route::limited_post_without_login("/account/has_security_questions", Box::new(account_controller::has_security_questions), LimitPolicy::FAILURE(10)),
Route::limited_post_without_login("/account/get_security_questions", Box::new(account_controller::get_security_questions), LimitPolicy::FAILURE(10)), Route::limited_post_without_login("/account/get_security_questions", Box::new(account_controller::get_security_questions), LimitPolicy::FAILURE(10)),

4
src/data/http_request_handler.rs
View File

@@ -78,6 +78,7 @@ impl HttpRequestHandler {
/// Check API client tokens /// Check API client tokens
pub fn check_client_token(&mut self) -> RequestResult { pub fn check_client_token(&mut self) -> RequestResult {
// TODO : remove fallback
let client_name = self.post_string_with_fallback("client", "serviceName")?; let client_name = self.post_string_with_fallback("client", "serviceName")?;
let client = self.ok_or_bad_request( let client = self.ok_or_bad_request(
@@ -111,7 +112,8 @@ impl HttpRequestHandler {
/// Check login token /// Check login token
pub fn check_user_token(&mut self) -> Res { pub fn check_user_token(&mut self) -> Res {
let token = self.post_string("userToken1")?; // TODO : remove fallback
let token = self.post_string_with_fallback("token", "userToken1")?;
// Find user // Find user
match account_helper::find_user_by_login_token(&token, self.api_client()) { match account_helper::find_user_by_login_token(&token, self.api_client()) {