Commit 0783ad28 authored by jan.koester's avatar jan.koester
Browse files

needs checking

parent 6c14da79
Loading
Loading
Loading
Loading
Loading
+10 −9
Changes for client/client.cpp: 10 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -100,18 +100,16 @@ bool authdb::Client::UserAuth(){

    json_object_put(jresponse);

    json_object *jret,*jrequest;
    json_tokener_error jerr;
    json_object *jrequest;
    json_tokener*jtok=json_tokener_new();

    std::cout.write(resp.data(),resp.size())<<std::endl;
    jrequest=json_tokener_parse_ex(jtok,resp.data(),resp.size());

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

    jrequest=json_object_get(jret);

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

    int fcount = json_object_array_length(cmd);
@@ -119,10 +117,13 @@ bool authdb::Client::UserAuth(){
        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())
                         if(!_Con._SessionID.empty()){
                             json_tokener_free(jtok);
                             return true;
                         }
                 }
        }
    }
    json_tokener_free(jtok);
    return false;
}
+2 −5
Changes for src/api.cpp: 2 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -396,18 +396,15 @@ 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(jsend,0,&outsize);
            const char *out=json_object_to_json_string_length(jresponse,0,&outsize);

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

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