added default prop values

This commit is contained in:
2021-06-03 22:14:16 -04:00
parent e67eef5bcd
commit 9e3ec85ee0

View File

@@ -10,13 +10,13 @@ import org.springframework.context.annotation.Configuration;
@ComponentScan @ComponentScan
public class AcsClientConfiguration { public class AcsClientConfiguration {
@Value("${content.service.baseUrl}") @Value("${content.service.baseUrl:http://localhost:8080/alfresco}")
private String baseUrl; private String baseUrl;
@Value("${content.service.security.basicAuth.username}") @Value("${content.service.security.basicAuth.username:admin}")
private String basicAuthUsername; private String basicAuthUsername;
@Value("${content.service.security.basicAuth.password}") @Value("${content.service.security.basicAuth.password:admin}")
private String basicAuthPassword; private String basicAuthPassword;
@Value("${content.service.security.accessToken}") @Value("${content.service.security.accessToken}")
@@ -27,10 +27,10 @@ public class AcsClientConfiguration {
} }
public void authorize(Client client) { public void authorize(Client client) {
if (this.basicAuthUsername != null) { if (this.accessToken != null) {
client.register(new BasicAuthRequestFilter(this.basicAuthUsername, this.basicAuthPassword));
} else if (this.accessToken != null) {
client.register(new AccessTokenRequestFilter(this.accessToken)); client.register(new AccessTokenRequestFilter(this.accessToken));
} else if (this.basicAuthUsername != null) {
client.register(new BasicAuthRequestFilter(this.basicAuthUsername, this.basicAuthPassword));
} }
} }