Commit 6c14da79 authored by jan.koester's avatar jan.koester
Browse files

some fixes

parent 55d50dac
Loading
Loading
Loading
Loading
Loading
+26 −4
Changes for client/client.cpp: 26 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -84,9 +84,9 @@ bool authdb::Client::UserAuth(){
    json_object_object_add(userauth,"name",json_object_new_string(_Con._UserName.c_str()));
    json_object_object_add(userauth,"key",json_object_new_string(_Con._UserPassword.c_str()));

    json_object_array_add(cmd,userauth);
    json_object_array_add(cmd,login);
    json_object_object_add(login,"login",userauth);
    json_object_object_add(jresponse,"commands",login);
    json_object_object_add(jresponse,"commands",cmd);

    size_t outsize=0;

@@ -96,11 +96,33 @@ bool authdb::Client::UserAuth(){

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

    std::vector<char> resp(_Con._Client->Post(_Con._Url.getPath(),"text/json",out));
    std::vector<char> resp=_Con._Client->Post(_Con._Url.getPath(),"text/json",out);

    while(json_object_put(jresponse)!=0);
    json_object_put(jresponse);

    json_object *jret,*jrequest;
    json_tokener_error jerr;

    std::cout.write(resp.data(),resp.size())<<std::endl;

    if(!(jret=json_tokener_parse_verbose(resp.data(),&jerr))){
            throw AuthBackendError(json_tokener_error_desc(jerr));
    }

    jrequest=json_object_get(jret);

    if(!jrequest || json_object_get_type(jrequest)!=json_type::json_type_array)
                throw(AuthBackendError("Invalid Api Commands"));

    int fcount = json_object_array_length(cmd);
    for(int i =0; i<fcount; ++i) {
        json_object_object_foreach(json_object_array_get_idx(cmd,i), key, val) {
                 if(strcmp(key,"sessionid")==0){
                         _Con._SessionID=json_object_get_string(val);
                         if(!_Con._SessionID.empty())
                             return true;
                 }
        }
    }
    return false;
}
+7 −2
Changes for src/api.cpp: 7 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -396,13 +396,18 @@ namespace authdb {
                checkGPO(jrequest,jresponse);
            }

            json_object *jsend=json_object_new_string("authdb");
            json_object_array_add(jsend,jresponse);

            size_t outsize=0;
            const char *out=json_object_to_json_string_length(jresponse,0,&outsize);
            const char *out=json_object_to_json_string_length(jsend,0,&outsize);

            std::cout << out << std::endl;

            rep.setState(HTTP200);
            rep.setContentType("text/json");
            rep.send(curreq,out,outsize);
            json_object_put(jresponse) ;
            json_object_put(jsend) ;
            json_object_put(jrequest);
        }