Commit 26d8d212 authored by jan.koester's avatar jan.koester
Browse files

fxied clientauth

parent 93924567
Loading
Loading
Loading
Loading
Loading
+4 −1
Changes for client/client.cpp: 4 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ authdb::client::Client::Client(ClientConnection& clt) : _Con(clt){

authdb::client::Client::~Client(){
}

#include <iostream>
bool authdb::client::Client::ClientAuth(){
    json_object *jresponse = json_object_new_object();
    json_object *cmd=json_object_new_array();
@@ -109,6 +109,8 @@ bool authdb::client::Client::ClientAuth(){

    resp.push_back('\0');

    std::cout << resp.data() <<std::endl;

    json_object_put(jresponse);

    json_object *jrequest;
@@ -324,6 +326,7 @@ void authdb::client::Client::changeUserPw(const std::string& oldpw,const std::st
    json_object *pchange=json_object_new_object();

    json_object_object_add(obj,"usersession", json_object_new_string(_Con.getSessionID().c_str()));
    json_object_object_add(obj,"clientsession", json_object_new_string(_Con.getClientId().c_str()));
    json_object_object_add(obj,"changeuserpw", pchange);

    json_object_object_add(pchange,"oldpw",json_object_new_string(oldpw.c_str()));
+6 −14
Changes for src/api.cpp: 6 added lines, 14 removed lines.
Original line number Diff line number Diff line
@@ -487,6 +487,10 @@ namespace authdb {
            const ClientConnections *curcon=nullptr;
            // const SessionData *sessiondat=nullptr;

          if(! (curcon=checkConnection(jrequest,jresponse)) ){
                curcon=ClientLogin(jrequest,jresponse);
          }

            if(! (_SessionData=checkUser(jrequest,jresponse)) ){
                    _SessionData=userLogin(jrequest,jresponse);
            }
@@ -504,22 +508,10 @@ namespace authdb {
            Connection(jrequest,jresponse);
            SessionInfo(jrequest,jresponse);
            remSession(jrequest,jresponse);
            changeUserPw(jrequest,jresponse);

            if(! (curcon=checkConnection(jrequest,jresponse)) ){
                if(! (curcon=ClientLogin(jrequest,jresponse)) ){
                    const char *ret=json_object_to_json_string(jresponse);
                    rep.setState(HTTP401);
                    rep.setContentType("text/json");
                    rep.send(curreq,ret,strlen(ret));
                    json_object_put(jresponse) ;
                    json_object_put(jrequest) ;
                    return;
                }
            }

            if(_SessionData){

            if(curcon){
                changeUserPw(jrequest,jresponse);
                checkGPO(jrequest,jresponse);
            }