D-Net
/
dnet-applications
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

little changes

This commit is contained in:
Michele Artini 2022-09-23 08:22:00 +02:00
parent 02b74616b2
commit 1271f9cf43
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/controller/AdminController.java
View File

@ -141,7 +141,9 @@ public class AdminController extends AbstractDnetController {
public SystemConfiguration saveSysConf(@RequestBody final SystemConfiguration sysConf, final Authentication authentication) { public SystemConfiguration saveSysConf(@RequestBody final SystemConfiguration sysConf, final Authentication authentication) {
if (UserInfo.isSuperAdmin(authentication)) { if (UserInfo.isSuperAdmin(authentication)) {
sysConf.setId(SystemConfiguration.DEFAULT_ID); sysConf.setId(SystemConfiguration.DEFAULT_ID);
return systemConfigurationRepository.save(sysConf); systemConfigurationRepository.save(sysConf);
mailDispatcher.configure(sysConf);
return sysConf;
} else { } else {
throw new RuntimeException("User not authorized"); throw new RuntimeException("User not authorized");
} }

2
apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/controller/UserInfo.java
View File

@ -113,7 +113,7 @@ public class UserInfo {
} }
public static String getOrganization(final OidcUser user) { public static String getOrganization(final OidcUser user) {
return user.getAttribute("organization"); return StringUtils.firstNonBlank(user.getAttribute("organization"), user.getAttribute("affiliation"));
} }
} }

4
apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/utils/MailDispatcher.java
View File

@ -37,9 +37,11 @@ public class MailDispatcher {
@PostConstruct @PostConstruct
public void configure() { public void configure() {
final SystemConfiguration conf = systemConfigurationRepository.findById(SystemConfiguration.DEFAULT_ID).get(); final SystemConfiguration conf = systemConfigurationRepository.findById(SystemConfiguration.DEFAULT_ID).get();
configure(conf);
}
public void configure(final SystemConfiguration conf) {
this.enabled = conf.getSmtpEnabled(); this.enabled = conf.getSmtpEnabled();
this.fromMail = conf.getSmtpFromMail(); this.fromMail = conf.getSmtpFromMail();
this.fromName = conf.getSmtpFromName(); this.fromName = conf.getSmtpFromName();