OSF publication - version 0.9.0-2-hotfix-4

Author: SentinelDataHub

.gitignore

@@ -0,0 +1,64 @@
+# Compiled source #
+###################
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.so
+ 
+# Packages #
+############
+# it's better to unpack these files and commit the raw source
+# git has its own built in compression methods
+*.7z
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+ 
+# Logs and databases #
+######################
+*.log
+*.sql
+*.sqlite
+ 
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+ 
+# IDE files #
+#############
+.~lock.*
+.buildpath
+
+# Netbeans
+nbproject
+nbactions.xml
+nb-configuration.xml
+
+# Eclipse
+.classpath
+.project
+.settings/
+
+# Intellij
+.idea/
+*.iml
+*.iws
+
+# Mac
+.DS_Store
+
+# Maven
+target/
+local_dhus_test/

client/gwt/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>fr.gael.dhus</groupId>
       <artifactId>dhus-parent</artifactId>
-          <version>0.9.0-2</version>
+          <version>0.9.0-2-hotfix-4</version>
         <relativePath></relativePath>
    </parent>
 

client/html/pom.xml

@@ -10,7 +10,7 @@
    <parent>
       <groupId>fr.gael.dhus</groupId>
       <artifactId>dhus-parent</artifactId>
-      <version>0.9.0-2</version>
+      <version>0.9.0-2-hotfix-4</version>
    </parent>
 
    <artifactId>dhus-client-html</artifactId>

client/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>fr.gael.dhus</groupId>
       <artifactId>dhus-parent</artifactId>
-      <version>0.9.0-2</version>
+      <version>0.9.0-2-hotfix-4</version>
       <relativePath></relativePath>
    </parent>
 

client/webclient/pom.xml

@@ -10,7 +10,7 @@
    <parent>
       <groupId>fr.gael.dhus</groupId>
       <artifactId>dhus-parent</artifactId>
-      <version>0.9.0-2</version>
+      <version>0.9.0-2-hotfix-4</version>
    </parent>
 
    <artifactId>dhus-web-client</artifactId>

client/webclient/src/main/frontend/app/config/appconfig.json

@@ -163,3 +163,4 @@
     ]
 
 }
+

client/webclient/src/main/frontend/app/scripts/services/odata-synchronizer-service.js

@@ -43,9 +43,9 @@ angular
                 <d:ServiceUrl>'+model.serviceUrl+'</d:ServiceUrl> \
                 <d:ServiceLogin>'+model.serviceLoginUsername+'</d:ServiceLogin> '+
                 ((model.serviceLoginPassword && (model.serviceLoginPassword!=''))?('<d:ServicePassword>'+model.serviceLoginPassword+'</d:ServicePassword> ' ):'')+
-                '<d:Schedule>'+model.schedule+'</d:Schedule> \
-                <d:RemoteIncoming>'+model.remoteIncoming+'</d:RemoteIncoming> \
-                <d:Request>'+model.request+'</d:Request> '+
+                '<d:Schedule>'+model.schedule+'</d:Schedule> ' +
+                ((model.remoteIncoming && (model.remoteIncoming!=''))?('<d:RemoteIncoming>'+model.remoteIncoming+'</d:RemoteIncoming> ' ):'')+                
+                '<d:Request>'+model.request+'</d:Request> '+
                 ((model.copyProduct && (model.copyProduct!=''))?('<d:CopyProduct>'+model.copyProduct+'</d:CopyProduct> ' ):'')+
                 ((model.filterParam && (model.filterParam!=''))?('<d:FilterParam>'+model.filterParam+'</d:FilterParam> '):'<d:FilterParam></d:FilterParam>')+
                 ((model.sourceCollection && (model.sourceCollection!=''))?('<d:SourceCollection>'+model.sourceCollection+'"</d:SourceCollection> '):'')+

core/pom.xml

@@ -39,7 +39,7 @@
    <parent>
       <groupId>fr.gael.dhus</groupId>
       <artifactId>dhus-parent</artifactId>
-      <version>0.9.0-2</version>
+      <version>0.9.0-2-hotfix-4</version>
       <relativePath></relativePath>
    </parent>
 

core/src/main/java/fr/gael/dhus/api/stub/StubUserController.java

@@ -6,6 +6,7 @@
 import java.util.Iterator;
 import java.util.Set;
 
+import fr.gael.dhus.service.exception.RequiredFieldMissingException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,31 +26,20 @@
 import fr.gael.dhus.api.stub.stub_share.exceptions.UserBadEncryptionException;
 import fr.gael.dhus.api.stub.stub_share.exceptions.UserBadOldPasswordException;
 import fr.gael.dhus.api.stub.stub_share.exceptions.UserPasswordConfirmationException;
-import fr.gael.dhus.database.dao.UserDao;
 import fr.gael.dhus.database.object.User;
 import fr.gael.dhus.database.object.User.PasswordEncryption;
-import fr.gael.dhus.messaging.mail.MailServer;
 import fr.gael.dhus.service.UserService;
 import fr.gael.dhus.service.exception.RootNotModifiableException;
 import fr.gael.dhus.spring.context.ApplicationContextProvider;
-import fr.gael.dhus.system.config.ConfigurationManager;
 
 @RestController
 public class StubUserController {
 	private static Log logger = LogFactory.getLog(StubUserController.class);
 
-	@Autowired
-	private UserDao userDao;
 
 	@Autowired
 	private UserService userService;
 
-	@Autowired
-	private ConfigurationManager cfgManager;
-
-	@Autowired
-	private MailServer mailer;
-
 	private User getUserFromPrincipal(Principal principal) {
 		User user = ((User) ((UsernamePasswordAuthenticationToken) principal)
 				.getPrincipal());
@@ -67,27 +57,14 @@ public User getUserProfile(Principal principal,
 	@RequestMapping(value = "/stub/users/{userid}", method = RequestMethod.PUT)
 	public int updateUserProfile(Principal principal,
 			@RequestBody UserRequestBody body,
-			@PathVariable(value = "userid") String userid) {
+			@PathVariable(value = "userid") String userid) throws RequiredFieldMissingException, RootNotModifiableException {
 		logger.info("******** updateUserProfile()");
 		int responseCode = 0;
 		User user = body.getUser();
 		logger.info("******** called body.getUser");
 		PasswordModel passwordModel = body.getPasswordModel();
 		User u = getUserFromPrincipal(principal);
-		try {
-			logger.info("******** inside try");
-			checkRoot(u);
-		} catch (RootNotModifiableException e) {
-			logger.info("******** caught  RootNotModifiableException");
-			responseCode = 1001;
-			logger.error("Root cannot be modified: " + e.getMessage());
-			e.printStackTrace();
-			return responseCode;
-		} catch (Exception ex) {
-			logger.info("******** caught  generic exception");
-			logger.error(ex.getMessage());
-		}
-		logger.error("******** fields check");
+
 		// check user fields. set only not empty fields
 		if (user.getEmail() != null && !user.getEmail().isEmpty())
 			u.setEmail(user.getEmail());
@@ -146,12 +123,11 @@ public int updateUserProfile(Principal principal,
 				throw new UserPasswordConfirmationException(
 						"Confirmation password value doesn't match.");
 			}
-			// logger.info("new pwd: " +
-			// passwordModel.getConfirmPassword());RootNotModifiableException
-			u.setPassword(passwordModel.getConfirmPassword());
+			userService.selfChangePassword(u.getId(),passwordModel.getOldPassword(),passwordModel.getConfirmPassword());
 		}
 		logger.info("******** update user");
-		userDao.update(u);
+
+		userService.selfUpdateUser(u);
 		return responseCode;
 	}
 
@@ -160,68 +136,18 @@ public int forgotPassword(@RequestBody User user)
 			throws RootNotModifiableException {
 		int responseCode = 0;
 
-		if (userDao.isRootUser(user)) {
-			logger.error("Root cannot be modified");
-			responseCode = 1001;
-			return responseCode;
-		}
-		User checked = userService.resolveUser(userDao.getByName(user
-				.getUsername()));
-		if (checked == null
-				|| !checked.getEmail().toLowerCase()
-						.equals(user.getEmail().toLowerCase())) {
-			logger.error("No user can be found for this "
-					+ "username/mail combination");
-			responseCode = 1002;
-			return responseCode;
-		}
-
-		String message = "Dear " + getUserWelcome(checked) + ",\n\n"
-				+ "Please follow this link to set a new password in the "
-				+ cfgManager.getNameConfiguration().getShortName()
-				+ " system:\n"
-				+ cfgManager.getServerConfiguration().getExternalUrl()
-				+ "#/home/r="
-				+ userDao.computeUserCodeForPasswordReset(checked) + "\n\n"
-				+ "For help requests please write to: "
-				+ cfgManager.getSupportConfiguration().getMail() + "\n\n"
-				+ "Kind regards.\n"
-				+ cfgManager.getSupportConfiguration().getName() + ".\n"
-				+ cfgManager.getServerConfiguration().getExternalUrl();
-
-		//logger.info("Forgot password mail message: " + message);
-		String subject = "User password reset";
-
 		try {
-			mailer.send(checked.getEmail(), null, null, subject, message);
+			userService.forgotPassword ("#/home/r=", user);
 		} catch (Exception e) {
-			logger.error("Cannot send email to " + checked.getEmail(), e);
+			logger.error("Reset password of user: " + user + " failed", e);
 			responseCode = 1003;
 			return responseCode;
 		}
-		logger.info("responseCode:  " + responseCode);
+		logger.info("responseCode: " + responseCode);
 
 		return responseCode;
 	}
 
-	private void checkRoot(User user) throws RootNotModifiableException {
-		if (userDao.isRootUser(user)) {
-			logger.error("Root cannot be modified");
-			throw new RootNotModifiableException("Root cannot be modified");
-		}
-	}
-
-	private String getUserWelcome(User u) {
-		String firstname = u.getUsername();
-		String lastname = "";
-		if (u.getFirstname() != null && !u.getFirstname().trim().isEmpty()) {
-			firstname = u.getFirstname();
-			if (u.getLastname() != null && !u.getLastname().trim().isEmpty())
-				lastname = " " + u.getLastname();
-		}
-		return firstname + lastname;
-	}
-
 	/**
 	 * Uploaded products ids list of logged user
 	 *

core/src/main/java/fr/gael/dhus/api/stub/admin/AdminUserController.java

@@ -248,6 +248,7 @@ public ResponseEntity<?>  updateUser (@RequestBody UserData userData, @PathVaria
 
 			User user = new User ();
 			user.setId (userid);
+			user.setUsername(userData.getUsername());
 			user.setFirstname (userData.getFirstname ());
 			user.setLastname (userData.getLastname ());
 			user.setAddress (userData.getAddress ());