Mirrors/Axum-Rust-Rest-Api-Template
2
0
Fork 0
mirror of https://github.com/thanipro/Axum-Rust-Rest-Api-Template synced 2024-11-10 06:04:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

group use statement, fix user sql

Browse source
This commit is contained in:
Thani Sheun 2023-05-04 17:03:49 +02:00
parent 6715970628
commit 0c342b3484
6 changed files with 10 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
migrations/20230501172218_user.sql
View file

@ -6,7 +6,7 @@ CREATE TABLE `user` (
`email` varchar(255) NOT NULL, `email` varchar(255) NOT NULL,
`password` varchar(255) NOT NULL, `password` varchar(255) NOT NULL,
`created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`updated_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP, `updated_at` timestamp NULL,
`is_active` tinyint(1) NOT NULL DEFAULT '0', `is_active` tinyint(1) NOT NULL DEFAULT '0',
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
UNIQUE KEY `user_name` (`user_name`), UNIQUE KEY `user_name` (`user_name`),

4
src/error/api_error.rs
View file

@ -1,6 +1,4 @@
use crate::error::db_error::DbError; use crate::error::{db_error::DbError,token_error::TokenError, user_error::UserError };
use crate::error::token_error::TokenError;
use crate::error::user_error::UserError;
use axum::response::{IntoResponse, Response}; use axum::response::{IntoResponse, Response};
use thiserror::Error; use thiserror::Error;

7
src/error/request_error.rs
View file

@ -1,11 +1,8 @@
use crate::response::api_response::ApiErrorResponse; use crate::response::api_response::ApiErrorResponse;
use async_trait::async_trait; use async_trait::async_trait;
use axum::body::HttpBody; use axum::{body::HttpBody,http::Request, BoxError, Json};
use axum::extract::rejection::JsonRejection; use axum::extract::{rejection::JsonRejection, FromRequest};
use axum::extract::FromRequest;
use axum::http::Request;
use axum::response::{IntoResponse, Response}; use axum::response::{IntoResponse, Response};
use axum::{BoxError, Json};
use serde::de::DeserializeOwned; use serde::de::DeserializeOwned;
use thiserror::Error; use thiserror::Error;
use validator::Validate; use validator::Validate;

10
src/handler/auth_handler.rs
View file

@ -1,13 +1,9 @@
use crate::dto::token_dto::TokenReadDto; use crate::dto::{token_dto::TokenReadDto, user_dto::UserLoginDto};
use crate::dto::user_dto::UserLoginDto; use crate::error::{api_error::ApiError,request_error::ValidatedRequest, user_error::UserError};
use crate::error::api_error::ApiError;
use crate::error::request_error::ValidatedRequest;
use crate::error::user_error::UserError;
use crate::repository::user_repository::UserRepositoryTrait; use crate::repository::user_repository::UserRepositoryTrait;
use crate::service::token_service::TokenServiceTrait; use crate::service::token_service::TokenServiceTrait;
use crate::state::auth_state::AuthState; use crate::state::auth_state::AuthState;
use axum::extract::State; use axum::{extract::State, Json};
use axum::Json;
pub async fn auth( pub async fn auth(
State(state): State<AuthState>, State(state): State<AuthState>,

6
src/handler/register_handler.rs
View file

@ -1,9 +1,7 @@
use crate::dto::user_dto::{UserReadDto, UserRegisterDto}; use crate::dto::user_dto::{UserReadDto, UserRegisterDto};
use crate::error::api_error::ApiError; use crate::error::{api_error::ApiError, request_error::ValidatedRequest};
use crate::error::request_error::ValidatedRequest;
use crate::state::user_state::UserState; use crate::state::user_state::UserState;
use axum::extract::State; use axum::{extract::State, Json};
use axum::Json;
pub async fn register( pub async fn register(
State(state): State<UserState>, State(state): State<UserState>,

4
src/middleware/auth.rs
View file

@ -1,6 +1,4 @@
use crate::error::api_error::ApiError; use crate::error::{api_error::ApiError, token_error::TokenError, user_error::UserError};
use crate::error::token_error::TokenError;
use crate::error::user_error::UserError;
use crate::repository::user_repository::UserRepositoryTrait; use crate::repository::user_repository::UserRepositoryTrait;
use crate::service::token_service::TokenServiceTrait; use crate::service::token_service::TokenServiceTrait;
use crate::state::token_state::TokenState; use crate::state::token_state::TokenState;