diff --git a/Makefile.am b/Makefile.am index ded64f2e..00bf7d3d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,7 +22,8 @@ lms_js_DATA = \ lms_approot_DATA = \ approot/admin-database.xml \ - approot/admin-wizard.xml \ + approot/admin-users.xml \ + approot/admin-initwizard.xml \ approot/artist.xml \ approot/artists.xml \ approot/explore.xml \ diff --git a/approot/admin-wizard.xml b/approot/admin-initwizard.xml similarity index 96% rename from approot/admin-wizard.xml rename to approot/admin-initwizard.xml index c2af28e8..175cb54d 100644 --- a/approot/admin-wizard.xml +++ b/approot/admin-initwizard.xml @@ -1,9 +1,8 @@ - - +

${tr:Lms.AdminWizard.header}

diff --git a/approot/admin-users.xml b/approot/admin-users.xml new file mode 100644 index 00000000..be2e36d9 --- /dev/null +++ b/approot/admin-users.xml @@ -0,0 +1,18 @@ + + + + +
+

${tr:Lms.Admin.Users.users}

+
+ ${users class="list-group"} + ${add-btn class="btn-primary"} + + + +
+ ${name} ${}${edit-btn} ${del-btn class="btn-danger"}${} +
+ + + diff --git a/approot/messages.xml b/approot/messages.xml index 27112c53..b1027651 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -30,10 +30,15 @@ Update start time Weekly + +New user +Delete +Edit +Users - -Administration account created. Please refresh to continue! -Create administrator account + +Administration account created. Please refresh to continue! +Create administrator account Remember me diff --git a/src/Makefile.am b/src/Makefile.am index b5c510a8..bbd38809 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,7 +28,8 @@ lms_SOURCES = \ $(srcdir)/ui/PlayQueueView.cpp \ $(srcdir)/ui/SettingsView.cpp \ $(srcdir)/ui/admin/DatabaseSettingsView.cpp \ - $(srcdir)/ui/admin/AdminWizardView.cpp \ + $(srcdir)/ui/admin/InitWizardView.cpp \ + $(srcdir)/ui/admin/UsersView.cpp \ $(srcdir)/ui/common/InputRange.cpp \ $(srcdir)/ui/common/LineEdit.cpp \ $(srcdir)/ui/common/Validators.cpp \ diff --git a/src/database/User.cpp b/src/database/User.cpp index 2919d0a2..c299afde 100644 --- a/src/database/User.cpp +++ b/src/database/User.cpp @@ -60,13 +60,6 @@ User::getById(Wt::Dbo::Session& session, id_type id) return session.find().where("id = ?").bind( id ); } -std::string -User::getId( pointer user) -{ - std::ostringstream oss; oss << user.id(); - return oss.str(); -} - void User::setAudioBitrate(std::size_t bitrate) { diff --git a/src/database/User.hpp b/src/database/User.hpp index 582fb964..35ce625e 100644 --- a/src/database/User.hpp +++ b/src/database/User.hpp @@ -61,7 +61,6 @@ class User // accessors static pointer getById(Wt::Dbo::Session& session, id_type id); static std::vector getAll(Wt::Dbo::Session& session); - static std::string getId(pointer user); // write void setAdmin(bool admin) { _isAdmin = admin; } diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index 531f07c5..87b4220e 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -37,8 +37,9 @@ #include "PlayQueueView.hpp" #include "SettingsView.hpp" +#include "admin/InitWizardView.hpp" #include "admin/DatabaseSettingsView.hpp" -#include "admin/AdminWizardView.hpp" +#include "admin/UsersView.hpp" #include "resource/ImageResource.hpp" #include "resource/TranscodeResource.hpp" @@ -86,6 +87,7 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti // Add a resource bundle messageResourceBundle().use(appRoot() + "admin-database"); + messageResourceBundle().use(appRoot() + "admin-users"); messageResourceBundle().use(appRoot() + "admin-wizard"); messageResourceBundle().use(appRoot() + "artist"); messageResourceBundle().use(appRoot() + "artists"); @@ -115,7 +117,7 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti if (firstConnection) { - root()->addWidget(new AdminWizardView()); + root()->addWidget(new InitWizardView()); } else { @@ -208,31 +210,41 @@ enum IdxRoot IdxPlayQueue, IdxSettings, IdxAdminDatabase, + IdxAdminUsers, }; static void -handlePathChange(Wt::WStackedWidget* stack) +handlePathChange(Wt::WStackedWidget* stack, bool isAdmin) { - static const std::map indexes = + static const struct { - { "/home", IdxHome }, - { "/artists", IdxExplore }, - { "/artist", IdxExplore }, - { "/releases", IdxExplore }, - { "/release", IdxExplore }, - { "/tracks", IdxExplore }, - { "/playqueue", IdxPlayQueue }, - { "/settings", IdxSettings }, - { "/admin/database", IdxAdminDatabase }, + std::string path; + int index; + bool admin; + } views[] = + { + { "/home", IdxHome, false }, + { "/artists", IdxExplore, false }, + { "/artist", IdxExplore, false }, + { "/releases", IdxExplore, false }, + { "/release", IdxExplore, false }, + { "/tracks", IdxExplore, false }, + { "/playqueue", IdxPlayQueue, false }, + { "/settings", IdxSettings, false }, + { "/admin/database", IdxAdminDatabase, true }, + { "/admin/users", IdxAdminUsers, true }, }; LMS_LOG(UI, DEBUG) << "Internal path changed to '" << wApp->internalPath() << "'"; - for (auto index : indexes) + for (auto& view : views) { - if (wApp->internalPathMatches(index.first)) + if (wApp->internalPathMatches(view.path)) { - stack->setCurrentIndex(index.second); + if (view.admin && !isAdmin) + break; + + stack->setCurrentIndex(view.index); return; } } @@ -253,6 +265,11 @@ LmsApplication::handleAuthEvent(void) LMS_LOG(UI, INFO) << "User '" << CurrentAuthUser().identity(Wt::Auth::Identity::LoginName) << "' logged in from '" << Wt::WApplication::instance()->environment().clientAddress() << "', user agent = " << Wt::WApplication::instance()->environment().agent() << ", session = " << Wt::WApplication::instance()->sessionId(); + { + Wt::Dbo::Transaction transaction (DboSession()); + _isAdmin = CurrentUser()->isAdmin(); + } + require("/js/mediaplayer.js"); _imageResource = new ImageResource(_db, root()); @@ -295,21 +312,21 @@ LmsApplication::handleAuthEvent(void) auto rightMenu = new Wt::WMenu(); std::size_t itemCounter = 0; + if (_isAdmin) { - Wt::Dbo::Transaction transaction (DboSession()); + auto menuItem = rightMenu->insertItem(itemCounter++, Wt::WString::tr("Lms.administration")); + menuItem->setSelectable(false); - if (CurrentUser()->isAdmin()) - { - auto menuItem = rightMenu->insertItem(itemCounter++, Wt::WString::tr("Lms.administration")); - menuItem->setSelectable(false); + Wt::WPopupMenu *admin = new Wt::WPopupMenu(); + auto dbSettings = admin->insertItem(0, Wt::WString::tr("Lms.Admin.Database.database")); + dbSettings->setLink(Wt::WLink(Wt::WLink::InternalPath, "/admin/database")); + dbSettings->setSelectable(false); - Wt::WPopupMenu *admin = new Wt::WPopupMenu(); - auto dbSettings = admin->insertItem(0, Wt::WString::tr("Lms.Admin.Database.database")); - dbSettings->setLink(Wt::WLink(Wt::WLink::InternalPath, "/admin/database")); - dbSettings->setSelectable(false); + auto usersSettings = admin->insertItem(1, Wt::WString::tr("Lms.Admin.Users.users")); + usersSettings->setLink(Wt::WLink(Wt::WLink::InternalPath, "/admin/users")); + usersSettings->setSelectable(false); - menuItem->setMenu(admin); - } + menuItem->setMenu(admin); } { @@ -344,8 +361,14 @@ LmsApplication::handleAuthEvent(void) mainStack->addWidget(settings); // Admin stuff - auto databaseSettings = new DatabaseSettingsView(); - mainStack->addWidget(databaseSettings); + if (_isAdmin) + { + auto databaseSettings = new DatabaseSettingsView(); + mainStack->addWidget(databaseSettings); + + auto users = new UsersView(); + mainStack->addWidget(users); + } explore->tracksAdd.connect(std::bind([=] (std::vector tracks) { @@ -380,7 +403,7 @@ LmsApplication::handleAuthEvent(void) playqueue->playbackStop.connect(player, &MediaPlayer::stop); // Events from MediaScanner - if (CurrentUser()->isAdmin()) + if (_isAdmin) { enableUpdates(true); std::string sessionId = this->sessionId(); @@ -401,10 +424,10 @@ LmsApplication::handleAuthEvent(void) internalPathChanged().connect(std::bind([=] { - handlePathChange(mainStack); + handlePathChange(mainStack, _isAdmin); })); - handlePathChange(mainStack); + handlePathChange(mainStack, _isAdmin); } void diff --git a/src/ui/LmsApplication.hpp b/src/ui/LmsApplication.hpp index 098f6856..8ff8adbc 100644 --- a/src/ui/LmsApplication.hpp +++ b/src/ui/LmsApplication.hpp @@ -65,6 +65,7 @@ class LmsApplication : public Wt::WApplication Scanner::MediaScanner& _scanner; ImageResource* _imageResource; TranscodeResource* _transcodeResource; + bool _isAdmin = false; }; // Helpers to get session data diff --git a/src/ui/admin/AdminWizardView.cpp b/src/ui/admin/InitWizardView.cpp similarity index 83% rename from src/ui/admin/AdminWizardView.cpp rename to src/ui/admin/InitWizardView.cpp index b0768c3c..4acb3965 100644 --- a/src/ui/admin/AdminWizardView.cpp +++ b/src/ui/admin/InitWizardView.cpp @@ -27,11 +27,11 @@ #include "common/Validators.hpp" #include "LmsApplication.hpp" -#include "AdminWizardView.hpp" +#include "InitWizardView.hpp" namespace UserInterface { -class AdminWizardModel : public Wt::WFormModel +class InitWizardModel : public Wt::WFormModel { public: @@ -40,7 +40,7 @@ class AdminWizardModel : public Wt::WFormModel static const Field PasswordField; static const Field PasswordConfirmField; - AdminWizardModel(Wt::WObject *parent = 0) + InitWizardModel(Wt::WObject *parent = 0) : Wt::WFormModel(parent) { addField(AdminLoginField); @@ -112,31 +112,31 @@ class AdminWizardModel : public Wt::WFormModel }; -const Wt::WFormModel::Field AdminWizardModel::AdminLoginField = "admin-login"; -const Wt::WFormModel::Field AdminWizardModel::PasswordField = "password"; -const Wt::WFormModel::Field AdminWizardModel::PasswordConfirmField = "password-confirm"; +const Wt::WFormModel::Field InitWizardModel::AdminLoginField = "admin-login"; +const Wt::WFormModel::Field InitWizardModel::PasswordField = "password"; +const Wt::WFormModel::Field InitWizardModel::PasswordConfirmField = "password-confirm"; -AdminWizardView::AdminWizardView(Wt::WContainerWidget *parent) +InitWizardView::InitWizardView(Wt::WContainerWidget *parent) : Wt::WTemplateFormView(parent) { - auto model = new AdminWizardModel(this); + auto model = new InitWizardModel(this); - setTemplateText(Wt::WString::tr("Lms.AdminWizard.template")); + setTemplateText(Wt::WString::tr("Lms.Admin.InitWizard.template")); addFunction("tr", &WTemplate::Functions::tr); addFunction("id", &WTemplate::Functions::id); // AdminLogin Wt::WLineEdit* accountEdit = new Wt::WLineEdit(); - setFormWidget(AdminWizardModel::AdminLoginField, accountEdit); + setFormWidget(InitWizardModel::AdminLoginField, accountEdit); // Password Wt::WLineEdit* passwordEdit = new Wt::WLineEdit(); - setFormWidget(AdminWizardModel::PasswordField, passwordEdit ); + setFormWidget(InitWizardModel::PasswordField, passwordEdit ); passwordEdit->setEchoMode(Wt::WLineEdit::Password); // Password confirmation Wt::WLineEdit* passwordConfirmEdit = new Wt::WLineEdit(); - setFormWidget(AdminWizardModel::PasswordConfirmField, passwordConfirmEdit); + setFormWidget(InitWizardModel::PasswordConfirmField, passwordConfirmEdit); passwordConfirmEdit->setEchoMode(Wt::WLineEdit::Password); auto saveButton = new Wt::WPushButton(Wt::WString::tr("Lms.create")); @@ -148,7 +148,7 @@ AdminWizardView::AdminWizardView(Wt::WContainerWidget *parent) if (model->validate()) { model->saveData(); - LmsApp->notify(Wt::WString::tr("Lms.AdminWizard.done")); + LmsApp->notify(Wt::WString::tr("Lms.Admin.InitWizard.done")); saveButton->setEnabled(false); } diff --git a/src/ui/admin/AdminWizardView.hpp b/src/ui/admin/InitWizardView.hpp similarity index 88% rename from src/ui/admin/AdminWizardView.hpp rename to src/ui/admin/InitWizardView.hpp index ecf486ea..d294fe58 100644 --- a/src/ui/admin/AdminWizardView.hpp +++ b/src/ui/admin/InitWizardView.hpp @@ -24,10 +24,10 @@ namespace UserInterface { -class AdminWizardView : public Wt::WTemplateFormView +class InitWizardView : public Wt::WTemplateFormView { public: - AdminWizardView(Wt::WContainerWidget *parent = 0); + InitWizardView(Wt::WContainerWidget *parent = 0); }; diff --git a/src/ui/admin/UsersView.cpp b/src/ui/admin/UsersView.cpp new file mode 100644 index 00000000..c5ecb4fc --- /dev/null +++ b/src/ui/admin/UsersView.cpp @@ -0,0 +1,83 @@ +/* + * Copyright (C) 2018 Emeric Poupon + * + * This file is part of LMS. + * + * LMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * LMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with LMS. If not, see . + */ + +#include +#include + +#include "database/Types.hpp" +#include "utils/Logger.hpp" + +#include "LmsApplication.hpp" +#include "UsersView.hpp" + +namespace UserInterface { + +UsersView::UsersView(Wt::WContainerWidget *parent) + : Wt::WContainerWidget(parent) +{ + LMS_LOG(UI, DEBUG) << "TEST"; + auto t = new Wt::WTemplate(Wt::WString::tr("Lms.Admin.Users.template"), this); + t->addFunction("tr", &Wt::WTemplate::Functions::tr); + + _container = new Wt::WContainerWidget(); + t->bindWidget("users", _container); + + auto addBtn = new Wt::WPushButton(Wt::WString::tr("Lms.Admin.Users.add")); + t->bindWidget("add-btn", addBtn); + + refresh(); +} + +void +UsersView::refresh() +{ + _container->clear(); + + Wt::Dbo::Transaction transaction(DboSession()); + + auto users = Database::User::getAll(DboSession()); + for (auto user : users) + { + auto entry = new Wt::WTemplate(Wt::WString::tr("Lms.Admin.Users.template.entry"), _container); + + Wt::Auth::User authUser = DbHandler().getUserDatabase().findWithId(std::to_string(user.id())); + + if (!authUser.isValid()) { + LMS_LOG(UI, ERROR) << "Skipping invalid userId = " << user.id(); + continue; + } + + entry->bindString("name", authUser.identity(Wt::Auth::Identity::LoginName), Wt::PlainText); + + // Don't edit ourself this way + if (CurrentUser() != user) + { + entry->setCondition("if-edit", true); + auto editBtn = new Wt::WPushButton(Wt::WString::tr("Lms.Admin.Users.edit")); + entry->bindWidget("edit-btn", editBtn); + + auto delBtn = new Wt::WPushButton(Wt::WString::tr("Lms.Admin.Users.del")); + entry->bindWidget("del-btn", delBtn); + } + } +} + +} // namespace UserInterface + + diff --git a/src/ui/admin/UsersView.hpp b/src/ui/admin/UsersView.hpp new file mode 100644 index 00000000..a642ef10 --- /dev/null +++ b/src/ui/admin/UsersView.hpp @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2018 Emeric Poupon + * + * This file is part of LMS. + * + * LMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * LMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with LMS. If not, see . + */ + +#pragma once + +#include + +namespace UserInterface { + +class UsersView : public Wt::WContainerWidget +{ + public: + UsersView(Wt::WContainerWidget *parent = 0); + + private: + void refresh(); + + Wt::WContainerWidget* _container; +}; + +} // namespace UserInterface + + diff --git a/src/ui/explore/ArtistsView.cpp b/src/ui/explore/ArtistsView.cpp index cd1ff5ab..c6044b3d 100644 --- a/src/ui/explore/ArtistsView.cpp +++ b/src/ui/explore/ArtistsView.cpp @@ -87,7 +87,7 @@ Artists::addSome() for (auto artist : artists) { - Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Artists.template.entry"), _artistsContainer); + auto entry = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Artists.template.entry"), _artistsContainer); entry->bindInt("nb-release", artist->getReleases(clusterIds).size());