Improve the Session_Logic

.gitignore

@@ -19,3 +19,5 @@ server
 *.in~
 *.tar.gz
 configure~
+libbibledit.a.*
+

access/bible.cpp

@@ -46,8 +46,8 @@ bool read (Webserver_Request& webserver_request, const std::string& bible, std::
   int role_level { 0 };
   if (user.empty ()) {
     // Current user.
-    user = webserver_request.session_logic ()->currentUser ();
-    role_level = webserver_request.session_logic ()->currentLevel ();
+    user = webserver_request.session_logic ()->get_username ();
+    role_level = webserver_request.session_logic ()->get_level ();
   } else {
     // Take level belonging to user.
     role_level = webserver_request.database_users ()->get_level (user);
@@ -91,8 +91,8 @@ bool write (Webserver_Request& webserver_request, const std::string& bible, std:
 
   int level {0};
   if (user.empty ()) {
-    user = webserver_request.session_logic ()->currentUser ();
-    level = webserver_request.session_logic ()->currentLevel ();
+    user = webserver_request.session_logic ()->get_username ();
+    level = webserver_request.session_logic ()->get_level ();
   }
   if (level == 0) {
     // Take level belonging to user.
@@ -140,8 +140,8 @@ bool book_write (Webserver_Request& webserver_request, std::string user, const s
   // Get the user level (role).
   int level {0};
   if (user.empty ()) {
-    user = webserver_request.session_logic ()->currentUser ();
-    level = webserver_request.session_logic ()->currentLevel ();
+    user = webserver_request.session_logic ()->get_username ();
+    level = webserver_request.session_logic ()->get_level ();
   }
   if (level == 0) {
     // Take level belonging to user.

access/logic.cpp

@@ -122,8 +122,8 @@ void user_level (Webserver_Request& webserver_request, std::string& user, int& l
 {
   if (user.empty ()) {
     // If no user is given, take the user from the session.
-    user = webserver_request.session_logic ()->currentUser ();
-    level = webserver_request.session_logic ()->currentLevel ();
+    user = webserver_request.session_logic ()->get_username ();
+    level = webserver_request.session_logic ()->get_level ();
   } else {
     // If a user is given, take the matching level from the database.
     level = webserver_request.database_users ()->get_level (user);

access/user.cpp

@@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 // This function returns users assigned to the logged-in user.
 std::vector <std::string> access_user::assignees (Webserver_Request& webserver_request)
 {
-  const std::string myuser = webserver_request.session_logic ()->currentUser ();
-  const int mylevel = webserver_request.session_logic ()->currentLevel ();
+  const std::string& myuser = webserver_request.session_logic ()->get_username ();
+  const int mylevel = webserver_request.session_logic ()->get_level ();
 
   // This holds the assignees.
   std::vector <std::string> assignees {};

assets/header.cpp

@@ -140,10 +140,10 @@ std::string Assets_Header::run ()
     m_view->enable_zone ("include_jquery_touch");
   }
 
-  if (m_webserver_request.session_logic ()->touchEnabled ()) {
+  if (m_webserver_request.session_logic ()->get_touch_enabled ()) {
     touch_css_on();
   }
-  if (!m_webserver_request.session_logic ()->loggedIn ()) {
+  if (!m_webserver_request.session_logic ()->get_logged_in ()) {
     touch_css_on();
   }
   if (m_touch_css_on) {

bb/manage.cpp

@@ -93,7 +93,7 @@ std::string bible_manage (Webserver_Request& webserver_request)
       database::bibles::create_bible (bible);
       // Check / grant access.
       if (!access_bible::write (webserver_request, bible)) {
-        std::string me = webserver_request.session_logic()->currentUser ();
+        const std::string& me = webserver_request.session_logic ()->get_username ();
         DatabasePrivileges::set_bible (me, bible, true);
       }
       success_message = translate("The Bible was created");
@@ -134,7 +134,7 @@ std::string bible_manage (Webserver_Request& webserver_request)
           success_message = translate("The Bible was copied.");
           // Check / grant access to destination Bible.
           if (!access_bible::write (webserver_request, destination)) {
-            const std::string me = webserver_request.session_logic ()->currentUser ();
+            const std::string& me = webserver_request.session_logic ()->get_username ();
             DatabasePrivileges::set_bible (me, destination, true);
           }
           // Creating a Bible removes any Sample Bible that might have been there.

bb/settings.cpp

@@ -99,7 +99,7 @@ std::string bible_settings (Webserver_Request& webserver_request)
 
 
   // Whether the user has the privilege to change the stylesheet.
-  const std::string current_user = webserver_request.session_logic()->currentUser ();
+  const std::string& current_user = webserver_request.session_logic ()->get_username ();
   bool privilege_stylesheet = access_logic::privilege_set_stylesheets (webserver_request, current_user);
   if (privilege_stylesheet) view.enable_zone ("privilege_stylesheet");
 
@@ -196,7 +196,7 @@ std::string bible_settings (Webserver_Request& webserver_request)
   }
 
 
-  const int level = webserver_request.session_logic ()->currentLevel ();
+  const int level = webserver_request.session_logic ()->get_level ();
   const bool manager_level = (level >= Filter_Roles::manager ());
   if (manager_level) view.enable_zone ("manager");
 

changes/change.cpp

@@ -80,7 +80,7 @@ std::string changes_change (Webserver_Request& webserver_request)
   if (webserver_request.post.count ("unassign")) {
     std::string unassign = webserver_request.post["unassign"];
     unassign.erase (0, 8);
-    notes_logic.unassignUser (filter::strings::convert_to_int (unassign), webserver_request.session_logic()->currentUser ());
+    notes_logic.unassignUser (filter::strings::convert_to_int (unassign), webserver_request.session_logic ()->get_username ());
     return std::string();
   }
 
@@ -97,8 +97,8 @@ std::string changes_change (Webserver_Request& webserver_request)
 
   // From here on the script will produce output.
   Assets_View view {};
-  const std::string username {webserver_request.session_logic()->currentUser ()};
-  const int level {webserver_request.session_logic ()->currentLevel ()};
+  const std::string& username {webserver_request.session_logic ()->get_username ()};
+  const int level {webserver_request.session_logic ()->get_level ()};
 
 
   // The identifier of the change notification.

changes/changes.cpp

@@ -129,8 +129,8 @@ std::string changes_changes (Webserver_Request& webserver_request)
   }
 
 
-  const std::string username = webserver_request.session_logic()->currentUser ();
-  const bool touch = webserver_request.session_logic ()->touchEnabled ();
+  const std::string& username = webserver_request.session_logic ()->get_username ();
+  const bool touch = webserver_request.session_logic ()->get_touch_enabled ();
 
 
   std::string page {};

client/index.cpp

@@ -69,7 +69,7 @@ void client_index_enable_client (Webserver_Request& webserver_request, const std
 
   // Update the username and the level in the current session.
   webserver_request.session_logic ()->set_username (username);
-  webserver_request.session_logic ()->currentLevel (true);
+  webserver_request.session_logic ()->get_level (true);
 
   // If there's pending Bible updates, send them off to the user.
   bible_logic::client_mail_pending_bible_updates (username);

config/logic.cpp

@@ -232,7 +232,7 @@ void swipe_enabled (Webserver_Request& webserver_request, std::string& script)
 {
   bool swipe_operations {false};
   std::string true_false {"false"};
-  if (webserver_request.session_logic ()->touchEnabled ()) {
+  if (webserver_request.session_logic ()->get_touch_enabled ()) {
     if (webserver_request.database_config_user ()->getSwipeActionsAvailable ()) {
       true_false = "true";
       swipe_operations = true;

database/config/user.cpp

@@ -69,7 +69,7 @@ std::string Database_Config_User::mapkey (const std::string& user, const char *
 
 std::string Database_Config_User::getValue (const char * key, const char * default_value) const
 {
-  const std::string user = m_webserver_request.session_logic ()->currentUser ();
+  const std::string& user = m_webserver_request.session_logic ()->get_username ();
   return getValueForUser (user, key, default_value);
 }
 
@@ -125,7 +125,7 @@ int Database_Config_User::getIValueForUser (const std::string& user, const char
 
 void Database_Config_User::setValue (const char * key, const std::string& value) const
 {
-  const std::string user = m_webserver_request.session_logic ()->currentUser ();
+  const std::string& user = m_webserver_request.session_logic ()->get_username ();
   setValueForUser (user, key, value);
 }
 
@@ -163,7 +163,7 @@ void Database_Config_User::setBValueForUser (const std::string& user, const char
 
 std::vector <std::string> Database_Config_User::getList (const char * key) const
 {
-  const std::string user = m_webserver_request.session_logic ()->currentUser ();
+  const std::string& user = m_webserver_request.session_logic ()->get_username ();
   return getListForUser (user, key);
 }
 
@@ -192,7 +192,7 @@ std::vector <std::string> Database_Config_User::getListForUser (const std::strin
 
 void Database_Config_User::setList (const char * key, const std::vector <std::string>& values) const
 {
-  const std::string user = m_webserver_request.session_logic ()->currentUser ();
+  const std::string& user = m_webserver_request.session_logic ()->get_username ();
   setListForUser (user, key, values);
 }
 
@@ -567,7 +567,7 @@ bool Database_Config_User::default_bible_checks_notification () const
 #ifdef HAVE_CLIENT
   return false;
 #else
-  const int level = m_webserver_request.session_logic ()->currentLevel ();
+  const int level = m_webserver_request.session_logic ()->get_level ();
   return (level >= Filter_Roles::translator () && level <= Filter_Roles::manager ());
 #endif
 }
@@ -1194,7 +1194,7 @@ bool Database_Config_User::getBasicInterfaceModeDefault () const
   return true;
 #endif
   // The app running on a workspace or laptop have default to basic mode for a lower role.
-  const int level = m_webserver_request.session_logic ()->currentLevel ();
+  const int level = m_webserver_request.session_logic ()->get_level ();
   if (level <= Filter_Roles::manager ())
     return true;
   // Higher role: default to advanced mode.

database/ipc.cpp

@@ -142,7 +142,7 @@ void Database_Ipc::deleteMessage (int id)
 
 std::string Database_Ipc::getFocus ()
 {
-  std::string user = m_webserver_request.session_logic ()->currentUser ();
+  const std::string& user = m_webserver_request.session_logic ()->get_username ();
 
   int highestId = 0;
   std::string hitMessage = "";
@@ -169,7 +169,7 @@ std::string Database_Ipc::getFocus ()
 
 Database_Ipc_Message Database_Ipc::getNote ()
 {
-  std::string user = m_webserver_request.session_logic ()->currentUser ();
+  const std::string& user = m_webserver_request.session_logic ()->get_username ();
 
   int highestId = 0;
   std::string hitMessage = "";
@@ -200,7 +200,7 @@ Database_Ipc_Message Database_Ipc::getNote ()
 
 bool Database_Ipc::getNotesAlive ()
 {
-  std::string user = m_webserver_request.session_logic ()->currentUser ();
+  const std::string& user = m_webserver_request.session_logic ()->get_username ();
 
   int highestId = 0;
   std::string hitMessage = "";

database/mail.cpp

@@ -113,7 +113,7 @@ void Database_Mail::send (std::string to, std::string subject, std::string body,
 // Get number of mails for the current user.
 int Database_Mail::getMailCount ()
 {
-  std::string user = m_webserver_request.session_logic ()->currentUser();
+  const std::string& user = m_webserver_request.session_logic ()->get_username();
   SqliteSQL sql = SqliteSQL ();
   sql.add ("SELECT count(*) FROM mail WHERE username =");
   sql.add (user);
@@ -132,7 +132,7 @@ int Database_Mail::getMailCount ()
 std::vector <Database_Mail_User> Database_Mail::getMails ()
 {
   std::vector <Database_Mail_User> mails;
-  std::string user = m_webserver_request.session_logic ()->currentUser();
+  const std::string& user = m_webserver_request.session_logic ()->get_username();
   SqliteSQL sql = SqliteSQL ();
   sql.add ("SELECT rowid, timestamp, subject FROM mail WHERE username =");
   sql.add (user);

database/notes.cpp

@@ -506,7 +506,7 @@ std::string Database_Notes::assemble_contents (int identifier, std::string conte
 {
   std::string new_contents = get_contents (identifier);
   std::string datetime = filter::date::localized_date_format (m_webserver_request);
-  std::string user = m_webserver_request.session_logic ()->currentUser ();
+  const std::string& user = m_webserver_request.session_logic ()->get_username ();
   // To make the notes more readable, add whitespace between the comments.
   bool is_initial_comment = new_contents.empty ();
   if (!is_initial_comment) {
@@ -621,7 +621,7 @@ int Database_Notes::store_new_note (const std::string& bible, int book, int chap
 // limit: If >= 0, it indicates the starting limit for the selection.
 std::vector <int> Database_Notes::select_notes (std::vector <std::string> bibles, int book, int chapter, int verse, int passage_selector, int edit_selector, int non_edit_selector, const std::string& status_selector, std::string bible_selector, std::string assignment_selector, bool subscription_selector, int severity_selector, int text_selector, const std::string& search_text, int limit)
 {
-  std::string username = m_webserver_request.session_logic ()->currentUser ();
+  const std::string& username = m_webserver_request.session_logic ()->get_username ();
   std::vector <int> identifiers;
   // SQL SELECT statement.
   std::string query = notes_select_identifier ();
@@ -902,7 +902,7 @@ void Database_Notes::add_comment (int identifier, const std::string& comment)
 // Subscribe the current user to the note identified by identifier.
 void Database_Notes::subscribe (int identifier)
 {
-  std::string user = m_webserver_request.session_logic ()->currentUser ();
+  const std::string& user = m_webserver_request.session_logic ()->get_username ();
   subscribe_user (identifier, user);
 }
 
@@ -984,7 +984,7 @@ bool Database_Notes::is_subscribed (int identifier, const std::string& user)
 // Unsubscribes the currently logged in user from the note identified by identifier.
 void Database_Notes::unsubscribe (int identifier)
 {
-  std::string user = m_webserver_request.session_logic ()->currentUser ();
+  const std::string& user = m_webserver_request.session_logic ()->get_username ();
   unsubscribe_user (identifier, user);
 }
 

developer/logic.cpp

@@ -68,7 +68,7 @@ Developer_Logic_Tracer::Developer_Logic_Tracer(Webserver_Request& webserver_requ
     request_query.append("=");
     request_query.append(element.second);
   }
-  username = webserver_request.session_logic()->currentUser();
+  username = webserver_request.session_logic ()->get_username();
 }
 
 

edit/index.cpp

@@ -59,7 +59,7 @@ bool edit_index_acl (Webserver_Request& webserver_request)
 
 std::string edit_index (Webserver_Request& webserver_request)
 {
-  const bool touch = webserver_request.session_logic ()->touchEnabled ();
+  const bool touch = webserver_request.session_logic ()->get_touch_enabled ();
 
 
   if (webserver_request.query.count ("switchbook") && webserver_request.query.count ("switchchapter")) {

edit/load.cpp

@@ -75,7 +75,7 @@ std::string edit_load (Webserver_Request& webserver_request)
     html = filter::strings::replace (search, replace, html);
   }
 
-  const std::string user = webserver_request.session_logic ()->currentUser ();
+  const std::string& user = webserver_request.session_logic ()->get_username ();
   const bool write = access_bible::book_write (webserver_request, user, bible, book);
 
   return checksum_logic::send (html, write);

edit/preview.cpp

@@ -55,7 +55,7 @@ bool edit_preview_acl (Webserver_Request& webserver_request)
 
 std::string edit_preview (Webserver_Request& webserver_request)
 {
-  bool touch = webserver_request.session_logic ()->touchEnabled ();
+  bool touch = webserver_request.session_logic ()->get_touch_enabled ();
   bool timeout = webserver_request.query.count ("timeout");
   std::string caller = webserver_request.query ["caller"];
 

edit/save.cpp

@@ -119,7 +119,7 @@ std::string edit_save (Webserver_Request& webserver_request)
 
   // Collect some data about the changes for this user
   // and for a possible merge of the user's data with the server's data.
-  std::string username = webserver_request.session_logic()->currentUser ();
+  const std::string& username = webserver_request.session_logic ()->get_username ();
   [[maybe_unused]] int oldID = database::bibles::get_chapter_id (bible, book, chapter);
   std::string server_usfm = database::bibles::get_chapter (bible, book, chapter);
   std::string newText = user_usfm;

edit/update.cpp

@@ -151,7 +151,7 @@ std::string edit_update (Webserver_Request& webserver_request)
 
 
   // Collect some data about the changes for this user.
-  std::string username = webserver_request.session_logic()->currentUser ();
+  const std::string& username = webserver_request.session_logic ()->get_username ();
 #ifdef HAVE_CLOUD
   int oldID = 0;
   if (good2go) {

editone2/index.cpp

@@ -62,7 +62,7 @@ bool editone2_index_acl (Webserver_Request& webserver_request)
 
 std::string editone2_index (Webserver_Request& webserver_request)
 {
-  const bool touch = webserver_request.session_logic ()->touchEnabled ();
+  const bool touch = webserver_request.session_logic ()->get_touch_enabled ();
 
   if (webserver_request.query.count ("switchbook") && webserver_request.query.count ("switchchapter")) {
     const int switchbook = filter::strings::convert_to_int (webserver_request.query ["switchbook"]);

editone2/load.cpp

@@ -114,7 +114,7 @@ std::string editone2_load (Webserver_Request& webserver_request)
   data.append ("#_be_#");
   data.append (suffix_html);
 
-  std::string user = webserver_request.session_logic ()->currentUser ();
+  const std::string& user = webserver_request.session_logic ()->get_username ();
   bool write = access_bible::book_write (webserver_request, user, bible, book);
   data = checksum_logic::send (data, write);
 

editone2/save.cpp

@@ -110,7 +110,7 @@ std::string editone2_save (Webserver_Request& webserver_request)
 
 
   // Collect some data about the changes for this user.
-  std::string username = webserver_request.session_logic()->currentUser ();
+  const std::string& username = webserver_request.session_logic ()->get_username ();
 #ifdef HAVE_CLOUD
   int oldID = database::bibles::get_chapter_id (bible, book, chapter);
 #endif

editone2/update.cpp

@@ -152,7 +152,7 @@ std::string editone2_update (Webserver_Request& webserver_request)
 
 
   // Collect some data about the changes for this user.
-  std::string username = webserver_request.session_logic()->currentUser ();
+  const std::string& username = webserver_request.session_logic ()->get_username ();
 #ifdef HAVE_CLOUD
   int oldID = 0;
   if (good2go) oldID = database::bibles::get_chapter_id (bible, book, chapter);

editusfm/index.cpp

@@ -56,7 +56,7 @@ bool editusfm_index_acl (Webserver_Request& webserver_request)
 
 std::string editusfm_index (Webserver_Request& webserver_request)
 {
-  const bool touch = webserver_request.session_logic ()->touchEnabled ();
+  const bool touch = webserver_request.session_logic ()->get_touch_enabled ();
 
 
   if (webserver_request.query.count ("switchbook") && webserver_request.query.count ("switchchapter")) {