Commit 598c9934 authored by jan.koester's avatar jan.koester
Browse files

ready for testing

parent 91489679
Loading
Loading
Loading
Loading
Loading
+41 −0
Changes for cli/authcli.cpp: 41 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -65,6 +65,9 @@ void addclient(int argc,char **argv){
void remclient(int argc,char **argv){
    cmdplus::CmdController &cmdc=cmdplus::CmdController::getInstance();

    cmdc.registerCmd("name",'n',false,nullptr,"Client Name");
    cmdc.registerCmd("secret",'s',false,nullptr,"Client Secret");

    cmdc.registerCmd("host-url",'h',true,nullptr,"Server Url");

    cmdc.registerCmd("clientid",'i',true,nullptr,"Clientid");
@@ -91,6 +94,41 @@ void remclient(int argc,char **argv){

}

void editclient(int argc,char **argv){
    cmdplus::CmdController &cmdc=cmdplus::CmdController::getInstance();

    cmdc.registerCmd("name",'n',true,nullptr,"Client Name");
    cmdc.registerCmd("secret",'s',true,nullptr,"Client Secret");
    cmdc.registerCmd("host-url",'h',true,nullptr,"Server Url");
    cmdc.registerCmd("clientid",'i',true,nullptr,"Clientid");

    cmdc.registerCmd("username",'u',true,nullptr,"Username");
    cmdc.registerCmd("password",'p',true,nullptr,"Password for User");

    cmdc.parseCmd(argc,argv);

    if(!cmdc.checkRequired()){
        cmdc.printHelp();
        return;
    }

    authdb::client::ClientConnection con;

    con.setUrl(cmdc.getCmdbyKey("host-url")->getValue());
    con.setUsername(cmdc.getCmdbyKey("username")->getValue());
    con.setUserPassword(cmdc.getCmdbyKey("password")->getValue());

    authdb::client::Client clt(con);
    if(clt.UserAuth()){
        clt.editConnection(
            cmdc.getCmdbyKey("clientid")->getValue(),
            cmdc.getCmdbyKey("name")->getValue(),
            cmdc.getCmdbyKey("secret")->getValue()
        );
    }

}

int main(int argc,char **argv){
    if(argc<1){
        std::cerr << "Please Enter Command !" << std::endl;
@@ -100,10 +138,13 @@ int main(int argc,char **argv){
        addclient(argc-1,argv+1);
    }else if(strcmp(argv[1],"remclient")==0){
        remclient(argc-1,argv+1);
    }else if(strcmp(argv[1],"editclient")==0){
        editclient(argc-1,argv+1);
    }else{
        std::cerr << "commands:" << std::endl;
        std::cerr << "addclient" << std::endl;
        std::cerr << "remclient" << std::endl;
        std::cerr << "editclient" << std::endl;
    }


+31 −0
Changes for client/client.cpp: 31 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -506,3 +506,34 @@ void authdb::client::Client::remConnection(const uuid& clientid){

    resp.push_back('\0');
}

void authdb::client::Client::editConnection(const uuid& clientid,const std::string &clientname,const std::string &cltsecret){
    json_object *jresponse = json_object_new_object();
    json_object *cmd=json_object_new_array();
    json_object *obj=json_object_new_object();
    json_object *addclt=json_object_new_object();

    json_object_object_add(obj,"usersession", json_object_new_string(_Con.getSessionID().c_str()));
    json_object_object_add(obj,"remconnection", addclt);

    json_object_object_add(addclt,"clientid",json_object_new_string(clientid.c_str()));
    json_object_object_add(addclt,"clientname",json_object_new_string(clientname.c_str()));
    json_object_object_add(addclt,"clientsecret",json_object_new_string(cltsecret.c_str()));

    json_object_array_add(cmd,obj);
    json_object_object_add(jresponse,"commands",cmd);

    size_t outsize=0;
    std::vector<char> out;

    const char *tmp=json_object_to_json_string_length(jresponse,0,&outsize);

    std::copy(tmp,tmp+outsize,std::back_inserter(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');
}
+1 −0
Changes for client/client.h: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ namespace authdb {

            void addConnection(const std::string &clientname,const std::string &cltsecret);
            void remConnection(const uuid &clientid);
            void editConnection(const uuid& clientid,const std::string &clientname,const std::string &cltsecret)

            void SessionInfo(class SessionData &sdat);
            bool remSession();