GUACAMOLE-524: Added attributes in ModeledAuthenticatedUser
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/f24a6a8b Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/f24a6a8b Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/f24a6a8b Branch: refs/heads/master Commit: f24a6a8b9dbe76543e1af9c1c70616049d05312e Parents: 0964c46 Author: Jared Frees <frees...@osu.edu> Authored: Fri Jun 15 10:49:05 2018 -0400 Committer: Jared Frees <frees...@osu.edu> Committed: Fri Jun 15 10:53:48 2018 -0400 ---------------------------------------------------------------------- .../auth/jdbc/user/ModeledAuthenticatedUser.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/f24a6a8b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledAuthenticatedUser.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledAuthenticatedUser.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledAuthenticatedUser.java index 8c201d0..019c9ae 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledAuthenticatedUser.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledAuthenticatedUser.java @@ -26,6 +26,11 @@ import org.apache.guacamole.net.auth.AuthenticatedUser; import org.apache.guacamole.net.auth.AuthenticationProvider; import org.apache.guacamole.net.auth.Credentials; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import java.util.Map; + + /** * Associates a user with the credentials they used to authenticate, their * corresponding ModeledUser, and the AuthenticationProvider which produced @@ -79,6 +84,7 @@ public class ModeledAuthenticatedUser extends RemoteAuthenticatedUser { super(authenticatedUser.getAuthenticationProvider(), authenticatedUser.getCredentials()); this.modelAuthenticationProvider = modelAuthenticationProvider; this.user = user; + this.setAttributes(authenticatedUser.getAttributes()); } /** @@ -93,7 +99,7 @@ public class ModeledAuthenticatedUser extends RemoteAuthenticatedUser { * A ModeledUser object which is backed by the data associated with * this user in the database. * - * @param credentials + * @param credentials * The credentials given by the user when they authenticated. */ public ModeledAuthenticatedUser(AuthenticationProvider authenticationProvider, @@ -107,7 +113,7 @@ public class ModeledAuthenticatedUser extends RemoteAuthenticatedUser { * Returns a ModeledUser object which is backed by the data associated with * this user within the database. * - * @return + * @return * A ModeledUser object which is backed by the data associated with * this user in the database. */
