owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into opensubsonic-extra-fields

Browse Source
This commit is contained in:
emeric
2023-10-09 12:14:47 +02:00
parent aebd028af4 eaed24dfcb
commit e24ffb1347
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lms/ui/Auth.cpp
+10 -10
View File
@@ -21,12 +21,12 @@
#include <iomanip> #include <iomanip>
#include <Wt/Http/Cookie.h>
#include <Wt/WEnvironment.h> #include <Wt/WEnvironment.h>
#include <Wt/WCheckBox.h>
#include <Wt/WFormModel.h> #include <Wt/WFormModel.h>
#include <Wt/WLineEdit.h> #include <Wt/WLineEdit.h>
#include <Wt/WCheckBox.h>
#include <Wt/WPushButton.h> #include <Wt/WPushButton.h>
#include <Wt/WRandom.h>
#include "services/auth/IAuthTokenService.hpp" #include "services/auth/IAuthTokenService.hpp"
#include "services/auth/IPasswordService.hpp" #include "services/auth/IPasswordService.hpp"
@@ -50,12 +50,16 @@ void
createAuthToken(Database::UserId userId, const Wt::WDateTime& expiry) createAuthToken(Database::UserId userId, const Wt::WDateTime& expiry)
{ {
const std::string secret {Service<::Auth::IAuthTokenService>::get()->createAuthToken(userId, expiry)}; const std::string secret {Service<::Auth::IAuthTokenService>::get()->createAuthToken(userId, expiry)};
Wt::Http::Cookie cookie{ authCookieName, secret, expiry };
cookie.setSecure(LmsApp->environment().urlScheme() == "https");
LmsApp->setCookie(cookie); LmsApp->setCookie(authCookieName,
secret,
expiry.toTime_t() - Wt::WDateTime::currentDateTime().toTime_t(),
"",
"",
LmsApp->environment().urlScheme() == "https");
} }
std::optional<Database::UserId> std::optional<Database::UserId>
processAuthToken(const Wt::WEnvironment& env) processAuthToken(const Wt::WEnvironment& env)
{ {
@@ -68,12 +72,8 @@ processAuthToken(const Wt::WEnvironment& env)
{ {
case ::Auth::IAuthTokenService::AuthTokenProcessResult::State::Denied: case ::Auth::IAuthTokenService::AuthTokenProcessResult::State::Denied:
case ::Auth::IAuthTokenService::AuthTokenProcessResult::State::Throttled: case ::Auth::IAuthTokenService::AuthTokenProcessResult::State::Throttled:
{ LmsApp->setCookie(authCookieName, std::string {}, 0, "", "", env.urlScheme() == "https");
Wt::Http::Cookie cookie{ authCookieName };
cookie.setSecure(LmsApp->environment().urlScheme() == "https");
LmsApp->removeCookie(cookie);
return std::nullopt; return std::nullopt;
}
case ::Auth::IAuthTokenService::AuthTokenProcessResult::State::Granted: case ::Auth::IAuthTokenService::AuthTokenProcessResult::State::Granted:
createAuthToken(res.authTokenInfo->userId, res.authTokenInfo->expiry); createAuthToken(res.authTokenInfo->userId, res.authTokenInfo->expiry);