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

Merge pull request #6 from SafeExamBrowser/development

Browse source 
Development
This commit is contained in:
Andreas Hefti 2020-05-06 16:08:47 +02:00 committed by GitHub
commit 4f7079df23
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ch/ethz/seb/sebserver/webservice/WebserviceInfo.java
View file

@ -36,7 +36,7 @@ public class WebserviceInfo {
private static final String VERSION_KEY = "sebserver.version"; private static final String VERSION_KEY = "sebserver.version";
private static final String WEB_SERVICE_TEST_PROPERTY = "sebserver.test.property"; private static final String WEB_SERVICE_TEST_PROPERTY = "sebserver.test.property";
private static final String WEB_SERVICE_SERVER_NAME_KEY = "sebserver.webservice.http.external.servername"; private static final String WEB_SERVICE_SERVER_NAME_KEY = "sebserver.webservice.http.external.servername";
private static final String WEB_SERVICE_HTTP_SCHEME_KEY = "sebserver.webservice.http.scheme"; private static final String WEB_SERVICE_HTTP_SCHEME_KEY = "sebserver.webservice.http.external.scheme";
private static final String WEB_SERVICE_HTTP_PORT = "sebserver.webservice.http.external.port"; private static final String WEB_SERVICE_HTTP_PORT = "sebserver.webservice.http.external.port";
private static final String WEB_SERVICE_HOST_ADDRESS_KEY = "server.address"; private static final String WEB_SERVICE_HOST_ADDRESS_KEY = "server.address";
private static final String WEB_SERVICE_SERVER_PORT_KEY = "server.port"; private static final String WEB_SERVICE_SERVER_PORT_KEY = "server.port";

2
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/impl/SEBServerUser.java
View file

@ -43,7 +43,7 @@ public final class SEBServerUser implements UserDetails, CredentialsContainer {
this.authorities = Collections.unmodifiableList( this.authorities = Collections.unmodifiableList(
userInfo.roles userInfo.roles
.stream() .stream()
.map(SimpleGrantedAuthority::new) .map(role -> new SimpleGrantedAuthority(role))
.collect(Collectors.toList())); .collect(Collectors.toList()));
if (CollectionUtils.isEmpty(userInfo.roles)) { if (CollectionUtils.isEmpty(userInfo.roles)) {

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

@ -25,7 +25,7 @@ sebserver.webservice.clean-db-on-startup=false
# webservice configuration # webservice configuration
sebserver.init.adminaccount.gen-on-init=false sebserver.init.adminaccount.gen-on-init=false
sebserver.webservice.distributed=false sebserver.webservice.distributed=false
sebserver.webservice.http.scheme=http sebserver.webservice.http.external.scheme=http
sebserver.webservice.http.external.servername= sebserver.webservice.http.external.servername=
sebserver.webservice.http.external.port=${server.port} sebserver.webservice.http.external.port=${server.port}
sebserver.webservice.http.redirect.gui=/gui sebserver.webservice.http.redirect.gui=/gui

2
src/main/resources/config/application.properties
View file

@ -86,7 +86,7 @@ sebserver.webservice.internalSecret=${sebserver.password}
### webservice networking ### webservice networking
sebserver.webservice.distributed=false sebserver.webservice.distributed=false
sebserver.webservice.http.scheme=http sebserver.webservice.http.external.scheme=https
sebserver.webservice.http.external.servername= sebserver.webservice.http.external.servername=
sebserver.webservice.http.external.port= sebserver.webservice.http.external.port=
sebserver.webservice.http.redirect.gui=/gui sebserver.webservice.http.redirect.gui=/gui

2
src/test/resources/application-test.properties
View file

@ -13,7 +13,7 @@ spring.datasource.platform=test
spring.flyway.enabled=false spring.flyway.enabled=false
sebserver.init.adminaccount.gen-on-init=false sebserver.init.adminaccount.gen-on-init=false
sebserver.webservice.http.scheme=http sebserver.webservice.http.external.scheme=http
sebserver.webservice.http.redirect.gui=/gui sebserver.webservice.http.redirect.gui=/gui
sebserver.webservice.api.admin.clientId=testClient sebserver.webservice.api.admin.clientId=testClient
sebserver.webservice.api.admin.clientSecret=testClient sebserver.webservice.api.admin.clientSecret=testClient