zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix major update integrating with external wisemapping frond end

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2021-12-24 18:03:23 -08:00
parent 76ff1cc83d
commit b3e26caee4
1042 changed files with 1160 additions and 73432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wise-webapp/src/main/java/com/wisemapping/dao/MindmapManager.java
View File

@@ -58,13 +58,13 @@ public interface MindmapManager {
void removeCollaboration(Collaboration collaboration);
public List<Mindmap> search(MindMapCriteria criteria);
List<Mindmap> search(MindMapCriteria criteria);
public List<Mindmap> search(MindMapCriteria criteria, int maxResult);
List<Mindmap> search(MindMapCriteria criteria, int maxResult);
public List<MindMapHistory> getHistoryFrom(int mindmapId);
List<MindMapHistory> getHistoryFrom(int mindmapId);
public MindMapHistory getHistory(int historyId);
MindMapHistory getHistory(int historyId);
void updateCollaboration(@NotNull Collaboration collaboration);

12
wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java
View File

@@ -20,20 +20,20 @@ package com.wisemapping.dao;
import com.wisemapping.model.*;
import com.wisemapping.util.ZipUtils;
import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.criterion.Junction;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
import org.hibernate.criterion.SimpleExpression;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.springframework.orm.hibernate5.HibernateTemplate;
import org.springframework.orm.hibernate5.support.HibernateDaoSupport;
import org.hibernate.criterion.Restrictions;
import org.hibernate.criterion.SimpleExpression;
import org.hibernate.criterion.Junction;
import org.hibernate.criterion.Order;
import org.hibernate.Criteria;
import java.io.IOException;
import java.util.List;
import java.util.Calendar;
import java.util.List;
public class MindmapManagerImpl
extends HibernateDaoSupport

10
wise-webapp/src/main/java/com/wisemapping/dao/UserManager.java
View File

@@ -18,9 +18,9 @@
package com.wisemapping.dao;
import com.wisemapping.model.AccessAuditory;
import com.wisemapping.model.Collaborator;
import com.wisemapping.model.User;
import com.wisemapping.model.AccessAuditory;
import org.jetbrains.annotations.NotNull;
import java.util.List;
@@ -31,7 +31,7 @@ public interface UserManager {
User getUserBy(String email);
public User getUserBy(long id);
User getUserBy(long id);
void createUser(User user);
@@ -41,10 +41,10 @@ public interface UserManager {
User getUserByActivationCode(long code);
public Collaborator getCollaboratorBy(String email);
Collaborator getCollaboratorBy(String email);
public User createUser(User user, Collaborator col);
User createUser(User user, Collaborator col);
public void removeUser(@NotNull User user);
void removeUser(@NotNull User user);
}

13
wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java
View File

@@ -18,10 +18,12 @@
package com.wisemapping.dao;
import com.wisemapping.model.AccessAuditory;
import com.wisemapping.model.Collaboration;
import com.wisemapping.model.Collaborator;
import com.wisemapping.model.User;
import com.wisemapping.model.AccessAuditory;
import com.wisemapping.security.DefaultPasswordEncoderFactories;
import com.wisemapping.security.LegacyPasswordEncoder;
import org.hibernate.ObjectNotFoundException;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -130,7 +132,14 @@ public class UserManagerImpl
public void updateUser(@NotNull User user) {
assert user != null : "user is null";
user.setPassword(passwordEncoder.encode(user.getPassword()));
// Does the password need to be encrypted ?
final String password = user.getPassword();
if(password!=null && (!password.startsWith(LegacyPasswordEncoder.ENC_PREFIX) && !password.startsWith( "{"+ DefaultPasswordEncoderFactories.ENCODING_ID)))
{
user.setPassword(passwordEncoder.encode(user.getPassword()));
}
getHibernateTemplate().update(user);
}