some changes
This commit is contained in:
+38
-49
@@ -9,45 +9,10 @@
|
||||
namespace manager {
|
||||
UserManager::UserManager(const model::BinaryPath& bConf) : m_bConf(bConf) { }
|
||||
|
||||
bool UserManager::doesUserExist(const model::User& user)
|
||||
{
|
||||
database::UserRepository userRepo(m_bConf);
|
||||
|
||||
return userRepo.doesUserRecordExist(user, type::UserFilter::username);
|
||||
}
|
||||
|
||||
bool UserManager::validatePassword(const model::User& user)
|
||||
{
|
||||
database::UserRepository userRepo(m_bConf);
|
||||
model::User usr;
|
||||
usr.username = user.username;
|
||||
usr = userRepo.retrieveUserRecord(usr, type::UserFilter::username);
|
||||
|
||||
model::PassSec userSec;
|
||||
userSec.userId = usr.id;
|
||||
userSec = userRepo.retrieverUserSaltRecord(userSec, type::SaltFilter::userId);
|
||||
userSec.hashPassword = usr.password;
|
||||
|
||||
utility::PasswordEncryption passEnc;
|
||||
|
||||
return passEnc.isPasswordValid(user, userSec);
|
||||
}
|
||||
|
||||
|
||||
void UserManager::printUser(const model::User& user)
|
||||
{
|
||||
std::cout << "\nuser info" << std::endl;
|
||||
std::cout << "id: " << user.id << std::endl;
|
||||
std::cout << "firstname: " << user.firstname << std::endl;
|
||||
std::cout << "lastname: " << user.lastname << std::endl;
|
||||
std::cout << "phone: " << user.phone << std::endl;
|
||||
std::cout << "email: " << user.email << std::endl;
|
||||
std::cout << "username: " << user.username << std::endl;
|
||||
std::cout << "password: " << user.password<< std::endl;
|
||||
}
|
||||
|
||||
void UserManager::registerUser(model::User& user)
|
||||
{
|
||||
model::RegisterResult UserManager::registerUser(model::User& user) {
|
||||
model::RegisterResult result;
|
||||
result.username = user.username;
|
||||
printUser(user);
|
||||
|
||||
utility::PasswordEncryption passEnc;
|
||||
@@ -66,22 +31,46 @@ void UserManager::registerUser(model::User& user)
|
||||
hashed.userId = usr.id;
|
||||
|
||||
usrRepo.saveUserSalt(hashed);
|
||||
result.registered = true;
|
||||
result.message = "successfully registered";
|
||||
printUser(usr);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
model::User UserManager::userDtoConv(dto::UserDto::ObjectWrapper& userDto)
|
||||
{
|
||||
model::User user;
|
||||
bool UserManager::doesUserExist(const model::User& user) {
|
||||
database::UserRepository userRepo(m_bConf);
|
||||
|
||||
user.id = (userDto->userId.getPtr() == nullptr) ? 0 : userDto->userId->getValue();
|
||||
user.firstname = (userDto->firstname == nullptr) ? "" : userDto->firstname->c_str();
|
||||
user.lastname = (userDto->lastname == nullptr) ? "" : userDto->lastname->c_str();
|
||||
user.phone = (userDto->phone == nullptr) ? "" : userDto->phone->c_str();
|
||||
user.email = (userDto->email == nullptr) ? "" : userDto->email->c_str();
|
||||
user.username = (userDto->username == nullptr) ? "" : userDto->username->c_str();
|
||||
user.password = (userDto->password == nullptr) ? "" : userDto->password->c_str();
|
||||
return userRepo.doesUserRecordExist(user, type::UserFilter::username);
|
||||
}
|
||||
|
||||
return user;
|
||||
bool UserManager::validatePassword(const model::User& user) {
|
||||
database::UserRepository userRepo(m_bConf);
|
||||
model::User usr;
|
||||
usr.username = user.username;
|
||||
usr = userRepo.retrieveUserRecord(usr, type::UserFilter::username);
|
||||
|
||||
model::PassSec userSec;
|
||||
userSec.userId = usr.id;
|
||||
userSec = userRepo.retrieverUserSaltRecord(userSec, type::SaltFilter::userId);
|
||||
userSec.hashPassword = usr.password;
|
||||
|
||||
utility::PasswordEncryption passEnc;
|
||||
|
||||
return passEnc.isPasswordValid(user, userSec);
|
||||
}
|
||||
|
||||
|
||||
void UserManager::printUser(const model::User& user) {
|
||||
std::cout << "\nuser info" << std::endl;
|
||||
std::cout << "id: " << user.id << std::endl;
|
||||
std::cout << "firstname: " << user.firstname << std::endl;
|
||||
std::cout << "lastname: " << user.lastname << std::endl;
|
||||
std::cout << "phone: " << user.phone << std::endl;
|
||||
std::cout << "email: " << user.email << std::endl;
|
||||
std::cout << "username: " << user.username << std::endl;
|
||||
std::cout << "password: " << user.password<< std::endl;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user