Commit 60a13485 authored by jan.koester's avatar jan.koester
Browse files

test

parent 6a348877
Loading
Loading
Loading
Loading
+31 −10
Changes for client/client.cpp: 31 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -80,7 +80,9 @@ authdb::client::Client::Client(ClientConnection& clt) : _Con(clt){
        _Con._Client=new libhttppp::HttpClient(_Con._Url);
    }else{
        try{
            _Con._Client->Get("/","text/html");
            libhttppp::HttpRequest nreq;
            nreq.setHeaderData("accept")->push_back("text/html");
            _Con._Client->Get(nreq);
        }catch(...){
            _Con._Client->reconnect();
        }
@@ -112,7 +114,10 @@ bool authdb::client::Client::ClientAuth(){

    std::copy(tmp,tmp+outsize,std::back_inserter(out));

    std::vector<char> resp(_Con._Client->Post(_Con._Url.getPath(),"text/json",out));
    libhttppp::HttpRequest nreq;
    nreq.setHeaderData("accept")->push_back("text/json");
    nreq.setRequestURL(_Con._Url.getPath().c_str());
    std::vector<char> resp(_Con._Client->Post(nreq,out));

    resp.push_back('\0');

@@ -170,7 +175,10 @@ bool authdb::client::Client::UserAuth(){

    std::copy(tmp,tmp+outsize,std::back_inserter(out));

    std::vector<char> resp(_Con._Client->Post(_Con._Url.getPath(),"text/json",out));
    libhttppp::HttpRequest nreq;
    nreq.setHeaderData("accept")->push_back("text/json");
    nreq.setRequestURL(_Con._Url.getPath().c_str());
    std::vector<char> resp(_Con._Client->Post(nreq,out));

    resp.push_back('\0');

@@ -230,7 +238,10 @@ void authdb::client::Client::SessionInfo(class SessionData& sdat){

    std::copy(tmp,tmp+outsize,std::back_inserter(out));

    std::vector<char> resp(_Con._Client->Post(_Con._Url.getPath(),"text/json",out));
    libhttppp::HttpRequest nreq;
    nreq.setHeaderData("accept")->push_back("text/json");
    nreq.setRequestURL(_Con._Url.getPath().c_str());
    std::vector<char> resp(_Con._Client->Post(nreq,out));

    resp.push_back('\0');

@@ -294,7 +305,10 @@ bool authdb::client::Client::remSession(){
    std::copy(tmp,tmp+outsize,std::back_inserter(out));


    std::vector<char> resp(_Con._Client->Post(_Con._Url.getPath(),"text/json",out));
    libhttppp::HttpRequest nreq;
    nreq.setHeaderData("accept")->push_back("text/json");
    nreq.setRequestURL(_Con._Url.getPath().c_str());
    std::vector<char> resp(_Con._Client->Post(nreq,out));

    resp.push_back('\0');

@@ -352,7 +366,10 @@ void authdb::client::Client::changeUserPw(const std::string& oldpw,const std::st

    std::copy(tmp,tmp+outsize,std::back_inserter(out));

    std::vector<char> resp(_Con._Client->Post(_Con._Url.getPath(),"text/json",out));
    libhttppp::HttpRequest nreq;
    nreq.setHeaderData("accept")->push_back("text/json");
    nreq.setRequestURL(_Con._Url.getPath().c_str());
    std::vector<char> resp(_Con._Client->Post(nreq,out));

    resp.push_back('\0');
}
@@ -360,10 +377,11 @@ void authdb::client::Client::changeUserPw(const std::string& oldpw,const std::st
void authdb::client::Client::getAvatar(const uuid &did,const uuid& uid,libhttppp::HttpRequest *resq,libhttppp::HttpResponse& resp){
    std::stringstream url;
    url << "/getavatar/" << did.c_str() << "/" << uid.c_str() << ".jpg";
    std::vector<char> avatar=_Con._Client->Get(url.str(),"image/jpeg");

    libhttppp::HttpCookie cookie;
    cookie.setcookie(&resp,"authdbid",_Con.getSessionID().c_str());
    libhttppp::HttpRequest nreq;
    nreq.setHeaderData("accept")->push_back("image/jpeg");
    nreq.setRequestURL(url.str().c_str());
    std::vector<char> avatar=_Con._Client->Get(nreq);

    resp.setState(HTTP200);
    resp.setContentType("image/jpeg");
@@ -393,7 +411,10 @@ bool authdb::client::Client::GPOcheck(class uuid gpoid){
    std::copy(tmp,tmp+outsize,std::back_inserter(out));


    std::vector<char> resp(_Con._Client->Post(_Con._Url.getPath(),"text/json",out));
    libhttppp::HttpRequest nreq;
    nreq.setHeaderData("accept")->push_back("text/json");
    nreq.setRequestURL(_Con._Url.getPath().c_str());
    std::vector<char> resp(_Con._Client->Post(nreq,out));

    resp.push_back('\0');