Commit 8e894c26 authored by jan.koester's avatar jan.koester
Browse files

test

parent 95e07f58

src/auth.cpp

+4 −4
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ bool blogi::Auth::isLoggedIn(const int tid,libhttppp::HttpRequest &curreq,const 
        }

}



int blogi::Auth::getAuthorId(const int tid, const uuid::uuid &authid) {

std::string blogi::Auth::getAuthorId(const int tid, const uuid::uuid &authid) {

    for (size_t si = 0; si < _config.getAuthSourceCount(); ++si) {

        const AuthSource &src = _config.getAuthSource(si);

        try {
@@ -295,7 +295,7 @@ int blogi::Auth::getAuthorId(const int tid, const uuid::uuid &authid) { 
            asql << "SELECT id FROM users WHERE sid='" << dbpp::SQL::escaped(sbuf, uid.c_str()) << "' LIMIT 1;";

            int ucount = _dbconn[tid]->exec(asql, ares);

            if (ucount > 0) {

                int authorId = atoi(ares[0][0]);

                std::string authorId = ares[0][0];

                // Update displayname in case it changed

                dbpp::SQL usql;

                dbpp::DBResult ures;
@@ -317,11 +317,11 @@ int blogi::Auth::getAuthorId(const int tid, const uuid::uuid &authid) { 
                     << dbpp::SQL::escaped(sbuf, email.c_str()) << "','"

                     << dbpp::SQL::escaped(sbuf, displayname.c_str()) << "');";

                _dbconn[tid]->exec(isql, ires);

                return 0;

                return newId.c_str();

            }

        } catch (...) {

            continue;

        }

    }

    return 0;

    return std::string();

}

src/auth.h

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ namespace blogi { 
        void Apilogin(const int tid,const char *username,const char *password,uuid::uuid &authid,const std::string &domain="");

        bool isLoggedIn(const int tid,const uuid::uuid &authid);

        bool isLoggedIn(const int tid,libhttppp::HttpRequest &curreq,const std::string &ssid);

        int getAuthorId(const int tid, const uuid::uuid &authid);

        std::string getAuthorId(const int tid, const uuid::uuid &authid);

    private:

        void _doLogin(const AuthSource &src, const char *username, const char *password,

                      uuid::uuid &authid, const int tid, const std::string *ssid);

src/blogi.cpp

+2 −2
Original line number Diff line number Diff line
@@ -495,8 +495,8 @@ void blogi::Blogi::api(libhttppp::HttpRequest& curreq, const int tid, DomainCont 
                    json_object_object_get_ex(single_request, "params", &params);

                        if (params) {

                            try {

                                int authorId = PlgArgs->auth->getAuthorId(tid, authid);

                                json_object_object_add(params, "author_id", json_object_new_int(authorId));

                                std::string authorId = PlgArgs->auth->getAuthorId(tid, authid);

                                json_object_object_add(params, "author_id", json_object_new_string(authorId.c_str()));

                            } catch (...) {}

                        }