Реформат путей к эндпоинтам.

Добавлен экстрактор пользователя с дополнительными полями.

Добавлена связь таблиц User и FCM.

Завершена реализация авторизации с помощью VK ID.

Добавлен эндпоинт fcm/update-callback/{version}.

src/routes/auth/mod.rs

@@ -1,3 +1,8 @@
-pub mod sign_in;
-pub mod sign_up;
+mod sign_in;
+mod sign_up;
 mod shared;
+
+pub use sign_in::*;
+pub use sign_up::*;
+
+// TODO: change-password

src/routes/auth/sign_in.rs

@@ -11,7 +11,7 @@ use diesel::SaveChangesDsl;
 use std::ops::DerefMut;
 use web::Json;
 
-async fn sign_in(
+async fn sign_in_combined(
     data: SignInData,
     app_state: &web::Data<AppState>,
 ) -> Result<UserResponse, ErrorCode> {
@@ -55,8 +55,8 @@ async fn sign_in(
     (status = NOT_ACCEPTABLE, body = ResponseError<ErrorCode>)
 ))]
 #[post("/sign-in")]
-pub async fn sign_in_default(data: Json<Request>, app_state: web::Data<AppState>) -> ServiceResponse {
-    sign_in(Default(data.into_inner()), &app_state).await.into()
+pub async fn sign_in(data: Json<Request>, app_state: web::Data<AppState>) -> ServiceResponse {
+    sign_in_combined(Default(data.into_inner()), &app_state).await.into()
 }
 
 #[utoipa::path(responses(
@@ -68,7 +68,7 @@ pub async fn sign_in_vk(data_json: Json<vk::Request>, app_state: web::Data<AppSt
     let data = data_json.into_inner();
 
     match parse_vk_id(&data.access_token) {
-        Ok(id) => sign_in(Vk(id), &app_state).await.into(),
+        Ok(id) => sign_in_combined(Vk(id), &app_state).await.into(),
         Err(_) => ErrorCode::InvalidVkAccessToken.into_response(),
     }
 }
@@ -134,7 +134,7 @@ mod tests {
     use super::schema::*;
     use crate::database::driver;
     use crate::database::models::{User, UserRole};
-    use crate::routes::auth::sign_in::sign_in_default;
+    use crate::routes::auth::sign_in::sign_in;
     use crate::test_env::tests::{static_app_state, test_app_state, test_env};
     use crate::utility;
     use actix_test::test_app;
@@ -146,7 +146,7 @@ mod tests {
     use std::fmt::Write;
 
     async fn sign_in_client(data: Request) -> ServiceResponse {
-        let app = test_app(test_app_state(), sign_in_default).await;
+        let app = test_app(test_app_state(), sign_in).await;
 
         let req = test::TestRequest::with_uri("/sign-in")
             .method(Method::POST)

src/routes/auth/sign_up.rs

@@ -9,7 +9,7 @@ use actix_web::{post, web};
 use rand::{Rng, rng};
 use web::Json;
 
-async fn sign_up(
+async fn sign_up_combined(
     data: SignUpData,
     app_state: &web::Data<AppState>,
 ) -> Result<UserResponse, ErrorCode> {
@@ -50,13 +50,13 @@ async fn sign_up(
     (status = NOT_ACCEPTABLE, body = ResponseError<ErrorCode>)
 ))]
 #[post("/sign-up")]
-pub async fn sign_up_default(
+pub async fn sign_up(
     data_json: Json<Request>,
     app_state: web::Data<AppState>,
 ) -> ServiceResponse {
     let data = data_json.into_inner();
 
-    sign_up(
+    sign_up_combined(
         SignUpData {
             username: data.username,
             password: data.password,
@@ -83,7 +83,7 @@ pub async fn sign_up_vk(
     let data = data_json.into_inner();
 
     match parse_vk_id(&data.access_token) {
-        Ok(id) => sign_up(
+        Ok(id) => sign_up_combined(
             SignUpData {
                 username: data.username,
                 password: rng()
@@ -243,7 +243,7 @@ mod tests {
     use crate::database::driver;
     use crate::database::models::UserRole;
     use crate::routes::auth::sign_up::schema::Request;
-    use crate::routes::auth::sign_up::sign_up_default;
+    use crate::routes::auth::sign_up::sign_up;
     use crate::test_env::tests::{static_app_state, test_app_state, test_env};
     use actix_test::test_app;
     use actix_web::dev::ServiceResponse;
@@ -258,7 +258,7 @@ mod tests {
     }
 
     async fn sign_up_client(data: SignUpPartial) -> ServiceResponse {
-        let app = test_app(test_app_state(), sign_up_default).await;
+        let app = test_app(test_app_state(), sign_up).await;
 
         let req = test::TestRequest::with_uri("/sign-up")
             .method(Method::POST)