clean code.

Dockerfiles/ubuntu2204.dockerfile

@@ -45,6 +45,8 @@ RUN sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master
     && git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k \
     && sed -i 's/ZSH_THEME=".*"/ZSH_THEME="powerlevel10k\/powerlevel10k"/' /root/.zshrc \
     && sed -i 's/plugins=(.*)/plugins=(git z zsh-autosuggestions zsh-syntax-highlighting)/' /root/.zshrc \
+    && sed -i 's/^setopt share_history/# setopt share_history/' ~/.oh-my-zsh/lib/history.zsh \
+    && echo 'setopt no_share_history' >> ~/.oh-my-zsh/lib/history.zsh \
     && chsh -s /bin/zsh root
 
 RUN cd /root \

WebApplication/Hello.cpp

@@ -14,9 +14,10 @@
 #include <Wt/WPushButton.h>
 #include <Wt/WText.h>
 
-Hello::Hello(const Wt::WEnvironment &env, bool embedded) : Wt::WApplication(env) {
+Hello::Hello(const Wt::WEnvironment &env, Wt::Dbo::SqlConnectionPool &connectionPool, bool embedded)
+    : Wt::WApplication(env) {
     LOG(info) << "app root: " << appRoot();
-    m_session = std::make_unique<Session>(appRoot() + "auth.db");
+    m_session = std::make_unique<Session>(connectionPool);
     m_session->login().changed().connect(this, &Hello::authEvent);
     setTitle("Hello world");
     setTheme(std::make_shared<Wt::WBootstrap2Theme>());
@@ -59,7 +60,9 @@ Hello::Hello(const Wt::WEnvironment &env, bool embedded) : Wt::WApplication(env)
     m_nameEdit->enterPressed().connect(this, &Hello::greet);
 
     auto app = Amass::Singleton<WebApplication>::instance();
-    auto authWidget = std::make_unique<Wt::Auth::AuthWidget>(app->authService(), m_session->users(), m_session->login());
+    auto authWidget =
+        std::make_unique<Wt::Auth::AuthWidget>(app->authService(), m_session->users(), m_session->login());
+     authWidget->  setInternalBasePath("/");
     authWidget->model()->addPasswordAuth(&app->passwordService());
     authWidget->setRegistrationEnabled(true);
     authWidget->processEnvironment();

WebApplication/Hello.h

@@ -7,7 +7,7 @@ class Session;
 
 class Hello : public Wt::WApplication {
 public:
-    Hello(const Wt::WEnvironment &env, bool embedded);
+    Hello(const Wt::WEnvironment &env,Wt::Dbo::SqlConnectionPool &connectionPool, bool embedded);
     ~Hello();
 
 protected:

WebApplication/Restful.cpp

@@ -1,4 +1,5 @@
 #include "Restful.h"
+#include "Session.h"
 #include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/Json.h>
 #include <Wt/Dbo/backend/Sqlite3.h>
@@ -9,6 +10,7 @@ DBO_INSTANTIATE_TEMPLATES(MyMessage)
 DbStruct *m_dbStruct;
 
 void AuthenticationResource::handleRequest(const Wt::Http::Request &request, Wt::Http::Response &response) {
+    Session session(m_connectionPool);
     response.setMimeType("application/json");
     response.addHeader("Server", "Wt");
 
@@ -46,6 +48,10 @@ int DbStruct::rand() {
     return distribution(rng);
 }
 
+AuthenticationResource::AuthenticationResource(Wt::Dbo::SqlConnectionPool &connectionPool)
+    : m_connectionPool(connectionPool) {
+}
+
 DbStruct::DbStruct(const std::string &db) : rng(clock()), distribution(1, 10000) {
     session.setConnection(std::make_unique<Wt::Dbo::backend::Sqlite3>(db));
     session.mapClass<World>("world");

WebApplication/Restful.h

@@ -46,7 +46,11 @@ struct DbStruct {
 
 class AuthenticationResource : public Wt::WResource {
 public:
+    AuthenticationResource(Wt::Dbo::SqlConnectionPool &connectionPool);
     void handleRequest(const Wt::Http::Request &request, Wt::Http::Response &response) final;
+
+private:
+    Wt::Dbo::SqlConnectionPool &m_connectionPool;
 };
 
 class PlaintextResource : public Wt::WResource {

WebApplication/Session.cpp

@@ -10,12 +10,8 @@
 #include <Wt/Auth/PasswordVerifier.h>
 #include <Wt/Dbo/backend/Sqlite3.h>
 
-Session::Session(const std::string &sqliteDb) {
+Session::Session(Wt::Dbo::SqlConnectionPool &connectionPool) : m_connectionPool(connectionPool) {
-    auto connection = std::make_unique<Wt::Dbo::backend::Sqlite3>(sqliteDb);
+    setConnectionPool(m_connectionPool);
-
-    connection->setProperty("show-queries", "true");
-
-    setConnection(std::move(connection));
 
     mapClass<User>("user");
     mapClass<AuthInfo>("auth_info");
@@ -35,6 +31,14 @@ Session::Session(const std::string &sqliteDb) {
 Session::~Session() {
 }
 
+Wt::Dbo::ptr<User> Session::user() const {
+    if (m_login.loggedIn()) {
+        Wt::Dbo::ptr<AuthInfo> authInfo = m_users->find(m_login.user());
+        return authInfo->user();
+    } else
+        return Wt::Dbo::ptr<User>();
+}
+
 Wt::Auth::AbstractUserDatabase &Session::users() {
     return *m_users;
 }

WebApplication/Session.h

@@ -9,12 +9,14 @@ using UserDatabase = Wt::Auth::Dbo::UserDatabase<AuthInfo>;
 
 class Session : public Wt::Dbo::Session {
 public:
-    Session(const std::string &sqliteDb);
+    Session(Wt::Dbo::SqlConnectionPool &connectionPool);
     ~Session();
+    Wt::Dbo::ptr<User> user() const;
     Wt::Auth::AbstractUserDatabase &users();
     Wt::Auth::Login &login();
 
 private:
+    Wt::Dbo::SqlConnectionPool &m_connectionPool;
     std::unique_ptr<UserDatabase> m_users;
     Wt::Auth::Login m_login;
 };

WebApplication/WebApplication.cpp

@@ -8,17 +8,11 @@
 #include <Wt/Auth/PasswordService.h>
 #include <Wt/Auth/PasswordStrengthValidator.h>
 #include <Wt/Auth/PasswordVerifier.h>
+#include <Wt/Dbo/FixedSqlConnectionPool.h>
 #include <Wt/Dbo/SqlConnectionPool.h>
+#include <Wt/Dbo/backend/Sqlite3.h>
 #include <Wt/WServer.h>
 
-static std::unique_ptr<Wt::WApplication> createApplication(const Wt::WEnvironment &env) {
-    return std::make_unique<Hello>(env, false);
-}
-
-static std::unique_ptr<Wt::WApplication> createWidgetSet(const Wt::WEnvironment &env) {
-    return std::make_unique<Hello>(env, true);
-}
-
 WebApplication::WebApplication() {
     try {
         std::vector<std::string> args;
@@ -27,10 +21,17 @@ WebApplication::WebApplication() {
         args.push_back("--http-listen=127.0.0.1:8855");
         // --docroot=. --no-compression --http-listen 127.0.0.1:8855
         initializeAuthenticationService();
+
         m_server = std::make_unique<Wt::WServer>("./build", args);
-        m_server->addEntryPoint(Wt::EntryPointType::Application, createApplication, "/hello");
+        m_sqlConnectionPool = createConnectionPool(m_server->appRoot() + "database.sqlite");
-        m_server->addEntryPoint(Wt::EntryPointType::WidgetSet, createWidgetSet, "/gui/hello.js");
+
-        m_server->addResource(std::make_shared<AuthenticationResource>(), "/auth");
+        m_server->addEntryPoint(Wt::EntryPointType::Application,
+                                std::bind(&WebApplication::createApplication, this, std::placeholders::_1, false),
+                                "/hello");
+        m_server->addEntryPoint(Wt::EntryPointType::WidgetSet,
+                                std::bind(&WebApplication::createApplication, this, std::placeholders::_1, true),
+                                "/gui/hello.js");
+        m_server->addResource(std::make_shared<AuthenticationResource>(*m_sqlConnectionPool), "/auth");
         m_server->addResource(std::make_shared<PlaintextResource>(), "/plaintext");
         m_server->addResource(std::make_shared<DbResource>("database.sqlite"), "/db");
 
@@ -40,6 +41,18 @@ WebApplication::WebApplication() {
     }
 }
 
+std::unique_ptr<Wt::Dbo::SqlConnectionPool> WebApplication::createConnectionPool(const std::string &sqlite3) {
+    auto connection = std::make_unique<Wt::Dbo::backend::Sqlite3>(sqlite3);
+    connection->setProperty("show-queries", "true");
+    connection->setDateTimeStorage(Wt::Dbo::SqlDateTimeType::DateTime,
+                                   Wt::Dbo::backend::DateTimeStorage::PseudoISO8601AsText);
+    return std::make_unique<Wt::Dbo::FixedSqlConnectionPool>(std::move(connection), 10);
+}
+
+std::unique_ptr<Wt::WApplication> WebApplication::createApplication(const Wt::WEnvironment &env, bool embedded) {
+    return std::make_unique<Hello>(env, *m_sqlConnectionPool, embedded);
+}
+
 WebApplication::~WebApplication() {
 }
 

WebApplication/WebApplication.h

@@ -1,11 +1,13 @@
 #ifndef __WEBAPPLICATION_H__
 #define __WEBAPPLICATION_H__
 
-#include <memory>
 #include "Singleton.h"
+#include <memory>
 
 namespace Wt {
 class WServer;
+class WApplication;
+class WEnvironment;
 
 namespace Dbo {
 class SqlConnectionPool;
@@ -20,6 +22,7 @@ class PasswordService;
 
 class WebApplication {
     friend class Amass::Singleton<WebApplication>;
+
 public:
     ~WebApplication();
 
@@ -29,10 +32,12 @@ public:
 
 protected:
     WebApplication();
+    static std::unique_ptr<Wt::Dbo::SqlConnectionPool> createConnectionPool(const std::string &sqlite3);
+    std::unique_ptr<Wt::WApplication> createApplication(const Wt::WEnvironment &env, bool embedded);
 
 private:
     std::unique_ptr<Wt::WServer> m_server;
-    std::unique_ptr<Wt::Dbo::SqlConnectionPool> m_blogSqlConnectionPool;
+    std::unique_ptr<Wt::Dbo::SqlConnectionPool> m_sqlConnectionPool;
 
     std::unique_ptr<Wt::Auth::AuthService> m_authService;
     std::unique_ptr<Wt::Auth::PasswordService> m_passwordService;

resources/build.sh

@@ -35,11 +35,6 @@ function build() {
     if [ $? -ne 0 ]; then
         exit 1
     fi
-    cp WebApplication/blog.xml ./build/
-    mkdir -p ${build_path}/css; cp WebApplication/blog.css ./build/css/
-    cp WebApplication/rss.png ./build/css/
-    cp WebApplication/blogexample.css ./build/css/
-    cp WebApplication/asciidoc.css ./build/css/
     build/UnitTest/UnitTest
 }