Added ability to change password

Librum-Reader · Aug 20, 2023 · 07091a4 · 07091a4
1 parent 687844c
commit 07091a4
Show file tree

Hide file tree

Showing 17 changed files with 155 additions and 36 deletions.
diff --git a/src/adapters/controllers/user_controller.cpp b/src/adapters/controllers/user_controller.cpp
@@ -21,6 +21,9 @@ UserController::UserController(application::IUserService* userService) :
     connect(m_userService, &application::IUserService::profilePictureChanged,
             this, &UserController::profilePictureChanged);
 
+    connect(m_userService, &application::IUserService::passwordChangeFinished,
+            this, &UserController::passwordChangeFinished);
+
 
     // Tag insertion
     connect(m_userService, &application::IUserService::tagInsertionStarted,
@@ -56,6 +59,11 @@ void UserController::syncWithServer()
     m_userService->downloadUser();
 }
 
+void UserController::changePassword(const QString& newPassword)
+{
+    m_userService->changePassword(newPassword);
+}
+
 QString UserController::getTagUuidForName(QString name)
 {
     // Tags are always capitalized, make sure to search for the correct one

diff --git a/src/adapters/controllers/user_controller.hpp b/src/adapters/controllers/user_controller.hpp
@@ -18,6 +18,7 @@ class ADAPTERS_LIBRARY UserController : public IUserController
     void loadUser(bool rememberUser) override;
     void deleteUser() override;
     void syncWithServer() override;
+    void changePassword(const QString& newPassword) override;
 
     QString getTagUuidForName(QString name) override;
     QString addTag(const QString& name) override;

diff --git a/src/adapters/gateways/user_storage_gateway.cpp b/src/adapters/gateways/user_storage_gateway.cpp
@@ -19,6 +19,9 @@ UserStorageGateway::UserStorageGateway(IUserStorageAccess* userStorageAccess) :
 
     connect(m_userStorageAccess, &IUserStorageAccess::profilePictureReady, this,
             &UserStorageGateway::profilePictureReady);
+
+    connect(m_userStorageAccess, &IUserStorageAccess::passwordChangeFinished,
+            this, &UserStorageGateway::passwordChangeFinished);
 }
 
 void UserStorageGateway::getUser(const QString& authToken)
@@ -54,6 +57,12 @@ void UserStorageGateway::changeEmail(const QString& authToken,
     m_userStorageAccess->changeEmail(authToken, newEmail);
 }
 
+void UserStorageGateway::changePassword(const QString& authToken,
+                                        const QString& newPassword)
+{
+    m_userStorageAccess->changePassword(authToken, newPassword);
+}
+
 void UserStorageGateway::changeProfilePicture(const QString& authToken,
                                               const QString& path)
 {

diff --git a/src/adapters/gateways/user_storage_gateway.hpp b/src/adapters/gateways/user_storage_gateway.hpp
@@ -24,6 +24,8 @@ class ADAPTERS_LIBRARY UserStorageGateway
                         const QString& newLastName) override;
     void changeEmail(const QString& authToken,
                      const QString& newEmail) override;
+    void changePassword(const QString& authToken,
+                        const QString& newPassword) override;
     void changeProfilePicture(const QString& authToken,
                               const QString& path) override;
     void deleteProfilePicture(const QString& authToken) override;

diff --git a/src/adapters/interfaces/controllers/i_user_controller.hpp b/src/adapters/interfaces/controllers/i_user_controller.hpp
@@ -35,6 +35,7 @@ class IUserController : public QObject
     Q_INVOKABLE virtual void deleteUser() = 0;
     Q_INVOKABLE virtual void syncWithServer() = 0;
     Q_INVOKABLE virtual void deleteProfilePicture() = 0;
+    Q_INVOKABLE virtual void changePassword(const QString& newPassword) = 0;
 
     Q_INVOKABLE virtual QString getTagUuidForName(QString name) = 0;
     Q_INVOKABLE virtual QString addTag(const QString& name) = 0;
@@ -67,6 +68,7 @@ class IUserController : public QObject
     void usedBookStorageChanged();
     void bookStorageLimitChanged();
     void profilePictureChanged();
+    void passwordChangeFinished(bool success, const QString& reason);
 };
 
 }  // namespace adapters
diff --git a/src/adapters/interfaces/persistance/i_user_storage_access.hpp b/src/adapters/interfaces/persistance/i_user_storage_access.hpp
@@ -28,6 +28,8 @@ class ADAPTERS_LIBRARY IUserStorageAccess : public QObject
                                 const QString& newLastName) = 0;
     virtual void changeEmail(const QString& authToken,
                              const QString& newEmail) = 0;
+    virtual void changePassword(const QString& authToken,
+                                const QString& newPassword) = 0;
     virtual void changeProfilePicture(const QString& authToken,
                                       const QString& path) = 0;
     virtual void deleteProfilePicture(const QString& authToken) = 0;
@@ -43,6 +45,7 @@ class ADAPTERS_LIBRARY IUserStorageAccess : public QObject
     void userReady(const QByteArray& data);
     void gettingUserFailed();
     void profilePictureReady(QByteArray& data);
+    void passwordChangeFinished(bool success, const QString& reason);
 };
 
 }  // namespace adapters
diff --git a/src/application/interfaces/gateways/i_user_storage_gateway.hpp b/src/application/interfaces/gateways/i_user_storage_gateway.hpp
@@ -29,6 +29,8 @@ class APPLICATION_LIBRARY IUserStorageGateway : public QObject
                                 const QString& newLastName) = 0;
     virtual void changeEmail(const QString& authToken,
                              const QString& newEmail) = 0;
+    virtual void changePassword(const QString& authToken,
+                                const QString& newPassword) = 0;
     virtual void changeProfilePicture(const QString& authToken,
                                       const QString& path) = 0;
     virtual void deleteProfilePicture(const QString& authToken) = 0;
@@ -43,6 +45,7 @@ class APPLICATION_LIBRARY IUserStorageGateway : public QObject
 signals:
     void finishedGettingUser(const domain::entities::User& user, bool success);
     void profilePictureReady(QByteArray& data);
+    void passwordChangeFinished(bool success, const QString& reason);
 };
 
 }  // namespace application
diff --git a/src/application/interfaces/services/i_user_service.hpp b/src/application/interfaces/services/i_user_service.hpp
@@ -41,6 +41,7 @@ class APPLICATION_LIBRARY IUserService : public QObject
     virtual void setProfilePicturePath(const QString& path) = 0;
 
     virtual void deleteProfilePicture() = 0;
+    virtual void changePassword(const QString& newPassword) = 0;
 
     virtual const std::vector<domain::entities::Tag>& getTags() const = 0;
     virtual QUuid addTag(const domain::entities::Tag& tag) = 0;
@@ -56,6 +57,7 @@ class APPLICATION_LIBRARY IUserService : public QObject
     void tagDeletionEnded();
     void tagsChanged(int index);
     void bookStorageDataUpdated(long usedStorage, long bookStorageLimit);
+    void passwordChangeFinished(bool success, const QString& reason);
 
 public slots:
     virtual void setupUserData(const QString& token, const QString& email) = 0;

diff --git a/src/application/services/user_service.cpp b/src/application/services/user_service.cpp
@@ -29,6 +29,10 @@ UserService::UserService(IUserStorageGateway* userStorageGateway) :
                 updateProfilePictureUI(path);
             });
 
+    connect(m_userStorageGateway, &IUserStorageGateway::passwordChangeFinished,
+            this, &UserService::passwordChangeFinished);
+
+
     // Tag insertion
     connect(&m_user, &User::tagInsertionStarted, this,
             &UserService::tagInsertionStarted);
@@ -164,6 +168,11 @@ void UserService::deleteProfilePicture()
     m_userStorageGateway->changeHasProfilePicture(m_authenticationToken, false);
 }
 
+void UserService::changePassword(const QString& newPassword)
+{
+    m_userStorageGateway->changePassword(m_authenticationToken, newPassword);
+}
+
 QString UserService::saveProfilePictureToFile(QByteArray& data)
 {
     auto userDir = getUserProfileDir();

diff --git a/src/application/services/user_service.hpp b/src/application/services/user_service.hpp
@@ -39,6 +39,7 @@ class APPLICATION_LIBRARY UserService : public IUserService
     void setProfilePicturePath(const QString& path) override;
 
     void deleteProfilePicture() override;
+    void changePassword(const QString& newPassword) override;
 
     const std::vector<domain::entities::Tag>& getTags() const override;
     QUuid addTag(const domain::entities::Tag& tag) override;

diff --git a/src/infrastructure/data/endpoints.hpp b/src/infrastructure/data/endpoints.hpp
@@ -30,6 +30,7 @@ inline const QString getUsedBookStorageEndpoint { domain +
 inline const QString userGetEndpoint { domain + "/api/user" };
 inline const QString userPatchEndpoint { domain + "/api/user" };
 inline const QString userDeleteEndpoint { domain + "/api/user" };
+inline const QString userChangePasswordEndpoint { domain + "/api/user" };
 inline const QString userProfilePictureEndpoint { domain +
                                                   "/api/user/profilePicture" };
 

diff --git a/src/infrastructure/persistance/user_storage_access.cpp b/src/infrastructure/persistance/user_storage_access.cpp
@@ -7,6 +7,8 @@
 #include <QVariant>
 #include "api_error_helper.hpp"
 #include "endpoints.hpp"
+#include "qjsondocument.h"
+#include "qjsonobject.h"
 
 namespace infrastructure::persistence
 {
@@ -141,6 +143,38 @@ void UserStorageAccess::changeEmail(const QString& authToken,
     // TODO: Implement
 }
 
+void UserStorageAccess::changePassword(const QString& authToken,
+                                       const QString& newPassword)
+{
+    auto request = createRequest(data::userChangePasswordEndpoint, authToken);
+    QJsonObject jsonObject;
+    jsonObject["Input"] = newPassword;
+    auto data = QJsonDocument(jsonObject).toJson();
+
+    auto reply = m_networkAccessManager.post(request, data);
+
+
+    // Make sure to release the reply's memory
+    connect(reply, &QNetworkReply::finished, this,
+            [this, reply]()
+            {
+                if(api_error_helper::apiRequestFailed(reply, 200))
+                {
+                    auto jsonReply =
+                        QJsonDocument::fromJson(reply->readAll()).object();
+                    auto message = jsonReply["message"].toString();
+                    qWarning() << "Changing password failed: " << message;
+
+                    emit passwordChangeFinished(false, message);
+                    reply->deleteLater();
+                    return;
+                }
+
+                emit passwordChangeFinished(true, "");
+                reply->deleteLater();
+            });
+}
+
 void UserStorageAccess::changeProfilePicture(const QString& authToken,
                                              const QString& path)
 {

diff --git a/src/infrastructure/persistance/user_storage_access.hpp b/src/infrastructure/persistance/user_storage_access.hpp
@@ -28,6 +28,8 @@ class UserStorageAccess : public adapters::IUserStorageAccess
                         const QString& newLastName) override;
     void changeEmail(const QString& authToken,
                      const QString& newEmail) override;
+    void changePassword(const QString& authToken,
+                        const QString& newPassword) override;
     void changeProfilePicture(const QString& authToken,
                               const QString& path) override;
     void deleteProfilePicture(const QString& authToken) override;

diff --git a/src/presentation/settings/accountPage/MAccountPage.qml b/src/presentation/settings/accountPage/MAccountPage.qml
@@ -16,6 +16,25 @@ MFlickWrapper {
         width: 10
         policy: "AlwaysOn"
     }
+
+    Connections
+    {
+        target: UserController
+
+        function onPasswordChangeFinished(success, reason)
+        {
+            if(success)
+            {
+                passwordInput.text = ""
+                passwordConfirmationInput.text = ""
+            }
+            else
+            {
+                passwordInput.errorText = reason;
+                passwordInput.setError();
+            }
+        }
+    }
 
     Page {
         id: page
@@ -236,7 +255,14 @@ MFlickWrapper {
                             image: Icons.eyeOn
                             toggledImage: Icons.eyeOff
 
-                            onEdited: internal.unsavedChanges = true
+                            onEdited:
+                            {
+                                internal.unsavedChanges = true
+
+                                // Clear error for password confirmation input as well
+                                passwordConfirmationInput.errorText = "";
+                                passwordConfirmationInput.clearError();
+                            }
                         }
 
                         MLabeledInputBox {
@@ -251,7 +277,13 @@ MFlickWrapper {
                             image: Icons.eyeOn
                             toggledImage: Icons.eyeOff
 
-                            onEdited: internal.unsavedChanges = true
+                            onEdited: {
+                                internal.unsavedChanges = true
+
+                                // Clear error for password input as well
+                                passwordInput.errorText = "";
+                                passwordInput.clearError();
+                            }
                         }
                     }
                 }
@@ -447,11 +479,30 @@ MFlickWrapper {
         id: internal
         property bool unsavedChanges: false
         property int boxPadding: 40
+
+        function changePassword()
+        {
+            if(passwordInput.text === passwordConfirmationInput.text)
+            {
+                UserController.changePassword(passwordInput.text)
+            }
+            else
+            {
+                passwordInput.errorText = "Passwords don't match!";
+                passwordInput.setError();
+
+                passwordConfirmationInput.errorText = "Passwords don't match!";
+                passwordConfirmationInput.setError();
+            }
+        }
     }
 
     function saveAccountSettings() {
         UserController.firstName = firstNameInput.text
         UserController.lastName = lastNameInput.text
+
+        if(passwordInput.text !== "")
+            internal.changePassword();
 
         if (profilePictureArea.currentImage == "!")
             UserController.deleteProfilePicture()
@@ -461,4 +512,4 @@ MFlickWrapper {
         profilePictureArea.currentImage = ""
         internal.unsavedChanges = false
     }
-}
+}
diff --git a/tests/adapters_unit_tests/controllers/user_controller_tests.cpp b/tests/adapters_unit_tests/controllers/user_controller_tests.cpp
@@ -28,6 +28,7 @@ class UserServiceMock : public application::IUserService
     MOCK_METHOD(void, setLastName, (const QString&), (override));
     MOCK_METHOD(QString, getEmail, (), (const, override));
     MOCK_METHOD(void, setEmail, (const QString&), (override));
+    MOCK_METHOD(void, changePassword, (const QString&), (override));
     MOCK_METHOD(long, getUsedBookStorage, (), (const, override));
     MOCK_METHOD(long, getBookStorageLimit, (), (const, override));
     MOCK_METHOD(QString, getProfilePicturePath, (), (const, override));

diff --git a/tests/adapters_unit_tests/gateways/user_storage_gateway_tests.cpp b/tests/adapters_unit_tests/gateways/user_storage_gateway_tests.cpp
@@ -15,28 +15,23 @@ namespace tests::adapters
 class UserStorageAccessMock : public IUserStorageAccess
 {
 public:
-    MOCK_METHOD(void, getUser, (const QString& authToken), (override));
-    MOCK_METHOD(void, deleteUser, (const QString& authToken), (override));
-    MOCK_METHOD(void, getProfilePicture, (const QString& authToken),
+    MOCK_METHOD(void, getUser, (const QString&), (override));
+    MOCK_METHOD(void, deleteUser, (const QString&), (override));
+    MOCK_METHOD(void, getProfilePicture, (const QString&), (override));
+    MOCK_METHOD(void, changeFirstName, (const QString&, const QString&),
                 (override));
-    MOCK_METHOD(void, changeFirstName,
-                (const QString& authToken, const QString& newFirstName),
+    MOCK_METHOD(void, changeLastName, (const QString&, const QString&),
                 (override));
-    MOCK_METHOD(void, changeLastName,
-                (const QString& authToken, const QString& newFirstName),
+    MOCK_METHOD(void, changeEmail, (const QString&, const QString&),
                 (override));
-    MOCK_METHOD(void, changeEmail,
-                (const QString& authToken, const QString& newFirstName),
+    MOCK_METHOD(void, changePassword, (const QString&, const QString&),
                 (override));
-    MOCK_METHOD(void, changeProfilePicture,
-                (const QString& authToken, const QString& path), (override));
-    MOCK_METHOD(void, deleteProfilePicture, (const QString& authToken),
+    MOCK_METHOD(void, changeProfilePicture, (const QString&, const QString&),
                 (override));
+    MOCK_METHOD(void, deleteProfilePicture, (const QString&), (override));
     MOCK_METHOD(void, changeProfilePictureLastUpdated,
-                (const QString& authToken, const QString& newDateTime),
-                (override));
-    MOCK_METHOD(void, changeHasProfilePicture,
-                (const QString& authToken, const QString& newValue),
+                (const QString&, const QString&), (override));
+    MOCK_METHOD(void, changeHasProfilePicture, (const QString&, const QString&),
                 (override));
     MOCK_METHOD(void, deleteTag, (const QString&, const QString&), (override));
     MOCK_METHOD(void, renameTag, (const QString&, const QJsonObject&),