safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-292: Define and use standard attributes for user full name and email.

Browse Source
This commit is contained in:
Michael Jumper
2017-02-24 01:50:26 -08:00
parent e9549fbb3b
commit 9634731fe6
5 changed files with 59 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUser.java
View File

@@ -66,17 +66,6 @@ public class ModeledUser extends ModeledDirectoryObject<UserModel> implements Us
*/
private static final Logger logger = LoggerFactory.getLogger(ModeledUser.class);
/**
* The name of the attribute which holds the user's full name, if known.
*/
public static final String FULL_NAME_ATTRIBUTE_NAME = "full-name";
/**
* The name of the attribute which holds the user's email address, if
* known.
*/
public static final String EMAIL_ADDRESS_ATTRIBUTE_NAME = "email-address";
/**
* The name of the attribute which controls whether a user account is
* disabled.
@@ -124,8 +113,8 @@ public class ModeledUser extends ModeledDirectoryObject<UserModel> implements Us
* form.
*/
public static final Form PROFILE = new Form("profile", Arrays.<Field>asList(
new TextField(FULL_NAME_ATTRIBUTE_NAME),
new EmailField(EMAIL_ADDRESS_ATTRIBUTE_NAME)
new TextField(User.Attribute.FULL_NAME),
new EmailField(User.Attribute.EMAIL_ADDRESS)
));
/**
@@ -406,10 +395,10 @@ public class ModeledUser extends ModeledDirectoryObject<UserModel> implements Us
private void putUnrestrictedAttributes(Map<String, String> attributes) {
// Set full name attribute
attributes.put(FULL_NAME_ATTRIBUTE_NAME, "Testy McTesterson"); // TODO
attributes.put(User.Attribute.FULL_NAME, "Testy McTesterson"); // TODO
// Set email address attribute
attributes.put(EMAIL_ADDRESS_ATTRIBUTE_NAME, "test@test.test"); // TODO
attributes.put(User.Attribute.EMAIL_ADDRESS, "test@test.test"); // TODO
}
@@ -529,10 +518,10 @@ public class ModeledUser extends ModeledDirectoryObject<UserModel> implements Us
private void setUnrestrictedAttributes(Map<String, String> attributes) {
// Translate full name attribute
logger.info("FULL NAME: \"{}\"", attributes.get(FULL_NAME_ATTRIBUTE_NAME)); // TODO
logger.info("FULL NAME: \"{}\"", attributes.get(User.Attribute.FULL_NAME)); // TODO
// Translate email address attribute
logger.info("EMAIL ADDRESS: \"{}\"", attributes.get(EMAIL_ADDRESS_ATTRIBUTE_NAME)); // TODO
logger.info("EMAIL ADDRESS: \"{}\"", attributes.get(User.Attribute.EMAIL_ADDRESS)); // TODO
}

2
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json
View File

@@ -79,8 +79,6 @@
"FIELD_HEADER_DISABLED" : "Login disabled:",
"FIELD_HEADER_EXPIRED" : "Password expired:",
"FIELD_HEADER_EMAIL_ADDRESS" : "Email address:",
"FIELD_HEADER_FULL_NAME" : "Full name:",
"FIELD_HEADER_ACCESS_WINDOW_END" : "Do not allow access after:",
"FIELD_HEADER_ACCESS_WINDOW_START" : "Allow access after:",
"FIELD_HEADER_TIMEZONE" : "User time zone:",