scottk/wlan-cloud-ucentralsec
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-ucentralsec.git synced 2025-10-30 02:12:32 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Adding creation right ans support for owner field in user.

Browse Source
This commit is contained in:
stephb9959
2022-01-01 23:01:02 -08:00
parent 51dd7bdfa7
commit eda30b3dc3
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/RESTAPI/RESTAPI_subuser_handler.cpp
View File

@@ -58,12 +58,10 @@ namespace OpenWifi {
return NotFound();
}
if(AuthService()->DeleteSubUserFromCache(Id)) {
// nothing to do
}
Logger_.information(Poco::format("Remove all tokens for '%s'", UserInfo_.userinfo.email));
AuthService()->DeleteSubUserFromCache(Id);
StorageService()->SubTokenDB().RevokeAllTokens(TargetUser.email);
StorageService()->PreferencesDB().DeleteRecord("id",Id);
Logger_.information(Poco::format("User '%s' deleted by '%s'.",Id,UserInfo_.userinfo.email));
OK();
}
@@ -103,7 +101,7 @@ namespace OpenWifi {
if(NewUser.name.empty())
NewUser.name = NewUser.email;
if(!StorageService()->SubDB().CreateUser(NewUser.email,NewUser)) {
if(!StorageService()->SubDB().CreateUser(NewUser.email, NewUser)) {
Logger_.information(Poco::format("Could not add user '%s'.",NewUser.email));
return BadRequest(RESTAPI::Errors::RecordNotCreated);
}
@@ -221,13 +219,13 @@ namespace OpenWifi {
if(!NewUser.userTypeProprietaryInfo.mfa.method.empty()) {
if(NewUser.userTypeProprietaryInfo.mfa.method!="email" && NewUser.userTypeProprietaryInfo.mfa.method!="sms" ) {
return BadRequest("Unknown MFA method");
return BadRequest(RESTAPI::Errors::BadMFAMethod);
}
Existing.userTypeProprietaryInfo.mfa.method=NewUser.userTypeProprietaryInfo.mfa.method;
}
if(Existing.userTypeProprietaryInfo.mfa.enabled && Existing.userTypeProprietaryInfo.mfa.method.empty()) {
return BadRequest("Illegal MFA method");
return BadRequest(RESTAPI::Errors::BadMFAMethod);
}
}

7
src/RESTAPI/RESTAPI_user_handler.cpp
View File

@@ -86,7 +86,7 @@ namespace OpenWifi {
}
if(!ACLProcessor::Can(UserInfo_.userinfo,NewUser,ACLProcessor::CREATE)) {
return UnAuthorized("Insufficient access rights.", ACCESS_DENIED);
return UnAuthorized(RESTAPI::Errors::InsufficientAccessRights, ACCESS_DENIED);
}
Poco::toLowerInPlace(NewUser.email);
@@ -225,13 +225,14 @@ namespace OpenWifi {
if(!NewUser.userTypeProprietaryInfo.mfa.method.empty()) {
if(NewUser.userTypeProprietaryInfo.mfa.method!="email" && NewUser.userTypeProprietaryInfo.mfa.method!="sms" ) {
return BadRequest("Unknown MFA method");
return BadRequest(RESTAPI::Errors::BadMFAMethod);
}
Existing.userTypeProprietaryInfo.mfa.method=NewUser.userTypeProprietaryInfo.mfa.method;
}
if(Existing.userTypeProprietaryInfo.mfa.enabled && Existing.userTypeProprietaryInfo.mfa.method.empty()) {
return BadRequest("Illegal MFA method");
return BadRequest(RESTAPI::Errors::BadMFAMethod);
}
}