Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
58 changes: 34 additions & 24 deletions Modules/Account/moduleSrc/ORM/APITokens.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -154,30 +154,40 @@ stuRequestTokenResult APITokens::create(
TAPI::EncodedJWT_t JWT = "TEMP_" + SecurityHelper::UUIDtoMD5();

//2: insert into tblAPITokens
ORMCreateQuery CreateQuery = this->makeCreateQuery(APICALLBOOM_PARAM)
.addCol(tblAPITokens::Fields::aptToken)
.addCol(tblAPITokens::Fields::aptName)
.addCol(tblAPITokens::Fields::apt_usrID)
// .addCol(tblAPITokens::Fields::aptLang)
// .addCol(tblAPITokens::Fields::aptValidateIP)
// .addCol(tblAPITokens::Fields::aptExtraPrivileges)
// .addCol(tblAPITokens::Fields::aptExpiryDate)
// .addCol(tblAPITokens::Fields::aptLastActivity)
// .addCol(tblAPITokens::Fields::aptAccessCount)
.addCol(tblAPITokens::Fields::aptStatus)
// .addCol(tblAPITokens::Fields::aptCreationDateTime)
// .addCol(tblAPITokens::Fields::aptCreatedBy_usrID)
// .addCol(tblAPITokens::Fields::aptUpdatedBy_usrID)

.values({
{ tblAPITokens::Fields::aptToken, JWT },
{ tblAPITokens::Fields::aptName, _name },
{ tblAPITokens::Fields::apt_usrID, _userID },
{ tblAPITokens::Fields::aptStatus, enuAPITokensStatus::Pending },

})
;
quint64 APITokenID = CreateQuery.execute(_userID); //APICALLBOOM_PARAM.getActorID());
quint64 APITokenID = 0;
try {
ORMCreateQuery CreateQuery = this->makeCreateQuery(APICALLBOOM_PARAM)
.addCol(tblAPITokens::Fields::aptToken)
.addCol(tblAPITokens::Fields::aptName)
.addCol(tblAPITokens::Fields::apt_usrID)
// .addCol(tblAPITokens::Fields::aptLang)
// .addCol(tblAPITokens::Fields::aptValidateIP)
// .addCol(tblAPITokens::Fields::aptExtraPrivileges)
// .addCol(tblAPITokens::Fields::aptExpiryDate)
// .addCol(tblAPITokens::Fields::aptLastActivity)
// .addCol(tblAPITokens::Fields::aptAccessCount)
.addCol(tblAPITokens::Fields::aptStatus)
// .addCol(tblAPITokens::Fields::aptCreationDateTime)
// .addCol(tblAPITokens::Fields::aptCreatedBy_usrID)
// .addCol(tblAPITokens::Fields::aptUpdatedBy_usrID)

.values({
{ tblAPITokens::Fields::aptToken, JWT },
{ tblAPITokens::Fields::aptName, _name },
{ tblAPITokens::Fields::apt_usrID, _userID },
{ tblAPITokens::Fields::aptStatus, enuAPITokensStatus::Pending },

})
;
APITokenID = CreateQuery.execute(_userID); //APICALLBOOM_PARAM.getActorID());

} catch (const std::exception &_exp) {
QString ExpStr = _exp.what();
if (ExpStr.contains("Duplicate entry", Qt::CaseInsensitive))
throw /*exHTTPConflict*/exHTTPBadRequest("This name has already been used");

throw;
}

//3: create jwt
QJsonObject Privs;
Expand Down
20 changes: 20 additions & 0 deletions Modules/MT/functionalTest/testMT.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,26 @@ private slots:
}
}

void request_apitoken_samename() {
QT_TRY {
QVariant Result = this->callUserAPI(
RESTClientHelper::enuHTTPMethod::POST,
"Account/APITokens/request",
{},
{
{ "name", "test mt" },
// { "services", QStringList({
// "MT",
// "blablabla",
// }) },
});
} QT_CATCH (exTargomanBase &exp) {
qDebug() << "OK" << exp.what();
} QT_CATCH (const std::exception &exp) {
QTest::qFail(exp.what(), __FILE__, __LINE__);
}
}

void get_tokens() {
QT_TRY {
QVariant Result = this->callUserAPI(
Expand Down