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

Moving Avatars into ORM

Browse Source
This commit is contained in:
stephb9959
2021-12-28 00:12:08 -08:00
parent 6264c7f3bb
commit c7c5401bc2
4 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/RESTAPI/RESTAPI_avatar_handler.cpp
View File

@@ -22,9 +22,8 @@ namespace OpenWifi {
Name_ = Parameters.get(RESTAPI::Protocol::NAME, RESTAPI::Protocol::UNNAMED); Name_ = Parameters.get(RESTAPI::Protocol::NAME, RESTAPI::Protocol::UNNAMED);
} }
Poco::CountingInputStream InputStream(Stream); Poco::CountingInputStream InputStream(Stream);
std::ofstream OutputStream(TempFile_.path(), std::ofstream::out); Poco::StreamCopier::copyStream(InputStream, OutputStream_);
Poco::StreamCopier::copyStream(InputStream, OutputStream); Length_ = OutputStream_.str().size();
Length_ = InputStream.chars();
}; };
void RESTAPI_avatar_handler::DoPost() { void RESTAPI_avatar_handler::DoPost() {
@@ -38,8 +37,8 @@ namespace OpenWifi {
// if there is an avatar, just remove it... // if there is an avatar, just remove it...
StorageService()->AvatarDB().DeleteAvatar(UserInfo_.userinfo.email,Id); StorageService()->AvatarDB().DeleteAvatar(UserInfo_.userinfo.email,Id);
Poco::TemporaryFile TmpFile; std::stringstream SS;
AvatarPartHandler partHandler(Id, Logger_, TmpFile); AvatarPartHandler partHandler(Id, Logger_, SS);
Poco::Net::HTMLForm form(*Request, Request->stream(), partHandler); Poco::Net::HTMLForm form(*Request, Request->stream(), partHandler);
Poco::JSON::Object Answer; Poco::JSON::Object Answer;
@@ -48,7 +47,7 @@ namespace OpenWifi {
Answer.set(RESTAPI::Protocol::ERRORCODE, 0); Answer.set(RESTAPI::Protocol::ERRORCODE, 0);
Logger_.information(Poco::format("Uploaded avatar: %s Type: %s", partHandler.Name(), partHandler.ContentType())); Logger_.information(Poco::format("Uploaded avatar: %s Type: %s", partHandler.Name(), partHandler.ContentType()));
StorageService()->AvatarDB().SetAvatar(UserInfo_.userinfo.email, StorageService()->AvatarDB().SetAvatar(UserInfo_.userinfo.email,
Id, TmpFile, partHandler.ContentType(), partHandler.Name()); Id, SS.str(), partHandler.ContentType(), partHandler.Name());
} else { } else {
Answer.set(RESTAPI::Protocol::AVATARID, Id); Answer.set(RESTAPI::Protocol::AVATARID, Id);
Answer.set(RESTAPI::Protocol::ERRORCODE, 13); Answer.set(RESTAPI::Protocol::ERRORCODE, 13);
@@ -62,13 +61,11 @@ namespace OpenWifi {
if (Id.empty()) { if (Id.empty()) {
return NotFound(); return NotFound();
} }
std::string Type, Name, AvatarContent; std::string Type, Name, AvatarContent;
if (!StorageService()->AvatarDB().GetAvatar(UserInfo_.userinfo.email, Id, AvatarContent, Type, Name)) { if (!StorageService()->AvatarDB().GetAvatar(UserInfo_.userinfo.email, Id, AvatarContent, Type, Name)) {
return NotFound(); return NotFound();
} }
std::cout << "Sending avatar" << std::endl; return SendFileContent(AvatarContent, Type, Name);
SendFileContent(AvatarContent, Type, Name);
} }
void RESTAPI_avatar_handler::DoDelete() { void RESTAPI_avatar_handler::DoDelete() {

8
src/RESTAPI/RESTAPI_avatar_handler.h
View File

@@ -9,23 +9,23 @@ namespace OpenWifi {
class AvatarPartHandler : public Poco::Net::PartHandler { class AvatarPartHandler : public Poco::Net::PartHandler {
public: public:
AvatarPartHandler(std::string Id, Poco::Logger &Logger, Poco::TemporaryFile &TmpFile) : AvatarPartHandler(std::string Id, Poco::Logger &Logger, std::stringstream & ofs) :
Id_(std::move(Id)), Id_(std::move(Id)),
Logger_(Logger), Logger_(Logger),
TempFile_(TmpFile){ OutputStream_(ofs){
} }
void handlePart(const Poco::Net::MessageHeader &Header, std::istream &Stream); void handlePart(const Poco::Net::MessageHeader &Header, std::istream &Stream);
[[nodiscard]] uint64_t Length() const { return Length_; } [[nodiscard]] uint64_t Length() const { return Length_; }
[[nodiscard]] std::string &Name() { return Name_; } [[nodiscard]] std::string &Name() { return Name_; }
[[nodiscard]] std::string &ContentType() { return FileType_; } [[nodiscard]] std::string &ContentType() { return FileType_; }
[[nodiscard]] std::string FileName() const { return TempFile_.path(); }
private: private:
uint64_t Length_ = 0; uint64_t Length_ = 0;
std::string FileType_; std::string FileType_;
std::string Name_; std::string Name_;
std::string Id_; std::string Id_;
Poco::Logger &Logger_; Poco::Logger &Logger_;
Poco::TemporaryFile &TempFile_; std::stringstream &OutputStream_;
}; };
class RESTAPI_avatar_handler : public RESTAPIHandler { class RESTAPI_avatar_handler : public RESTAPIHandler {

8
src/storage/orm_avatar.cpp
View File

@@ -27,20 +27,16 @@ namespace OpenWifi {
DB(T, Name.c_str(), AvatarDB_Fields,{}, P, L, ShortName.c_str()) { DB(T, Name.c_str(), AvatarDB_Fields,{}, P, L, ShortName.c_str()) {
} }
bool AvatarDB::SetAvatar(const std::string &Admin, std::string &Id, Poco::TemporaryFile &FileName, bool AvatarDB::SetAvatar(const std::string &Admin, std::string &Id, const std::string & AvatarContent,
std::string &Type, std::string &Name) { std::string &Type, std::string &Name) {
try { try {
std::stringstream ss;
std::ifstream ifs(FileName.path().c_str(), std::ios_base::in | std::ios_base::binary);
Poco::StreamCopier::copyStream(ifs, ss);
SecurityObjects::Avatar A; SecurityObjects::Avatar A;
A.id = Id; A.id = Id;
A.type = Type; A.type = Type;
A.name = Name; A.name = Name;
A.created = std::time(nullptr); A.created = std::time(nullptr);
A.avatar.assignRaw(ss.str().c_str(), ss.str().size()); A.avatar.assignRaw(AvatarContent.c_str(), AvatarContent.size());
if (Exists("id", Id)) { if (Exists("id", Id)) {
return UpdateRecord("id", Id, A); return UpdateRecord("id", Id, A);

2
src/storage/orm_avatar.h
View File

@@ -30,7 +30,7 @@ namespace OpenWifi {
public: public:
AvatarDB( const std::string &name, const std::string &shortname, OpenWifi::DBType T, Poco::Data::SessionPool & P, Poco::Logger &L); AvatarDB( const std::string &name, const std::string &shortname, OpenWifi::DBType T, Poco::Data::SessionPool & P, Poco::Logger &L);
bool SetAvatar(const std::string & Admin, std::string &Id, Poco::TemporaryFile &FileName, std::string &Type, std::string & Name); bool SetAvatar(const std::string & Admin, std::string &Id, const std::string & AvatarContent, std::string &Type, std::string & Name);
bool GetAvatar(const std::string & Admin, std::string &Id, std::string & AvatarContent, std::string &Type, std::string & Name); bool GetAvatar(const std::string & Admin, std::string &Id, std::string & AvatarContent, std::string &Type, std::string & Name);
bool DeleteAvatar(const std::string & Admin, std::string &Id); bool DeleteAvatar(const std::string & Admin, std::string &Id);