Revision 60501
Added by Konstantina Galouni about 3 years ago
UoaAdminToolsConfiguration.java | ||
---|---|---|
1 | 1 |
package eu.dnetlib.uoaadmintools; |
2 | 2 |
|
3 |
import eu.dnetlib.uoaadmintools.configuration.properties.SecurityConfig; |
|
4 |
import eu.dnetlib.uoaadmintools.handlers.AuthorizationHandler; |
|
3 |
//import eu.dnetlib.uoaadmintools.configuration.properties.SecurityConfig;
|
|
4 |
//import eu.dnetlib.uoaadmintools.handlers.AuthorizationHandler;
|
|
5 | 5 |
import org.apache.log4j.Logger; |
6 | 6 |
import org.springframework.beans.factory.annotation.Autowired; |
7 | 7 |
import org.springframework.context.annotation.Bean; |
... | ... | |
18 | 18 |
public class UoaAdminToolsConfiguration extends WebMvcConfigurerAdapter { |
19 | 19 |
private final Logger log = Logger.getLogger(this.getClass()); |
20 | 20 |
|
21 |
@Autowired |
|
22 |
private SecurityConfig securityConfig; |
|
21 |
// @Autowired
|
|
22 |
// private SecurityConfig securityConfig;
|
|
23 | 23 |
|
24 | 24 |
|
25 | 25 |
@Bean |
... | ... | |
27 | 27 |
return new PropertySourcesPlaceholderConfigurer(); |
28 | 28 |
} |
29 | 29 |
|
30 |
@Override |
|
31 |
public void addInterceptors(InterceptorRegistry registry) { |
|
32 |
registry.addInterceptor(new AuthorizationHandler(securityConfig.getUserInfoUrl(), securityConfig.getOriginServer(), securityConfig.getPostsAllowed())) |
|
33 |
.addPathPatterns("/**"); |
|
30 |
// @Override |
|
31 |
// public void addInterceptors(InterceptorRegistry registry) { |
|
32 |
// registry.addInterceptor(new AuthorizationHandler(securityConfig.getUserInfoUrl(), securityConfig.getOriginServer(), securityConfig.getPostsAllowed())) |
|
33 |
// .addPathPatterns("/**"); |
|
34 |
// |
|
35 |
// } |
|
34 | 36 |
|
35 |
} |
|
36 |
|
|
37 | 37 |
} |
Also available in: Unified diff
[Trunk | Admin Tools]:
1. pom.xml: Added dependency for spring security.
2. UoaAdminToolsApplication.java: Import AuthorizationConfiguration.class | Remove SecurityConfig.class from @EnableConfigurationProperties.
3. UoaAdminToolsConfiguration.java: Comment "addInterceptors()" method calling AuthorizationHandler with SecurityConfig.
4. SecurityConfig.java & AuthorizationHandler.java & AuthorizationUtils.java & CommunityInfo.java & UserInfo.java: Commented all contents of these files (files will be deleted in coming commit).
5. PortalSubscribersController.java: Comment imports from commeted files.
6. Notifications.java: Added field "aaiId" get getters and setters.
7. NotificationsController.java:
a. Method "getNotifications()" is replaced by "getNotificationsForUser()" (/community/{pid}/notifications) - returns notification settings only for user who made the request (uoa-authorization-li$
b. Path changed for method "getNotifications()": /community/{pid}/notifications/all
c. Remove "@RequestBody String email" parameter from method "deleteNotification()" - get email from user who made the request (uoa-authorization-library).
d. In method "saveNotification()" get aaiId and email from user who made the request (uoa-authorization-library).
e. Added checks and throw Exceptions in all methods.
f. Added @PreAuthorize
Portal Admins: "getNotifications()" (/community/{pid}/notifications/all)
Portal Admins - Curators - Managers: "getNotificationsForUser()" (/community/{pid}/notifications), "deleteNotification()" (/community/{pid}/notifications), "saveNotification()" (/communit$
8. ExploreController.java:
a. Added checks and throw Exceptions in all methods.
b. Added @PreAuthorize
Portal Admins: "updateExplore()" (/explore/update), "insertExplore()" (/explore/save), "deleteExplore()" (/explore/delete).
9. ConnectController.java:
a. Added checks and throw Exceptions in all methods.
b. Added @PreAuthorize
Portal Admins: "updateConnect()" (/connect/update), "insertConnect()" (/connect/save), "deleteConnect()" (/connect/delete).
c. Commented methods "getLayoutForConnect()" and "updateLayoutForConnect()" (/connect/{pid}/layout).
10. CommunityController.java:
a. Added checks and throw Exceptions in all methods.
b. Added @PreAuthorize
Portal Admins: "updateCommunity()" (/community/update), "insertCommunity()" (/community/save), "deleteCommunity()" (/community/delete).
Portal Admin - Curators - Managers: "updateLayoutForCommunity()" (/community/{pid}/layout).
11. CuratorController.java:
a. In "insertCurator() (/curator) set _id field with aaiId from user who made the request (uoa-authorization-library).
b. Added @PreAuthorize
Authenticated users: "getCuratorById()" (/curator/{id}), "insertCurator()" (/curator).
Portal Admins: "deleteCurators()" (/curator).