Merge pull request #24 from felix1251/develop

Develop

Author: felix1251

src/routes/auth/handlers.rs

@@ -35,7 +35,7 @@ pub struct SignInParams {
 pub struct InvalidCredentials {
     #[schema(example = 404)]
     pub status: u16,
-    #[schema(example = "Invalid credentials")]
+    #[schema(example = "INVALID_CREDENTIALS")]
     pub message: String,
 }
 
@@ -45,9 +45,10 @@ pub struct InvalidCredentials {
     tag = "Auth",
     path = "/auth/sign_in",
     responses(
-        (status = 200, description = "Token Response", body = AuthTokens),
-        (status = 404, description = "Invalid Credentials", body = InvalidCredentials),
-        (status = 500, description = "Internal Server Error", body = InternalErrorSchema),
+        (status = 200, description = "Token response", body = AuthTokens),
+        (status = 404, description = "Invalid credentials", body = InvalidCredentials),
+        (status = 422, description = "Request body validation errors", body = ValidationErrorSchema),
+        (status = 500, description = "Internal server error", body = InternalErrorSchema),
     )
 )]
 pub async fn sign_in(
@@ -65,18 +66,16 @@ pub async fn sign_in(
         .filter(users::Column::Email.eq(sign_in_params.email))
         .one(&db)
         .await
-        .map_err(|_err| {
-            AppError::new(StatusCode::INTERNAL_SERVER_ERROR, "INTERNAL_SERVER_ERROR")
-        })?;
+        .map_err(|_err| AppError::new(StatusCode::NOT_FOUND, "INVALID_CREDENTIALS"))?;
 
     if let Some(user) = db_user {
         if !verify_password(sign_in_params.password, &user.encrypted_password)? {
-            return Err(AppError::new(StatusCode::NOT_FOUND, "Invalid Credentials"));
+            return Err(AppError::new(StatusCode::NOT_FOUND, "INVALID_CREDENTIALS"));
         }
         let token = create_jwt(user.id)?;
         return Ok(Json(token));
     }
-    return Err(AppError::new(StatusCode::NOT_FOUND, "Invalid Credentials"));
+    return Err(AppError::new(StatusCode::NOT_FOUND, "INVALID_CREDENTIALS"));
 }
 
 #[derive(Serialize, Deserialize, Validate, ToSchema)]
@@ -101,8 +100,8 @@ pub struct SignUpParams {
     path = "/auth/sign_up",
     responses(
         (status = 201, description = "User created with token response", body = AuthTokens),
-        (status = 422, description = "Validation Errors", body = ValidationErrorSchema),
-        (status = 500, description = "Internal Server Error", body = InternalErrorSchema),
+        (status = 422, description = "Request body validation errors", body = ValidationErrorSchema),
+        (status = 500, description = "Internal server error", body = InternalErrorSchema),
     )
 )]
 pub async fn sign_up(
@@ -188,9 +187,9 @@ pub struct CurrentUser {
     tag = "Auth",
     path = "/auth/me",
     responses(
-        (status = 200, description = "Current user", body = CurrentUser),
+        (status = 200, description = "Current user info", body = CurrentUser),
         (status = 401, description = "Unauthenticated", body = UnauthorizedSchema),
-        (status = 500, description = "Internal Server Error", body = InternalErrorSchema),
+        (status = 500, description = "Internal server error", body = InternalErrorSchema),
     ),
     security(("bearer_auth" = []))
 )]