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

SEBSERV-442 fix

Browse source
This commit is contained in:
anhefti 2023-05-08 18:20:54 +02:00
parent 540bb7290c
commit 00be6d6857
1 changed files with 34 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/proctoring/ZoomProctoringService.java
View file

@ -1016,6 +1016,37 @@ public class ZoomProctoringService implements ExamProctoringService {
} }
} }
@Override
boolean isValid(final ProctoringServiceSettings proctoringSettings) {
final boolean valid = super.isValid(proctoringSettings);
if (!valid) {
return false;
}
try {
final OAuth2RestTemplate oAuth2RestTemplate = (OAuth2RestTemplate) super.restTemplate;
final OAuth2AccessToken accessToken = oAuth2RestTemplate.getAccessToken();
if (accessToken == null) {
return false;
}
final boolean expired = accessToken.isExpired();
if (expired) {
return false;
}
final int expiresIn = accessToken.getExpiresIn();
if (expiresIn < 60) {
return false;
}
return true;
} catch (final Exception e) {
log.error("Failed to verify Zoom OAuth2RestTemplate status", e);
return false;
}
}
@Override @Override
public HttpHeaders getHeaders() { public HttpHeaders getHeaders() {
final HttpHeaders httpHeaders = new HttpHeaders(); final HttpHeaders httpHeaders = new HttpHeaders();
@ -1123,14 +1154,15 @@ public class ZoomProctoringService implements ExamProctoringService {
@Override @Override
public boolean supportsRefresh(final OAuth2ProtectedResourceDetails resource) { public boolean supportsRefresh(final OAuth2ProtectedResourceDetails resource) {
return false; return true;
} }
@Override @Override
public OAuth2AccessToken refreshAccessToken(final OAuth2ProtectedResourceDetails resource, public OAuth2AccessToken refreshAccessToken(final OAuth2ProtectedResourceDetails resource,
final OAuth2RefreshToken refreshToken, final AccessTokenRequest request) final OAuth2RefreshToken refreshToken, final AccessTokenRequest request)
throws UserRedirectRequiredException { throws UserRedirectRequiredException {
return null;
return this.obtainAccessToken(resource, request);
} }
@Override @Override
@ -1140,7 +1172,6 @@ public class ZoomProctoringService implements ExamProctoringService {
final ClientCredentialsResourceDetails resource = (ClientCredentialsResourceDetails) details; final ClientCredentialsResourceDetails resource = (ClientCredentialsResourceDetails) details;
return retrieveToken(request, resource, getParametersForTokenRequest(resource), new HttpHeaders()); return retrieveToken(request, resource, getParametersForTokenRequest(resource), new HttpHeaders());
} }
private MultiValueMap<String, String> getParametersForTokenRequest( private MultiValueMap<String, String> getParametersForTokenRequest(