refractor(auth): removed password from everywhere
This commit is contained in:
@@ -36,19 +36,6 @@ std::optional<visione::auth::UserContext> requireUser(
|
||||
return user;
|
||||
}
|
||||
|
||||
bool blockPasswordChangeRequired(
|
||||
const visione::auth::UserContext &user,
|
||||
std::function<void(const HttpResponsePtr &)> &callback)
|
||||
{
|
||||
if (!visione::auth::mustChangePassword(user))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
callback(visione::http::error("password_change_required",
|
||||
drogon::k403Forbidden));
|
||||
return true;
|
||||
}
|
||||
|
||||
void sendService(Json::Value body,
|
||||
std::function<void(const HttpResponsePtr &)> &&callback)
|
||||
{
|
||||
@@ -119,7 +106,7 @@ void ReportController::create(
|
||||
std::function<void(const HttpResponsePtr &)> &&callback)
|
||||
{
|
||||
auto user = requireUser(req, callback);
|
||||
if (!user || blockPasswordChangeRequired(*user, callback))
|
||||
if (!user)
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -139,7 +126,7 @@ void ReportController::list(
|
||||
std::function<void(const HttpResponsePtr &)> &&callback)
|
||||
{
|
||||
auto user = requireUser(req, callback);
|
||||
if (!user || blockPasswordChangeRequired(*user, callback))
|
||||
if (!user)
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -157,7 +144,7 @@ void ReportController::listCategories(
|
||||
std::function<void(const HttpResponsePtr &)> &&callback)
|
||||
{
|
||||
auto user = requireUser(req, callback);
|
||||
if (!user || blockPasswordChangeRequired(*user, callback))
|
||||
if (!user)
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -170,7 +157,7 @@ void ReportController::listTeams(
|
||||
std::function<void(const HttpResponsePtr &)> &&callback)
|
||||
{
|
||||
auto user = requireUser(req, callback);
|
||||
if (!user || blockPasswordChangeRequired(*user, callback))
|
||||
if (!user)
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -183,7 +170,7 @@ void ReportController::assignedReports(
|
||||
std::function<void(const HttpResponsePtr &)> &&callback)
|
||||
{
|
||||
auto user = requireUser(req, callback);
|
||||
if (!user || blockPasswordChangeRequired(*user, callback))
|
||||
if (!user)
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -199,7 +186,7 @@ void ReportController::openReports(
|
||||
std::function<void(const HttpResponsePtr &)> &&callback)
|
||||
{
|
||||
auto user = requireUser(req, callback);
|
||||
if (!user || blockPasswordChangeRequired(*user, callback))
|
||||
if (!user)
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -215,7 +202,7 @@ void ReportController::otherOperatorReports(
|
||||
std::function<void(const HttpResponsePtr &)> &&callback)
|
||||
{
|
||||
auto user = requireUser(req, callback);
|
||||
if (!user || blockPasswordChangeRequired(*user, callback))
|
||||
if (!user)
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -232,7 +219,7 @@ void ReportController::detail(
|
||||
long long reportId)
|
||||
{
|
||||
auto user = requireUser(req, callback);
|
||||
if (!user || blockPasswordChangeRequired(*user, callback))
|
||||
if (!user)
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -246,7 +233,7 @@ void ReportController::interventionSummary(
|
||||
long long reportId)
|
||||
{
|
||||
auto user = requireUser(req, callback);
|
||||
if (!user || blockPasswordChangeRequired(*user, callback))
|
||||
if (!user)
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -260,7 +247,7 @@ void ReportController::teamSuggestions(
|
||||
long long reportId)
|
||||
{
|
||||
auto user = requireUser(req, callback);
|
||||
if (!user || blockPasswordChangeRequired(*user, callback))
|
||||
if (!user)
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -274,7 +261,7 @@ void ReportController::createInterventionLink(
|
||||
long long reportId)
|
||||
{
|
||||
auto user = requireUser(req, callback);
|
||||
if (!user || blockPasswordChangeRequired(*user, callback))
|
||||
if (!user)
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -288,7 +275,7 @@ void ReportController::revokeInterventionLink(
|
||||
long long reportId)
|
||||
{
|
||||
auto user = requireUser(req, callback);
|
||||
if (!user || blockPasswordChangeRequired(*user, callback))
|
||||
if (!user)
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -302,7 +289,7 @@ void ReportController::updateStatus(
|
||||
long long reportId)
|
||||
{
|
||||
auto user = requireUser(req, callback);
|
||||
if (!user || blockPasswordChangeRequired(*user, callback))
|
||||
if (!user)
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -317,7 +304,7 @@ void ReportController::takeReport(
|
||||
long long reportId)
|
||||
{
|
||||
auto user = requireUser(req, callback);
|
||||
if (!user || blockPasswordChangeRequired(*user, callback))
|
||||
if (!user)
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -331,7 +318,7 @@ void ReportController::addMessage(
|
||||
long long reportId)
|
||||
{
|
||||
auto user = requireUser(req, callback);
|
||||
if (!user || blockPasswordChangeRequired(*user, callback))
|
||||
if (!user)
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -346,7 +333,7 @@ void ReportController::listMessages(
|
||||
long long reportId)
|
||||
{
|
||||
auto user = requireUser(req, callback);
|
||||
if (!user || blockPasswordChangeRequired(*user, callback))
|
||||
if (!user)
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -361,7 +348,7 @@ void ReportController::flagMessage(
|
||||
long long messageId)
|
||||
{
|
||||
auto user = requireUser(req, callback);
|
||||
if (!user || blockPasswordChangeRequired(*user, callback))
|
||||
if (!user)
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -377,7 +364,7 @@ void ReportController::assignTeam(
|
||||
long long reportId)
|
||||
{
|
||||
auto user = requireUser(req, callback);
|
||||
if (!user || blockPasswordChangeRequired(*user, callback))
|
||||
if (!user)
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -392,7 +379,7 @@ void ReportController::addFeedback(
|
||||
long long reportId)
|
||||
{
|
||||
auto user = requireUser(req, callback);
|
||||
if (!user || blockPasswordChangeRequired(*user, callback))
|
||||
if (!user)
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -407,7 +394,7 @@ void ReportController::flagReport(
|
||||
long long reportId)
|
||||
{
|
||||
auto user = requireUser(req, callback);
|
||||
if (!user || blockPasswordChangeRequired(*user, callback))
|
||||
if (!user)
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -422,7 +409,7 @@ void ReportController::uploadMedia(
|
||||
long long reportId)
|
||||
{
|
||||
auto user = requireUser(req, callback);
|
||||
if (!user || blockPasswordChangeRequired(*user, callback))
|
||||
if (!user)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user