Skip to content

Commit c460ed4

Browse files
Renamed 'rememberMe' with 'rememberUser'
1 parent 63f0a17 commit c460ed4

13 files changed

Lines changed: 30 additions & 30 deletions

src/adapters/controllers/authentication_controller.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ AuthenticationController::AuthenticationController(
2424

2525
void AuthenticationController::loginUser(const QString& email,
2626
const QString& password,
27-
bool rememberMe)
27+
bool rememberUser)
2828
{
29-
LoginModel loginModel(email, password, rememberMe);
29+
LoginModel loginModel(email, password, rememberUser);
3030

3131
m_authenticationService->loginUser(loginModel);
3232
}

src/adapters/controllers/authentication_controller.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class AuthenticationController : public IAuthenticationController
1515
application::IAuthenticationService* authenticationService);
1616

1717
void loginUser(const QString& email, const QString& password,
18-
bool rememberMe) override;
18+
bool rememberUser) override;
1919
void tryAutomaticLogin() override;
2020
void logoutUser() override;
2121
void registerUser(const QString& firstName, const QString& lastName,

src/adapters/controllers/user_controller.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ UserController::UserController(application::IUserService* userService) :
3636
&m_userTagsModel, &data_models::UserTagsModel::refreshRows);
3737
}
3838

39-
void UserController::loadUser(bool rememberMe)
39+
void UserController::loadUser(bool rememberUser)
4040
{
41-
m_userService->loadUser(rememberMe);
41+
m_userService->loadUser(rememberUser);
4242
}
4343

4444
QString UserController::getTagUuidForName(QString name)

src/adapters/controllers/user_controller.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class UserController : public IUserController
1414
public:
1515
UserController(application::IUserService* userService);
1616

17-
void loadUser(bool rememberMe) override;
17+
void loadUser(bool rememberUser) override;
1818

1919
QString getTagUuidForName(QString name) override;
2020
QString addTag(const QString& name) override;

src/adapters/interfaces/controllers/i_authentication_controller.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class IAuthenticationController : public QObject
2020

2121
Q_INVOKABLE virtual void loginUser(const QString& email,
2222
const QString& password,
23-
bool rememberMe) = 0;
23+
bool rememberUser) = 0;
2424
Q_INVOKABLE virtual void tryAutomaticLogin() = 0;
2525
Q_INVOKABLE virtual void logoutUser() = 0;
2626
Q_INVOKABLE virtual void registerUser(const QString& firstName,

src/adapters/interfaces/controllers/i_user_controller.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class IUserController : public QObject
2727
public:
2828
virtual ~IUserController() noexcept = default;
2929

30-
Q_INVOKABLE virtual void loadUser(bool rememberMe) = 0;
30+
Q_INVOKABLE virtual void loadUser(bool rememberUser) = 0;
3131

3232
Q_INVOKABLE virtual QString getTagUuidForName(QString name) = 0;
3333
Q_INVOKABLE virtual QString addTag(const QString& name) = 0;

src/application/interfaces/services/i_user_service.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class IUserService : public QObject
1919
public:
2020
virtual ~IUserService() noexcept = default;
2121

22-
virtual void loadUser(bool rememberMe) = 0;
22+
virtual void loadUser(bool rememberUser) = 0;
2323

2424
virtual QString getFirstName() const = 0;
2525
virtual void setFirstName(const QString& newFirstName) = 0;

src/application/services/authentication_service.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ void AuthenticationService::loginUser(const LoginModel& loginModel)
4040
return;
4141
}
4242

43-
m_rememberMe = loginModel.getRememberMe();
43+
m_rememberUser = loginModel.getRememberUser();
4444
m_tempEmail = loginModel.getEmail();
4545
m_authenticationGateway->authenticateUser(loginModel);
4646
}
@@ -86,8 +86,8 @@ void AuthenticationService::processAuthenticationResult(const QString& token)
8686
}
8787
else
8888
{
89-
// Store the login data if "RememberMe" was selected
90-
if(m_rememberMe)
89+
// Store the login data if "rememberUser" was selected
90+
if(m_rememberUser)
9191
{
9292
utility::AutomaticLoginHelper autoLoginHelper;
9393
utility::AuthenticationData authData { m_tempEmail, token };
@@ -110,7 +110,7 @@ void AuthenticationService::processRegistrationResult(bool success,
110110
void AuthenticationService::clearTemporaryUserData()
111111
{
112112
m_tempEmail = "";
113-
m_rememberMe = false;
113+
m_rememberUser = false;
114114
}
115115

116116
} // namespace application::services

src/application/services/authentication_service.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public slots:
2929
void clearTemporaryUserData();
3030

3131
IAuthenticationGateway* m_authenticationGateway;
32-
bool m_rememberMe = false;
32+
bool m_rememberUser = false;
3333
// To be able to send the user email with the 'loggedIn' signal
3434
QString m_tempEmail;
3535
};

src/application/services/user_service.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ UserService::UserService(IUserStorageGateway* userStorageGateway) :
4040
});
4141
}
4242

43-
void UserService::loadUser(bool rememberMe)
43+
void UserService::loadUser(bool rememberUser)
4444
{
4545
utility::AutomaticLoginHelper autoLoginHelper;
4646
auto result = autoLoginHelper.tryAutomaticUserLoading();
@@ -56,7 +56,7 @@ void UserService::loadUser(bool rememberMe)
5656
return;
5757
}
5858

59-
m_rememberMe = rememberMe;
59+
m_rememberUser = rememberUser;
6060
m_userStorageGateway->getUser(m_authenticationToken);
6161
}
6262

@@ -176,7 +176,7 @@ void UserService::proccessUserInformation(const domain::entities::User& user,
176176

177177
emit finishedLoadingUser(true);
178178

179-
if(m_rememberMe)
179+
if(m_rememberUser)
180180
{
181181
utility::AutomaticLoginHelper autoLoginHelper;
182182
utility::UserData userData {
@@ -188,17 +188,17 @@ void UserService::proccessUserInformation(const domain::entities::User& user,
188188

189189
autoLoginHelper.addUserData(userData);
190190
}
191-
clearRememberMe();
191+
clearRememberUser();
192192
}
193193

194194
bool UserService::userIsLoggedIn()
195195
{
196196
return !m_authenticationToken.isEmpty();
197197
}
198198

199-
void UserService::clearRememberMe()
199+
void UserService::clearRememberUser()
200200
{
201-
m_rememberMe = false;
201+
m_rememberUser = false;
202202
}
203203

204204
void UserService::setupUserData(const QString& token, const QString& email)

0 commit comments

Comments
 (0)