scottk/wlan-cloud-owprov
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-owprov.git synced 2025-10-29 17:52:28 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Adding subscriber device search

Browse Source
This commit is contained in:
stephb9959
2022-04-22 14:21:22 -07:00
parent d8106d5d19
commit b8e2698780
6 changed files with 65 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build
View File

@@ -1 +1 @@
96
97

14
src/RESTObjects/RESTAPI_SecurityObjects.cpp
View File

@@ -301,6 +301,20 @@ namespace OpenWifi::SecurityObjects {
return false;
};
void UserInfoList::to_json(Poco::JSON::Object &Obj) const {
field_to_json(Obj,"users",users);
}
bool UserInfoList::from_json(const Poco::JSON::Object::Ptr &Obj) {
try {
field_from_json(Obj,"users",users);
return true;
} catch (...) {
std::cout << "Cannot parse: InternalServiceInfo" << std::endl;
}
return false;
}
void InternalServiceInfo::to_json(Poco::JSON::Object &Obj) const {
field_to_json(Obj,"privateURI",privateURI);
field_to_json(Obj,"publicURI",publicURI);

7
src/RESTObjects/RESTAPI_SecurityObjects.h
View File

@@ -146,6 +146,13 @@ namespace OpenWifi {
};
typedef std::vector<UserInfo> UserInfoVec;
struct UserInfoList {
std::vector<UserInfo> users;
void to_json(Poco::JSON::Object &Obj) const;
bool from_json(const Poco::JSON::Object::Ptr &Obj);
};
// bool append_from_json(Poco::JSON::Object::Ptr Obj, const UserInfo &UInfo, NoteInfoVec & Notes);
bool MergeNotes(Poco::JSON::Object::Ptr Obj, const UserInfo &UInfo, NoteInfoVec & Notes);
bool MergeNotes(const NoteInfoVec & NewNotes, const UserInfo &UInfo, NoteInfoVec & ExistingNotes);

23
src/WebSocketClientServer.cpp
View File

@@ -2,9 +2,11 @@
// Created by stephane bourque on 2021-11-01.
//
#include "framework/MicroService.h"
#include "WebSocketClientServer.h"
#include "SerialNumberCache.h"
#include "StorageService.h"
#include "sdks/SDK_sec.h"
namespace OpenWifi {
void WebSocketClientServer::run() {
@@ -185,7 +187,26 @@ namespace OpenWifi {
void WebSocketClient::ws_command_subuser_search( const Poco::JSON::Object::Ptr &O, bool &Done, std::string &Answer) {
Done = false;
auto operatorId = O->get("operatorId").toString();
Answer = std::string{R"lit({ "error" : "not implemented" })lit"};
std::string nameSearch, emailSearch;
OpenWifi::RESTAPIHandler::AssignIfPresent(O,"nameSearch",nameSearch);
OpenWifi::RESTAPIHandler::AssignIfPresent(O,"emailSearch",emailSearch);
SecurityObjects::UserInfoList Users;
SDK::Sec::Subscriber::Search(nullptr,operatorId,nameSearch,emailSearch,Users);
Poco::JSON::Array Arr;
for(const auto &i:Users.users) {
Poco::JSON::Object OO;
OO.set("name", i.name);
OO.set("email", i.email);
OO.set("id", i.id);
i.to_json(OO);
Arr.add(OO);
}
Poco::JSON::Object ObjAnswer;
ObjAnswer.set("users", Arr);
std::ostringstream SS;
Poco::JSON::Stringifier::stringify(ObjAnswer, SS);
Answer = SS.str();
}
void WebSocketClient::ws_command_subdevice_search( const Poco::JSON::Object::Ptr &O, bool &Done, std::string &Answer) {

19
src/sdks/SDK_sec.cpp
View File

@@ -79,6 +79,25 @@ namespace OpenWifi::SDK::Sec {
}
return false;
}
bool Search([[maybe_unused]] RESTAPIHandler *client, const std::string &OperatorId,
const std::string &Name, const std::string &EMail, SecurityObjects::UserInfoList &Users) {
OpenAPIRequestGet Req( uSERVICE_SECURITY,
"/api/v1/subusers",
{
{"operatorId", OperatorId} ,
{"nameSearch", Name} ,
{"emailSearch", EMail}
},
5000);
auto CallResponse = Poco::makeShared<Poco::JSON::Object>();
auto StatusCode = Req.Do(CallResponse);
if( StatusCode == Poco::Net::HTTPResponse::HTTP_OK) {
return Users.from_json(CallResponse);
}
return false;
}
}
}

2
src/sdks/SDK_sec.h
View File

@@ -18,6 +18,8 @@ namespace OpenWifi::SDK::Sec {
bool Exists(RESTAPIHandler *client, const Types::UUID_t & User);
bool Get(RESTAPIHandler *client, const Types::UUID_t & User, SecurityObjects::UserInfo & UserInfo);
bool Delete(RESTAPIHandler *client, const Types::UUID_t & User);
bool Search(RESTAPIHandler *client, const std::string &OperatorId, const std::string &Name,
const std::string &EMail, SecurityObjects::UserInfoList &Users);
}
}