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

Added first connection wizard to create the administrator account

Browse Source
This commit is contained in:
emeric
2018-03-08 22:57:56 +01:00
parent db0fe53aa3
commit 86fc1415d5
15 changed files with 287 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/database/DatabaseHandler.cpp
+1 -1
View File
@@ -61,7 +61,7 @@ Handler::configureAuth(void)
strengthValidator->setMinimumLength( Wt::Auth::PasswordStrengthValidator::OneCharClass, 4);
strengthValidator->setMinimumLength( Wt::Auth::PasswordStrengthValidator::TwoCharClass, 4);
strengthValidator->setMinimumLength( Wt::Auth::PasswordStrengthValidator::ThreeCharClass, 4 );
strengthValidator->setMinimumLength( Wt::Auth::PasswordStrengthValidator::FourCharClass, 4 );
strengthValidator->setMinimumLength( Wt::Auth::PasswordStrengthValidator::FourCharClass, 4 );
passwordService.setStrengthValidator(strengthValidator);
}
src/database/User.cpp
-56
View File
@@ -26,26 +26,9 @@ const std::vector<std::size_t>
User::audioBitrates =
{
64000,
96000,
128000,
160000,
192000,
224000,
256000,
320000,
512000
};
const std::vector<std::size_t>
User::videoBitrates =
{
256000,
512000,
1024000,
2048000,
4096000,
8192000
};
const std::vector<AudioEncoding>
@@ -57,20 +40,11 @@ User::audioEncodings =
AudioEncoding::WEBMA,
};
const std::vector<VideoEncoding>
User::videoEncodings =
{
VideoEncoding::AUTO,
};
User::User()
: _maxAudioBitrate(maxAudioBitrate),
_maxVideoBitrate(maxVideoBitrate),
_isAdmin(false),
_audioBitrate(defaultAudioBitrate),
_audioEncoding(AudioEncoding::AUTO),
_videoBitrate(defaultVideoBitrate),
_videoEncoding(VideoEncoding::AUTO),
_curPlayingTrackPos(0)
{
@@ -108,24 +82,12 @@ User::setAudioBitrate(std::size_t bitrate)
_audioBitrate = std::min(bitrate, std::min(static_cast<std::size_t>(_maxAudioBitrate), audioBitrates.back()));
}
void
User::setVideoBitrate(std::size_t bitrate)
{
_videoBitrate = std::min(bitrate, std::min(static_cast<std::size_t>(_maxVideoBitrate), videoBitrates.back()));
}
void
User::setMaxAudioBitrate(std::size_t bitrate)
{
_maxAudioBitrate = std::min(bitrate, static_cast<std::size_t>(_maxAudioBitrate));
}
void
User::setMaxVideoBitrate(std::size_t bitrate)
{
_maxVideoBitrate = std::min(bitrate, static_cast<std::size_t>(_maxVideoBitrate));
}
std::size_t
User::getAudioBitrate(void) const
{
@@ -135,15 +97,6 @@ User::getAudioBitrate(void) const
return std::min(static_cast<std::size_t>(_audioBitrate), audioBitrates.back());
}
std::size_t
User::getVideoBitrate(void) const
{
if (!isAdmin())
return std::min(static_cast<std::size_t>(_videoBitrate), std::min(static_cast<std::size_t>(_maxVideoBitrate), videoBitrates.back()));
else
return std::min(static_cast<std::size_t>(_videoBitrate), videoBitrates.back());
}
std::size_t
User::getMaxAudioBitrate(void) const
{
@@ -153,15 +106,6 @@ User::getMaxAudioBitrate(void) const
return audioBitrates.back();
}
std::size_t
User::getMaxVideoBitrate(void) const
{
if (!isAdmin())
return std::min(static_cast<std::size_t>(_maxVideoBitrate), videoBitrates.back());
else
return videoBitrates.back();
}
} // namespace Database
src/database/User.hpp
+4 -27
View File
@@ -41,29 +41,21 @@ enum class AudioEncoding
WEBMA,
};
enum class VideoEncoding
{
AUTO,
};
class User
{
public:
typedef Wt::Dbo::dbo_traits<User>::IdType id_type;
typedef Wt::Dbo::ptr<User> pointer;
static const std::size_t MinNameLength = 3;
static const std::size_t MaxNameLength = 15;
// list of audio/video parameters
// list of audio parameters
static const std::vector<std::size_t> audioBitrates;
static const std::vector<AudioEncoding> audioEncodings;
static const std::vector<std::size_t> videoBitrates;
static const std::vector<VideoEncoding> videoEncodings;
User();
typedef Wt::Dbo::ptr<User> pointer;
// utility
static pointer create(Wt::Dbo::Session& session);
@@ -76,32 +68,23 @@ class User
void setAdmin(bool admin) { _isAdmin = admin; }
void setAudioBitrate(std::size_t bitrate);
void setAudioEncoding(AudioEncoding encoding) { _audioEncoding = encoding; }
void setVideoBitrate(std::size_t bitrate);
void setVideoEncoding(VideoEncoding encoding) { _videoEncoding = encoding; }
void setMaxAudioBitrate(std::size_t bitrate);
void setMaxVideoBitrate(std::size_t bitrate);
void setCurPlayingTrackPos(std::size_t pos) { _curPlayingTrackPos = pos; }
// read
bool isAdmin() const {return _isAdmin;}
std::size_t getAudioBitrate() const;
AudioEncoding getAudioEncoding() const { return _audioEncoding;}
std::size_t getVideoBitrate() const;
VideoEncoding getVideoEncoding() const { return _videoEncoding;}
std::size_t getMaxAudioBitrate() const;
std::size_t getMaxVideoBitrate() const;
std::size_t getCurPlayingTrackPos() const { return _curPlayingTrackPos; }
template<class Action>
void persist(Action& a)
{
Wt::Dbo::field(a, _maxAudioBitrate, "max_audio_bitrate");
Wt::Dbo::field(a, _maxVideoBitrate, "max_video_bitrate");
Wt::Dbo::field(a, _isAdmin, "admin");
Wt::Dbo::field(a, _audioBitrate, "audio_bitrate");
Wt::Dbo::field(a, _audioEncoding, "audio_encoding");
Wt::Dbo::field(a, _videoBitrate, "video_bitrate");
Wt::Dbo::field(a, _videoEncoding, "video_encoding");
// User's dynamic data
Wt::Dbo::field(a, _curPlayingTrackPos, "cur_playing_track_pos");
Wt::Dbo::hasMany(a, _playlists, Wt::Dbo::ManyToOne, "user");
@@ -110,21 +93,15 @@ class User
private:
static const std::size_t maxAudioBitrate = 320000;
static const std::size_t maxVideoBitrate = 2048000;
static const std::size_t defaultAudioBitrate = 128000;
static const std::size_t defaultVideoBitrate = 1024000;
// Admin defined settings
int _maxAudioBitrate;
int _maxVideoBitrate;
bool _isAdmin;
// User defined settings
int _audioBitrate;
AudioEncoding _audioEncoding;
int _videoBitrate;
VideoEncoding _videoEncoding;
// User's dynamic data
int _curPlayingTrackPos; // Current track position in queue