Commit 71afbbad authored by jan.koester's avatar jan.koester
Browse files

some fixes

parent ca54b07d
Loading
Loading
Loading
Loading
Loading
+1 −1
Changes for CMakeLists.txt: 1 added line, 1 removed line.
Original line number Diff line number Diff line
cmake_minimum_required(VERSION 3.18)

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra --warn-no-unused-parameter")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -Wextra --warn-no-unused-parameter")

project(authdb)

+2 −2
Changes for client/CMakeLists.txt: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -6,9 +6,9 @@ include_directories(

add_compile_definitions(DATAPATH="${DATAPATH}")

add_library(client SHARED client.cpp ../src/authdb.cpp ../src/uuid.cpp ../src/session.cpp ../src/hash.cpp ../src/hash/sha512.cpp ../src/backend.cpp  ../src/backends/file.cpp ../src/group.cpp )
add_library(client SHARED client.cpp $<TARGET_OBJECTS:authobj>)

add_library(client-static STATIC client.cpp ../src/authdb.cpp ../src/uuid.cpp ../src/session.cpp ../src/hash.cpp ../src/hash/sha512.cpp ../src/backend.cpp ../src/backends/file.cpp ../src/group.cpp )
add_library(client-static STATIC client.cpp $<TARGET_OBJECTS:authobj>)

target_link_libraries(client PUBLIC netplus::netplus json-c::json-c httppp::httppp uuid)

+15 −15
Changes for client/client.cpp: 15 added lines, 15 removed lines.
Original line number Diff line number Diff line
@@ -33,43 +33,43 @@

#include "client.h"

authdb::ClientConnection::ClientConnection(){
authdb::client::ClientConnection::ClientConnection(){
    _Client=nullptr;
}

authdb::ClientConnection::~ClientConnection(){
authdb::client::ClientConnection::~ClientConnection(){
    delete _Client;
}

void authdb::ClientConnection::setUrl(const char *url){
void authdb::client::ClientConnection::setUrl(const char *url){
    _Url=url;
}

void authdb::ClientConnection::setClientname(const char *name){
void authdb::client::ClientConnection::setClientname(const char *name){
    _CltName=name;
}

void authdb::ClientConnection::setClientSecret(const char *secret){
void authdb::client::ClientConnection::setClientSecret(const char *secret){
    _CltSecret=secret;
}

void authdb::ClientConnection::setUsername(const char *username){
void authdb::client::ClientConnection::setUsername(const char *username){
    _UserName=username;
}

void authdb::ClientConnection::setUserPassword(const char *password){
void authdb::client::ClientConnection::setUserPassword(const char *password){
    _UserPassword=password;
}

authdb::Client::Client(ClientConnection& clt) : _Con(clt){
authdb::client::Client::Client(ClientConnection& clt) : _Con(clt){
    if(!_Con._Client)
        _Con._Client=new libhttppp::HttpClient(_Con._Url);
}

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

bool authdb::Client::ClientAuth(){
bool authdb::client::Client::ClientAuth(){
    json_object *jresponse = json_object_new_object();
    json_object *cmd=json_object_new_array();
    json_object *login=json_object_new_object();
@@ -104,11 +104,11 @@ bool authdb::Client::ClientAuth(){
    jrequest=json_tokener_parse_ex(jtok,resp.data(),resp.size());

    if(!jrequest){
            throw AuthBackendError(json_tokener_error_desc(json_tokener_get_error(jtok)));
            throw authdb::AuthBackendError(json_tokener_error_desc(json_tokener_get_error(jtok)));
    }

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

    int fcount = json_object_array_length(jrequest);
    for(int i =0; i<fcount; ++i) {
@@ -126,7 +126,7 @@ bool authdb::Client::ClientAuth(){
    return false;
}

bool authdb::Client::UserAuth(){
bool authdb::client::Client::UserAuth(){
    json_object *jresponse = json_object_new_object();
    json_object *cmd=json_object_new_array();
    json_object *login=json_object_new_object();
@@ -161,11 +161,11 @@ bool authdb::Client::UserAuth(){
    jrequest=json_tokener_parse_ex(jtok,resp.data(),resp.size());

    if(!jrequest){
            throw AuthBackendError(json_tokener_error_desc(json_tokener_get_error(jtok)));
            throw authdb::AuthBackendError(json_tokener_error_desc(json_tokener_get_error(jtok)));
    }

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

    int fcount = json_object_array_length(jrequest);
    for(int i =0; i<fcount; ++i) {
+2 −0
Changes for client/client.h: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@
#pragma once

namespace authdb {
    namespace client {
        class ClientConnection {
        public:
            ClientConnection();
@@ -80,3 +81,4 @@ namespace authdb {
            ClientConnection &_Con;
        };
    };
};
+2 −2
Changes for client/examples/clientlogin.cpp: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -30,12 +30,12 @@
#include "../client.h"

int main(int argc, char *argv[]){
    authdb::ClientConnection con;
    authdb::client::ClientConnection con;
    con.setUrl(argv[1]);
    con.setUsername(argv[2]);
    con.setUserPassword(argv[3]);

    authdb::Client clt(con);
    authdb::client::Client clt(con);
    if(clt.ClientAuth()){
        std::cout << "Sucessfully login !" << std::endl;
        return 0;
Loading