From 609eae061f2cef097a7729da366d93020cbc7af3 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Mon, 19 Sep 2016 01:02:47 +0200
Subject: [PATCH] refs #752, added username for DB user

---
 src/blackmisc/network/authenticateduser.cpp | 14 +++++++++++++-
 src/blackmisc/network/authenticateduser.h   | 13 +++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/blackmisc/network/authenticateduser.cpp b/src/blackmisc/network/authenticateduser.cpp
index ab6859f5e..0f2e4a0f9 100644
--- a/src/blackmisc/network/authenticateduser.cpp
+++ b/src/blackmisc/network/authenticateduser.cpp
@@ -65,6 +65,7 @@ namespace BlackMisc
             user.setDbKey(json.value("id").toInt(-1));
             user.setVatsimId(json.value("vatsimId").toInt(-1));
             user.setRealName(json.value("name").toString());
+            user.setUsername(json.value("username").toString());
             user.setEmail(json.value("email").toString(""));
             user.setCountry(CCountry(json.value("country").toString(), json.value("countryname").toString()));
             user.setEnabled(json.value("enabled").toBool());
@@ -76,10 +77,16 @@ namespace BlackMisc
 
         void CAuthenticatedUser::setRealName(const QString &realname)
         {
-            QString rn(realname.trimmed().simplified());
+            const QString rn(realname.trimmed().simplified());
             this->m_realname = rn;
         }
 
+        void CAuthenticatedUser::setUsername(const QString &username)
+        {
+            const QString un(username.trimmed().simplified().toUpper());
+            this->m_username = un;
+        }
+
         CStatusMessageList CAuthenticatedUser::validate() const
         {
             static const CLogCategoryList cats(CLogCategoryList(this).join({ CLogCategory::validation()}));
@@ -126,6 +133,8 @@ namespace BlackMisc
                 return CVariant::fromValue(this->m_password);
             case IndexRealName:
                 return CVariant::fromValue(this->m_realname);
+            case IndexUsername:
+                return CVariant::fromValue(this->m_username);
             default:
                 return CValueObject::propertyByIndex(index);
             }
@@ -150,6 +159,9 @@ namespace BlackMisc
             case IndexRealName:
                 this->setRealName(variant.value<QString>());
                 break;
+            case IndexUsername:
+                this->setUsername(variant.value<QString>());
+                break;
             default:
                 CValueObject::setPropertyByIndex(index, variant);
                 break;
diff --git a/src/blackmisc/network/authenticateduser.h b/src/blackmisc/network/authenticateduser.h
index c33c89425..83a5b2d5f 100644
--- a/src/blackmisc/network/authenticateduser.h
+++ b/src/blackmisc/network/authenticateduser.h
@@ -46,7 +46,8 @@ namespace BlackMisc
                 IndexEmail = BlackMisc::CPropertyIndex::GlobalIndexCAuthenticatedUser,
                 IndexVatsimId,
                 IndexPassword,
-                IndexRealName
+                IndexRealName,
+                IndexUsername
             };
 
             //! Default constructor.
@@ -64,9 +65,15 @@ namespace BlackMisc
             //! Full name + id
             QString getRealNameAndId() const;
 
-            //! setRealName
+            //! Set real name
             void setRealName(const QString &realname);
 
+            //! Username
+            const QString &getUsername() const { return m_username; }
+
+            //! Set username
+            void setUsername(const QString &username);
+
             //! Get password
             const QString &getPassword() const { return m_password; }
 
@@ -160,6 +167,7 @@ namespace BlackMisc
         private:
             int                 m_vatsimId;
             QString             m_realname;
+            QString             m_username;
             QString             m_email;
             QString             m_password;
             BlackMisc::CCountry m_country;
@@ -172,6 +180,7 @@ namespace BlackMisc
                 BLACK_METAMEMBER(dbKey),
                 BLACK_METAMEMBER(vatsimId),
                 BLACK_METAMEMBER(realname),
+                BLACK_METAMEMBER(username),
                 BLACK_METAMEMBER(email),
                 BLACK_METAMEMBER(password),
                 BLACK_METAMEMBER(country),