Unverified Commit c50c4640 authored Dec 4, 2022 by Martin Weise

Merge branch 'dev' into 242-use-mariadb-for-metadata-database-easy

parents c3e53873 7c036708

No related branches found

No related tags found

Show whitespace changes

Inline Side-by-side

Showing

docker-compose.yml 3 additions, 2 deletions

docker-compose.yml
fda-authentication-service/rest-service/src/main/java/at/tuwien/endpoints/TokenEndpoint.java 5 additions, 4 deletions

...vice/src/main/java/at/tuwien/endpoints/TokenEndpoint.java
fda-authentication-service/rest-service/src/test/java/at/tuwien/BaseUnitTest.java 64 additions, 19 deletions

...ce/rest-service/src/test/java/at/tuwien/BaseUnitTest.java
fda-authentication-service/rest-service/src/test/java/at/tuwien/config/H2Utils.java 38 additions, 0 deletions

.../rest-service/src/test/java/at/tuwien/config/H2Utils.java
fda-authentication-service/rest-service/src/test/java/at/tuwien/service/AuthenticationServiceIntegrationTest.java 4 additions, 4 deletions

.../tuwien/service/AuthenticationServiceIntegrationTest.java
fda-authentication-service/rest-service/src/test/java/at/tuwien/service/TimeSecretUnitTest.java 6 additions, 6 deletions

...e/src/test/java/at/tuwien/service/TimeSecretUnitTest.java
fda-authentication-service/rest-service/src/test/java/at/tuwien/service/TokenIntegrationTest.java 110 additions, 0 deletions

...src/test/java/at/tuwien/service/TokenIntegrationTest.java
fda-authentication-service/rest-service/src/test/resources/application.properties 1 addition, 1 deletion

...ce/rest-service/src/test/resources/application.properties
fda-authentication-service/rest-service/src/test/resources/post-init.sql 8 additions, 0 deletions

...ion-service/rest-service/src/test/resources/post-init.sql
fda-authentication-service/rest-service/src/test/resources/pre-init.sql 1 addition, 0 deletions

...tion-service/rest-service/src/test/resources/pre-init.sql
fda-authentication-service/services/src/main/java/at/tuwien/auth/AuthTokenFilter.java 5 additions, 1 deletion

...ervices/src/main/java/at/tuwien/auth/AuthTokenFilter.java
fda-authentication-service/services/src/main/java/at/tuwien/auth/JwtUtils.java 5 additions, 0 deletions

...rvice/services/src/main/java/at/tuwien/auth/JwtUtils.java
fda-authentication-service/services/src/main/java/at/tuwien/config/WebSecurityConfig.java 5 additions, 2 deletions

...ces/src/main/java/at/tuwien/config/WebSecurityConfig.java
fda-authentication-service/services/src/main/java/at/tuwien/repositories/TokenRepository.java 3 additions, 0 deletions

...src/main/java/at/tuwien/repositories/TokenRepository.java
fda-authentication-service/services/src/main/java/at/tuwien/service/TokenService.java 18 additions, 0 deletions

...ervices/src/main/java/at/tuwien/service/TokenService.java
fda-authentication-service/services/src/main/java/at/tuwien/service/impl/TokenServiceImpl.java 26 additions, 0 deletions

...rc/main/java/at/tuwien/service/impl/TokenServiceImpl.java
fda-metadata-db/entities/src/main/java/at/tuwien/entities/user/Token.java 6 additions, 2 deletions

...entities/src/main/java/at/tuwien/entities/user/Token.java
fda-metadata-db/setup-schema.sql 40 additions, 29 deletions

fda-metadata-db/setup-schema.sql
fda-query-service/rest-service/src/main/java/at/tuwien/endpoint/AbstractEndpoint.java 27 additions, 4 deletions

...ce/src/main/java/at/tuwien/endpoint/AbstractEndpoint.java
fda-query-service/rest-service/src/main/java/at/tuwien/endpoint/QueryEndpoint.java 3 additions, 0 deletions

...rvice/src/main/java/at/tuwien/endpoint/QueryEndpoint.java

with 378 additions and 74 deletions

Please register or to comment