Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: d5e63496 by Tony CHEMIT at 2018-03-23T17:41:36Z Simplification des bases en entrée (Closes #302) - - - - - 7 changed files: - t3-domain/src/main/java/fr/ird/t3/entities/user/UserDatabase.java - t3-domain/src/main/java/fr/ird/t3/services/UserService.java - t3-web/src/main/java/fr/ird/t3/web/actions/admin/AbstractUserDatabaseAction.java - t3-web/src/main/resources/i18n/t3-web_en_GB.properties - t3-web/src/main/resources/i18n/t3-web_fr_FR.properties - t3-web/src/main/webapp/WEB-INF/jsp/admin/databaseConfigurationForm.jsp - t3-web/src/main/webapp/WEB-INF/jsp/user/selectUserInputDatabase.jsp Changes: ===================================== t3-domain/src/main/java/fr/ird/t3/entities/user/UserDatabase.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/user/UserDatabase.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/user/UserDatabase.java @@ -10,12 +10,12 @@ package fr.ird.t3.entities.user; * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% @@ -34,6 +34,8 @@ public class UserDatabase extends AbstractJavaBean implements Idable { protected String login; + protected String password; + protected String id; public String getUrl() { @@ -67,4 +69,12 @@ public class UserDatabase extends AbstractJavaBean implements Idable { public void setId(String id) { this.id = id; } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } } ===================================== t3-domain/src/main/java/fr/ird/t3/services/UserService.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/services/UserService.java +++ b/t3-domain/src/main/java/fr/ird/t3/services/UserService.java @@ -8,12 +8,12 @@ * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% @@ -40,6 +40,10 @@ import java.util.UUID; */ public class UserService extends T3ServiceSupport implements T3ServiceInjectable { + private static String encodePassword(String password) { + return StringUtil.encodeMD5(password); + } + public Optional<T3User> getUserByLogin(String login) { return getT3Users().usersStream().whereLogin().isEquals(login).filter().findFirst(); } @@ -79,7 +83,6 @@ public class UserService extends T3ServiceSupport implements T3ServiceInjectable commit(); } - public void deleteUser(String userId) { T3User user = getUserById(userId); getT3Users().getUsers().remove(user); @@ -93,6 +96,7 @@ public class UserService extends T3ServiceSupport implements T3ServiceInjectable .description(dbConfiguration.getDescription()) .login(dbConfiguration.getLogin()) .url(dbConfiguration.getUrl()) + .password(dbConfiguration.getPassword()) .build(); user.getInputs().add(dbConfigurationToSave); dbConfiguration.setId(dbConfigurationToSave.getId()); @@ -101,7 +105,7 @@ public class UserService extends T3ServiceSupport implements T3ServiceInjectable public void updateUserInputDatabase(UserDatabase dbConfiguration) { UserDatabase dbConfigurationToSave = getUserInputDatabase(dbConfiguration.getId()); - updateDatabaseConfiguration(dbConfiguration, dbConfigurationToSave); + dbConfiguration.copy(dbConfigurationToSave); commit(); } @@ -119,6 +123,7 @@ public class UserService extends T3ServiceSupport implements T3ServiceInjectable .description(dbConfiguration.getDescription()) .login(dbConfiguration.getLogin()) .url(dbConfiguration.getUrl()) + .password(dbConfiguration.getPassword()) .build(); user.getOutputs().add(dbConfigurationToSave); dbConfiguration.setId(dbConfigurationToSave.getId()); @@ -127,7 +132,7 @@ public class UserService extends T3ServiceSupport implements T3ServiceInjectable public void updateUserOutputDatabase(UserDatabase dbConfiguration) { UserDatabase dbConfigurationToSave = getUserOutputDatabase(dbConfiguration.getId()); - updateDatabaseConfiguration(dbConfiguration, dbConfigurationToSave); + dbConfiguration.copy(dbConfigurationToSave); commit(); } @@ -151,16 +156,6 @@ public class UserService extends T3ServiceSupport implements T3ServiceInjectable return s.equals(user.getPassword()); } - private static String encodePassword(String password) { - return StringUtil.encodeMD5(password); - } - - private void updateDatabaseConfiguration(UserDatabase dbConfiguration, UserDatabase dbConfigurationToSave) { - dbConfigurationToSave.setDescription(dbConfiguration.getDescription()); - dbConfigurationToSave.setUrl(dbConfiguration.getUrl()); - dbConfigurationToSave.setLogin(dbConfiguration.getLogin()); - } - private void commit() { getT3Users().save(); } ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/admin/AbstractUserDatabaseAction.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/admin/AbstractUserDatabaseAction.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/admin/AbstractUserDatabaseAction.java @@ -108,6 +108,7 @@ public abstract class AbstractUserDatabaseAction extends T3ActionSupport impleme String userId = getUser().getId(); String description = configuration.getDescription(); String login = configuration.getLogin(); + String password = configuration.getPassword(); String url = configuration.getUrl(); String id = configuration.getId(); boolean noError = true; @@ -129,7 +130,11 @@ public abstract class AbstractUserDatabaseAction extends T3ActionSupport impleme addFieldError("databaseConfiguration.login", t("t3.error.required.login")); noError = false; } - + if (StringUtils.isEmpty(password)) { + // empty user password + addFieldError("databaseConfiguration.password", t("t3.error.required.password")); + noError = false; + } if (noError) { // check now the configuration does not already exist with same description for this user T3User t3User = getUserService().getUserById(userId); @@ -169,6 +174,11 @@ public abstract class AbstractUserDatabaseAction extends T3ActionSupport impleme addFieldError("databaseConfiguration.login", t("t3.error.required.login")); noError = false; } + if (StringUtils.isEmpty(password)) { + // empty user password + addFieldError("databaseConfiguration.password", t("t3.error.required.password")); + noError = false; + } if (noError) { // check now the configuration does not already exist with same description for this user T3User t3User = getUserService().getUserById(userId); ===================================== t3-web/src/main/resources/i18n/t3-web_en_GB.properties ===================================== --- a/t3-web/src/main/resources/i18n/t3-web_en_GB.properties +++ b/t3-web/src/main/resources/i18n/t3-web_en_GB.properties @@ -1,3 +1,4 @@ +t3.common.password=Password t3.action.applyFilter=Apply t3.action.back.to.configuration.step1=Back to step 1 of configuration t3.action.back.to.configuration.step2=Back to step 2 of configuration ===================================== t3-web/src/main/resources/i18n/t3-web_fr_FR.properties ===================================== --- a/t3-web/src/main/resources/i18n/t3-web_fr_FR.properties +++ b/t3-web/src/main/resources/i18n/t3-web_fr_FR.properties @@ -9,6 +9,7 @@ t3.action.connectToDatabase=Se connecter à la base t3.action.create=Créer t3.action.create.parametersProfile=Créer un profile de paramètre t3.action.create.user=Créer un utilisateur +t3.common.password=Mot de passe t3.action.delete=Supprimer t3.action.deleteComputedData=Suppression des données calculées t3.action.deleteTrips=Suppression des marées ===================================== t3-web/src/main/webapp/WEB-INF/jsp/admin/databaseConfigurationForm.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/admin/databaseConfigurationForm.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/admin/databaseConfigurationForm.jsp @@ -37,16 +37,13 @@ </s:elseif> <s:if test="databaseEditAction == 'create'"> - <s:set name="title"><s:text - name="t3.label.admin.databaseconfiguration.create"/></s:set> + <s:set name="title"><s:text name="t3.label.admin.databaseconfiguration.create"/></s:set> </s:if> <s:elseif test="databaseEditAction =='edit'"> - <s:set name="title"><s:text - name="t3.label.admin.databaseconfiguration.edit"/></s:set> + <s:set name="title"><s:text name="t3.label.admin.databaseconfiguration.edit"/></s:set> </s:elseif> <s:elseif test="databaseEditAction == 'delete'"> - <s:set name="title"><s:text - name="t3.label.admin.databaseconfiguration.delete"/></s:set> + <s:set name="title"><s:text name="t3.label.admin.databaseconfiguration.delete"/></s:set> </s:elseif> <title><s:property value="#title"/></title> @@ -65,8 +62,12 @@ <s:hidden name="userEditAction" value="edit"/> <s:hidden key="user.id" label=""/> <s:textfield key="databaseConfiguration.url" label="%{getText('t3.common.url')}" size="40" requiredLabel="true"/> - <s:textfield key="databaseConfiguration.description" label="%{getText('t3.common.description')}" size="40" requiredLabel="true"/> - <s:textfield key="databaseConfiguration.login" label="%{getText('t3.common.login')}" size="40" requiredLabel="true"/> + <s:textfield key="databaseConfiguration.description" label="%{getText('t3.common.description')}" size="40" + requiredLabel="true"/> + <s:textfield key="databaseConfiguration.login" label="%{getText('t3.common.login')}" size="40" + requiredLabel="true"/> + <s:textfield key="databaseConfiguration.password" label="%{getText('t3.common.password')}" size="40" + requiredLabel="true"/> </fieldset> <br/> <s:submit action="%{databaseAction}!doCreate" key="t3.action.create" align="right"/> @@ -86,8 +87,12 @@ <s:hidden key="user.id" label=""/> <s:hidden name="databaseConfiguration.id" label=""/> <s:textfield key="databaseConfiguration.url" label="%{getText('t3.common.url')}" size="40" requiredLabel="true"/> - <s:textfield key="databaseConfiguration.description" label="%{getText('t3.common.description')}" size="40" requiredLabel="true"/> - <s:textfield key="databaseConfiguration.login" label="%{getText('t3.common.login')}" size="40" requiredLabel="true"/> + <s:textfield key="databaseConfiguration.description" label="%{getText('t3.common.description')}" size="40" + requiredLabel="true"/> + <s:textfield key="databaseConfiguration.login" label="%{getText('t3.common.login')}" size="40" + requiredLabel="true"/> + <s:textfield key="databaseConfiguration.password" label="%{getText('t3.common.password')}" size="40" + requiredLabel="true"/> </fieldset> <br/> <s:submit action="%{databaseAction}!doUpdate" key="t3.action.save" align="right"/> @@ -105,26 +110,18 @@ <s:hidden key="userEditAction" label="" value="edit"/> <s:hidden key="user.id" label=""/> <s:hidden name="databaseConfiguration.id" label=""/> - <s:textfield key="databaseConfiguration.url" - label="%{getText('t3.common.url')}" - size="40" disabled="true"/> - <s:textfield key="databaseConfiguration.description" - label="%{getText('t3.common.description')}" size="40" - disabled="true"/> - <s:textfield key="databaseConfiguration.login" - label="%{getText('t3.common.login')}" - size="40" disabled="true"/> + <s:textfield key="databaseConfiguration.url" label="%{getText('t3.common.url')}" size="40" disabled="true"/> + <s:textfield key="databaseConfiguration.description" label="%{getText('t3.common.description')}" size="40" disabled="true"/> + <s:textfield key="databaseConfiguration.login" label="%{getText('t3.common.login')}" size="40" disabled="true"/> </fieldset> <br/> - <s:submit action="%{databaseAction}!doDelete" key="t3.action.delete" - align="right"/> + <s:submit action="%{databaseAction}!doDelete" key="t3.action.delete" align="right"/> </s:form> </s:elseif> <s:form method="post" namespace="/user"> <s:hidden name="userEditAction" value="edit"/> <s:hidden key="user.id" label=""/> - <s:submit action="userForm!input" key="t3.label.admin.backToUser" - align="right"/> + <s:submit action="userForm!input" key="t3.label.admin.backToUser" align="right"/> </s:form> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/user/selectUserInputDatabase.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/user/selectUserInputDatabase.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/user/selectUserInputDatabase.jsp @@ -35,7 +35,7 @@ var database = data.database; $('[name="database.url"]').attr('value', database.url ? database.url : ''); $('[name="database.login"]').attr('value', database.login ? database.login : ''); - $('[name="database.password"]').attr('value', ""); + $('[name="database.password"]').attr('value', database.password ? database.password : ''); } ); }); View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/d5e63496d000fbda8b8e3e911656ee86e... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/d5e63496d000fbda8b8e3e911656ee86e... You're receiving this email because of your account on gitlab.com.