scottk/wlan-cloud-ucentralsec
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-ucentralsec.git synced 2025-10-31 18:57:51 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Refactor users/tokens into orm.

Browse Source
This commit is contained in:
stephb9959
2021-12-27 15:51:11 -08:00
parent b69b90b243
commit 977742d802
31 changed files with 1031 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/RESTAPI/RESTAPI_submfa_handler.cpp
View File

@@ -12,7 +12,7 @@ namespace OpenWifi {
SecurityObjects::UserInfo User;
// std::cout << "submfa get " << UserInfo_.userinfo.Id << " user:" << UserInfo_.userinfo.email << std::endl;
if (StorageService()->GetSubUserById(UserInfo_.userinfo.Id,User)) {
if (StorageService()->SubDB().GetUserById(UserInfo_.userinfo.Id,User)) {
Poco::JSON::Object Answer;
SecurityObjects::SubMfaConfig MFC;
@@ -47,9 +47,9 @@ namespace OpenWifi {
if (MFC.type == "disabled") {
SecurityObjects::UserInfo User;
StorageService()->GetSubUserById(UserInfo_.userinfo.Id, User);
StorageService()->SubDB().GetUserById(UserInfo_.userinfo.Id, User);
User.userTypeProprietaryInfo.mfa.enabled = false;
StorageService()->UpdateSubUserInfo(UserInfo_.userinfo.email, UserInfo_.userinfo.Id, User);
StorageService()->SubDB().UpdateUserInfo(UserInfo_.userinfo.email, UserInfo_.userinfo.Id, User);
Poco::JSON::Object Answer;
MFC.to_json(Answer);
@@ -57,10 +57,10 @@ namespace OpenWifi {
} else if (MFC.type == "email") {
SecurityObjects::UserInfo User;
StorageService()->GetSubUserById(UserInfo_.userinfo.Id, User);
StorageService()->SubDB().GetUserById(UserInfo_.userinfo.Id, User);
User.userTypeProprietaryInfo.mfa.enabled = true;
User.userTypeProprietaryInfo.mfa.method = "email";
StorageService()->UpdateSubUserInfo(UserInfo_.userinfo.email, UserInfo_.userinfo.Id, User);
StorageService()->SubDB().UpdateUserInfo(UserInfo_.userinfo.email, UserInfo_.userinfo.Id, User);
MFC.sms = MFC.sms;
MFC.type = "email";
@@ -93,7 +93,7 @@ namespace OpenWifi {
if (SMSSender()->CompleteValidation(MFC.sms, ChallengeCode, UserInfo_.userinfo.email)) {
SecurityObjects::UserInfo User;
StorageService()->GetSubUserById(UserInfo_.userinfo.Id, User);
StorageService()->SubDB().GetUserById(UserInfo_.userinfo.Id, User);
User.userTypeProprietaryInfo.mfa.enabled = true;
User.userTypeProprietaryInfo.mfa.method = "sms";
SecurityObjects::MobilePhoneNumber PhoneNumber;
@@ -103,7 +103,7 @@ namespace OpenWifi {
User.userTypeProprietaryInfo.mobiles.clear();
User.userTypeProprietaryInfo.mobiles.push_back(PhoneNumber);
StorageService()->UpdateSubUserInfo(UserInfo_.userinfo.email, UserInfo_.userinfo.Id, User);
StorageService()->SubDB().UpdateUserInfo(UserInfo_.userinfo.email, UserInfo_.userinfo.Id, User);
MFC.sms = MFC.sms;
MFC.type = "sms";