Commit e596e7ac authored by jan.koester's avatar jan.koester
Browse files

test

parent d17fdbe6
Loading
Loading
Loading
Loading
Loading
+5 −2
Changes for client/client.cpp: 5 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -89,7 +89,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();
@@ -116,6 +116,8 @@ bool authdb::client::Client::ClientAuth(){

    resp.push_back('\0');

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

    json_object_put(jresponse);

    json_object *jrequest;
@@ -209,6 +211,7 @@ void authdb::client::Client::SessionInfo(class SessionData& sdat){
    json_object *cmd=json_object_new_array();
    json_object *obj=json_object_new_object();

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

@@ -253,7 +256,6 @@ void authdb::client::Client::SessionInfo(class SessionData& sdat){
                 if(strcmp(key,"sessioninfo")==0){
                          sdat._username= json_object_get_string(json_object_object_get(val,"username"));
                          sdat._uid= json_object_get_string(json_object_object_get(val,"userid"));
                          sdat._sid= json_object_get_string(json_object_object_get(val,"sessionid"));
                          sdat._did= json_object_get_string(json_object_object_get(val,"domainid"));
                 }
        }
@@ -272,6 +274,7 @@ bool authdb::client::Client::remSession(){
    json_object *cmd=json_object_new_array();
    json_object *obj=json_object_new_object();

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

+7 −7
Changes for src/api.cpp: 7 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -86,10 +86,7 @@ namespace authdb {
                json_object_object_foreach(json_object_array_get_idx(cmd,i), key, val) {
                    if(strcmp(key,"usersession")==0){
                            const char *id=json_object_get_string(val);
                            uuid cid;
                            if(cid.parse(id)!=0)
                                return nullptr;
                            return  AuthSession.getSession(cid);
                            return  AuthSession.getSession(id);
                    }
                }
            }
@@ -370,9 +367,12 @@ namespace authdb {
            for(int i =0; i<fcount; ++i) {
                json_object_object_foreach(json_object_array_get_idx(cmd,i), key, val) {
                    if(strcmp(key,"remsession")==0){
                        uuid tmp;
                        uuid tmp,csid;
                        tmp.parse(json_object_get_string(val));
                         _SessionData->getSid(csid);
                        AuthSession.remSession(tmp);
                        if(tmp==csid)
                            _SessionData=nullptr;
                        json_object *slogoff=json_object_new_object();
                        json_object_object_add(slogoff,"remsession", json_object_new_string(tmp.c_str()));
                        json_object_array_add(response,slogoff);
@@ -487,13 +487,13 @@ namespace authdb {

            if(_SessionData){
                Connection(jrequest,jresponse);
                SessionInfo(jrequest,jresponse);
                remSession(jrequest,jresponse);
            }

            if(curcon && _SessionData){
                changeUserPw(jrequest,jresponse);
                checkGPO(jrequest,jresponse);
                SessionInfo(jrequest,jresponse);
                remSession(jrequest,jresponse);
            }

            size_t outsize=0;