zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBSERV-313 fixed

Browse source
This commit is contained in:
anhefti 2022-06-08 15:36:16 +02:00
parent dbbc69e229
commit cc403d07da
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/sebconfig/impl/ClientConfigServiceImpl.java
View file

@ -169,6 +169,7 @@ public class ClientConfigServiceImpl implements ClientConfigService {
private final WebserviceInfo webserviceInfo;
private final CertificateDAO certificateDAO;
private final long defaultPingInterval;
private final int examAPITokenValiditySeconds;
protected ClientConfigServiceImpl(
final SEBClientConfigDAO sebClientConfigDAO,
@ -178,7 +179,8 @@ public class ClientConfigServiceImpl implements ClientConfigService {
final WebserviceInfo webserviceInfo,
final CertificateDAO certificateDAO,
@Qualifier(WebSecurityConfig.CLIENT_PASSWORD_ENCODER_BEAN_NAME) final PasswordEncoder clientPasswordEncoder,
@Value("${sebserver.webservice.api.exam.defaultPingInterval:1000}") final long defaultPingInterval) {
@Value("${sebserver.webservice.api.exam.defaultPingInterval:1000}") final long defaultPingInterval,
@Value("${sebserver.webservice.api.exam.accessTokenValiditySeconds:-1}") final int examAPITokenValiditySeconds) {
this.sebClientConfigDAO = sebClientConfigDAO;
this.clientCredentialService = clientCredentialService;
@ -188,6 +190,7 @@ public class ClientConfigServiceImpl implements ClientConfigService {
this.webserviceInfo = webserviceInfo;
this.certificateDAO = certificateDAO;
this.defaultPingInterval = defaultPingInterval;
this.examAPITokenValiditySeconds = examAPITokenValiditySeconds;
}
@Override
@ -210,8 +213,8 @@ public class ClientConfigServiceImpl implements ClientConfigService {
baseClientDetails.setScope(Collections.emptySet());
baseClientDetails.setClientSecret(Utils.toString(pwd));
baseClientDetails.setAccessTokenValiditySeconds(-1); // not expiring
baseClientDetails.setRefreshTokenValiditySeconds(-1); // not expiring
baseClientDetails.setAccessTokenValiditySeconds(this.examAPITokenValiditySeconds);
baseClientDetails.setRefreshTokenValiditySeconds(-1); // not used, not expiring
if (log.isDebugEnabled()) {
log.debug("Created new BaseClientDetails for id: {}", clientName);

1
src/main/resources/config/application-ws.properties
View file

@ -72,6 +72,7 @@ sebserver.webservice.api.exam.endpoint.discovery=${sebserver.webservice.api.exam
sebserver.webservice.api.exam.endpoint.v1=${sebserver.webservice.api.exam.endpoint}/v1
sebserver.webservice.api.exam.event-handling-strategy=SINGLE_EVENT_STORE_STRATEGY
sebserver.webservice.api.exam.enable-indicator-cache=true
sebserver.webservice.api.exam.accessTokenValiditySeconds=-1
sebserver.webservice.api.pagination.maxPageSize=500
# comma separated list of known possible OpenEdX API access token request endpoints
sebserver.webservice.lms.openedx.api.token.request.paths=/oauth2/access_token