Revision d00d2a84
Added by Katja Luther almost 13 years ago
| cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/UserService.java | ||
|---|---|---|
| 9 | 9 |
*/ |
| 10 | 10 |
package eu.etaxonomy.cdm.api.service; |
| 11 | 11 |
|
| 12 |
import java.security.Permission; |
|
| 12 | 13 |
import java.util.ArrayList; |
| 13 | 14 |
import java.util.List; |
| 14 | 15 |
import java.util.UUID; |
| ... | ... | |
| 42 | 43 |
import eu.etaxonomy.cdm.model.common.GrantedAuthorityImpl; |
| 43 | 44 |
import eu.etaxonomy.cdm.model.common.Group; |
| 44 | 45 |
import eu.etaxonomy.cdm.model.common.User; |
| 46 |
import eu.etaxonomy.cdm.permission.CdmPermission; |
|
| 47 |
import eu.etaxonomy.cdm.permission.CdmPermissionEvaluator; |
|
| 45 | 48 |
import eu.etaxonomy.cdm.persistence.dao.common.IGrantedAuthorityDao; |
| 46 | 49 |
import eu.etaxonomy.cdm.persistence.dao.common.IGroupDao; |
| 47 | 50 |
import eu.etaxonomy.cdm.persistence.dao.common.IUserDao; |
| ... | ... | |
| 117 | 120 |
|
| 118 | 121 |
@Override |
| 119 | 122 |
@Transactional(readOnly=false) |
| 123 |
|
|
| 120 | 124 |
public void changePassword(String oldPassword, String newPassword) {
|
| 121 | 125 |
Assert.hasText(oldPassword); |
| 122 | 126 |
Assert.hasText(newPassword); |
| ... | ... | |
| 141 | 145 |
|
| 142 | 146 |
@Override |
| 143 | 147 |
@Transactional(readOnly=false) |
| 148 |
@PreAuthorize("hasPermission(#username, 'changePassword') or hasRole('USER.Admin')")
|
|
| 144 | 149 |
public void changePasswordForUser(String username, String newPassword) {
|
| 145 | 150 |
Assert.hasText(username); |
| 146 | 151 |
Assert.hasText(newPassword); |
| ... | ... | |
| 381 | 386 |
} |
| 382 | 387 |
return results; |
| 383 | 388 |
} |
| 389 |
|
|
| 390 |
|
|
| 391 |
|
|
| 384 | 392 |
|
| 385 | 393 |
} |
Also available in: Unified diff
bugfix in getAuthorities()
new Service for evaluate a permission
add permission evaluation for changing password