Skip to content

add api token ttl in cfg #233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kambizzandi merged 1 commit into from
Sep 19, 2022
Merged

add api token ttl in cfg #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Interfaces/Common/GenericTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,39 +211,39 @@ TARGOMAN_DEFINE_ENUM(enuGenericStatus,
TAPI_ADD_TYPE_SPECIALFROMVARIANT(
/* baseType */ QJsonObject,
/* typeName */ JWT_t,
/* fnSetFromVariant */ [=](const QVariant &_value, const QString &_paramName = {}) {
/* fnSetFromVariant */ [=](const QVariant &_value, const QString &_paramName = {}) {
Q_UNUSED(_paramName);
this->fromVariantMap(_value.toMap());
}
);
TAPI_ADD_TYPE_SPECIALFROMVARIANT(
/* baseType */ QVariantMap,
/* typeName */ ORMFields_t,
/* fnSetFromVariant */ [=](const QVariant &_value, const QString &_paramName = {}) {
/* fnSetFromVariant */ [=](const QVariant &_value, const QString &_paramName = {}) {
Q_UNUSED(_paramName);
*this = _value.toMap();
}
);
TAPI_ADD_TYPE_SPECIALFROMVARIANT(
/* baseType */ QDate,
/* typeName */ Date_t,
/* fnSetFromVariant */ [=](const QVariant &_value, const QString &_paramName = {}) {
/* fnSetFromVariant */ [=](const QVariant &_value, const QString &_paramName = {}) {
Q_UNUSED(_paramName);
*this = _value.toDate();
}
);
TAPI_ADD_TYPE_SPECIALFROMVARIANT(
/* baseType */ QTime,
/* typeName */ Time_t,
/* fnSetFromVariant */ [=](const QVariant &_value, const QString &_paramName = {}) {
/* fnSetFromVariant */ [=](const QVariant &_value, const QString &_paramName = {}) {
Q_UNUSED(_paramName);
*this = _value.toTime();
}
);
TAPI_ADD_TYPE_SPECIALFROMVARIANT(
/* baseType */ QDateTime,
/* typeName */ DateTime_t,
/* fnSetFromVariant */ [=](const QVariant &_value, const QString &_paramName = {}) {
/* fnSetFromVariant */ [=](const QVariant &_value, const QString &_paramName = {}) {
_DEBUG_TAPI_REGISTER_METATYPE_3(DateTime_t, "***** fnSetFromVariant", _paramName, _value);
*this = _value.toDateTime();
}
Expand All @@ -253,7 +253,7 @@ TAPI_ADD_TYPE_SPECIALFROMVARIANT(
TAPI_ADD_TYPE_SPECIALFROMVARIANT( \
/* baseType */ QJsonDocument, \
/* typeName */ _type, \
/* fnSetFromVariant */ [=](const QVariant &_value, const QString &_paramName = {}) { \
/* fnSetFromVariant */ [=](const QVariant &_value, const QString &_paramName = {}) { \
_DEBUG_TAPI_REGISTER_METATYPE_3(_type, "***** fnSetFromVariant", _paramName, _value); \
if (_value.isValid() == false) { \
this->setObject({}); \
Expand Down
8 changes: 3 additions & 5 deletions Interfaces/Helpers/RESTClientHelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,11 +197,9 @@ QVariant RESTClientHelper::callAPI(
if (ValueToString.isEmpty() == false)
ValueToString += ",";

if (v.isString())
ValueToString += "'";
ValueToString += v.toString();
if (v.isString())
ValueToString += "'";
// if (v.isString()) ValueToString += "'";
ValueToString += v.toVariant().toString();
// if (v.isString()) ValueToString += "'";
}
} else
ValueToString = Value.toString();
Expand Down
18 changes: 14 additions & 4 deletions Modules/Account/moduleSrc/ORM/APITokens.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,18 @@ using namespace Helpers;
using namespace Server;
using namespace DBManager;

using namespace Targoman::Common::Configuration;

tmplConfigurable<quint32> APITokens::TTL(
APITokens::makeConfig("TTL"),
"Time to live for the api token in days",
static_cast<quint16>(365), //1 year
ReturnTrueCrossValidator(),
"",
"TTL-DAYS",
"apitoken-ttl-days",
enuConfigSource::Arg | enuConfigSource::File);

/******************************************************/
TARGOMAN_API_SUBMODULE_IMPLEMENT(Account, APITokens);

Expand Down Expand Up @@ -130,7 +142,7 @@ QVariant IMPL_REST_GET(APITokens, byService, (
_query.nestedInnerJoin(APITokenServices::instance().makeSelectQuery(APICALLBOOM_PARAM, "", _translate, false)
.addCol(tblAPITokenServices::Fields::aptsvc_aptID, tblAPITokenServices::Fields::aptsvc_aptID)
.innerJoinWith(tblAPITokenServices::Relation::Service)
.where({ tblService::Fields::svcName, enuConditionOperator::In, _services.join(",") })
.where({ tblService::Fields::svcName, enuConditionOperator::In, "'" + _services.join("','") + "'" })
.groupBy(tblAPITokenServices::Fields::aptsvc_aptID)
, "tmpSearchAPIServices"
, { "tmpSearchAPIServices", tblAPITokenServices::Fields::aptsvc_aptID,
Expand Down Expand Up @@ -226,13 +238,11 @@ stuRequestTokenResult APITokens::create(
// { JWTItems::rolName, _activeAccount.Privs["rolName"] },
};

qint64 TTL = 1 * 365 * 24 * 3600; //1 year

JWT = QJWT::createSigned(
Payload,
enuTokenActorType::API,
QJsonObject({ { "svc", _services.join(",") } }),
TTL
APITokens::TTL.value() * 24 * 3600
// _activeAccount.Privs["ssnKey"].toString()
);

Expand Down
4 changes: 4 additions & 0 deletions Modules/Account/moduleSrc/ORM/APITokens.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,10 @@ class APITokens : public intfSQLBasedModule
Q_OBJECT
TARGOMAN_API_SUBMODULE_DEFINE(Account, APITokens);

public:
static inline QString makeConfig(const QString& _name) { return "/Account/APITokens/" + _name; }
static Targoman::Common::Configuration::tmplConfigurable<quint32> TTL;

public:
stuRequestTokenResult create(
INTFAPICALLBOOM_DECL &APICALLBOOM_PARAM,
Expand Down