Code cleanup

This commit is contained in:
kdeng00
2019-11-17 13:33:58 -05:00
parent ca1fcb801d
commit 69f5a37eb3
74 changed files with 4397 additions and 4717 deletions
+48 -48
View File
@@ -7,70 +7,70 @@
#include "utility/PasswordEncryption.h"
namespace manager {
UserManager::UserManager(const model::BinaryPath& bConf) : m_bConf(bConf) { }
UserManager::UserManager(const model::BinaryPath& bConf) : m_bConf(bConf) { }
model::RegisterResult UserManager::registerUser(model::User& user) {
model::RegisterResult result;
result.username = user.username;
printUser(user);
model::RegisterResult UserManager::registerUser(model::User& user) {
model::RegisterResult result;
result.username = user.username;
printUser(user);
utility::PasswordEncryption passEnc;
auto hashed = passEnc.hashPassword(user);
user.password = hashed.hashPassword;
utility::PasswordEncryption passEnc;
auto hashed = passEnc.hashPassword(user);
user.password = hashed.hashPassword;
database::UserRepository usrRepo(m_bConf);
usrRepo.saveUserRecord(user);
database::UserRepository usrRepo(m_bConf);
usrRepo.saveUserRecord(user);
model::User usr;
usr.username = user.username;
model::User usr;
usr.username = user.username;
std::cout << usr.username << std::endl;
usr = usrRepo.retrieveUserRecord(usr, type::UserFilter::username);
hashed.hashPassword = usr.password;
hashed.userId = usr.id;
std::cout << usr.username << "\n";
usr = usrRepo.retrieveUserRecord(usr, type::UserFilter::username);
hashed.hashPassword = usr.password;
hashed.userId = usr.id;
usrRepo.saveUserSalt(hashed);
result.registered = true;
result.message = "successfully registered";
printUser(usr);
usrRepo.saveUserSalt(hashed);
result.registered = true;
result.message = "successfully registered";
printUser(usr);
return result;
}
return result;
}
bool UserManager::doesUserExist(const model::User& user) {
database::UserRepository userRepo(m_bConf);
bool UserManager::doesUserExist(const model::User& user) {
database::UserRepository userRepo(m_bConf);
return userRepo.doesUserRecordExist(user, type::UserFilter::username);
}
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);
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;
model::PassSec userSec;
userSec.userId = usr.id;
userSec = userRepo.retrieverUserSaltRecord(userSec, type::SaltFilter::userId);
userSec.hashPassword = usr.password;
utility::PasswordEncryption passEnc;
utility::PasswordEncryption passEnc;
return passEnc.isPasswordValid(user, userSec);
}
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::printUser(const model::User& user) {
std::cout << "\nuser info\n";
std::cout << "id: " << user.id << "\n";
std::cout << "firstname: " << user.firstname << "\n";
std::cout << "lastname: " << user.lastname << "\n";
std::cout << "phone: " << user.phone << "\n";
std::cout << "email: " << user.email << "\n";
std::cout << "username: " << user.username << "\n";
std::cout << "password: " << user.password<< "\n";
}
}