safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-10-31 00:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-540: Clean up Credentials with new constructor.

Browse Source
This commit is contained in:
Nick Couchman
2018-06-15 17:22:36 -04:00
parent c725da00a0
commit 52a3f454e6
4 changed files with 44 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
guacamole/src/main/java/org/apache/guacamole/rest/auth/TokenRESTService.java
View File

@@ -55,7 +55,7 @@ public class TokenRESTService {
* Logger for this class.
*/
private static final Logger logger = LoggerFactory.getLogger(TokenRESTService.class);
/**
* Service for authenticating users and managing their Guacamole sessions.
*/
@@ -117,13 +117,7 @@ public class TokenRESTService {
} // end Authorization header fallback
// Build credentials
Credentials credentials = new Credentials();
credentials.setUsername(username);
credentials.setPassword(password);
credentials.setRequest(request);
credentials.setSession(request.getSession(false));
return credentials;
return new Credentials(username, password, request);
}

7
guacamole/src/main/java/org/apache/guacamole/rest/user/UserResource.java
View File

@@ -155,11 +155,8 @@ public class UserResource
@Context HttpServletRequest request) throws GuacamoleException {
// Build credentials
Credentials credentials = new Credentials();
credentials.setUsername(user.getIdentifier());
credentials.setPassword(userPasswordUpdate.getOldPassword());
credentials.setRequest(request);
credentials.setSession(request.getSession(false));
Credentials credentials = new Credentials(user.getIdentifier(),
userPasswordUpdate.getOldPassword(), request);
// Verify that the old password was correct
try {