diff --git a/crates/api_models/src/events/user.rs b/crates/api_models/src/events/user.rs index c1efffa6d733..3634b51e0cc0 100644 --- a/crates/api_models/src/events/user.rs +++ b/crates/api_models/src/events/user.rs @@ -7,8 +7,8 @@ use crate::user::{ GetMetaDataRequest, GetMetaDataResponse, GetMultipleMetaDataPayload, SetMetaDataRequest, }, AuthorizeResponse, ChangePasswordRequest, ConnectAccountRequest, CreateInternalUserRequest, - DashboardEntryResponse, SignUpRequest, SignUpWithMerchantIdRequest, SwitchMerchantIdRequest, - UserMerchantCreate, GetUsersResponse, + DashboardEntryResponse, GetUsersResponse, SignUpRequest, SignUpWithMerchantIdRequest, + SwitchMerchantIdRequest, UserMerchantCreate, }; impl ApiEventMetric for DashboardEntryResponse { diff --git a/crates/router/src/types/domain/user.rs b/crates/router/src/types/domain/user.rs index 2909cc81ffeb..592195922493 100644 --- a/crates/router/src/types/domain/user.rs +++ b/crates/router/src/types/domain/user.rs @@ -25,7 +25,10 @@ use crate::{ }, db::StorageInterface, routes::AppState, - services::{authentication::UserFromToken, authorization::{info, predefined_permissions}}, + services::{ + authentication::UserFromToken, + authorization::{info, predefined_permissions}, + }, types::transformers::ForeignFrom, utils::user::password, }; diff --git a/crates/router/src/utils/user.rs b/crates/router/src/utils/user.rs index b459b461c0d3..a37c17df60f6 100644 --- a/crates/router/src/utils/user.rs +++ b/crates/router/src/utils/user.rs @@ -1,5 +1,5 @@ use api_models::user as user_api; -use diesel_models::{user_role::UserRole, enums::UserStatus}; +use diesel_models::{enums::UserStatus, user_role::UserRole}; use error_stack::ResultExt; use masking::Secret;