Skip to content

Commit fab24a8

Browse files
author
kslysz
committed
v.3.5.1
- disabled swagger (looking for a new library, springfox is not compatible with new Spring) - fixed origin in UrlBuilder - upgraded springframework libraries
1 parent 991fa1a commit fab24a8

18 files changed

Lines changed: 287 additions & 257 deletions

‎frontend/src/utils/UrlBuilder.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export const getOrigin = () => {
2-
// const origin = window.location.origin;
3-
const origin = 'http://localhost:8080';
2+
const origin = window.location.origin;
3+
// const origin = 'http://localhost:8080';
44
return origin + getContextPath();
55
}
66

‎src/main/java/pl/databucket/server/configuration/SwaggerConfiguration.java‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,54 @@
1-
package pl.databucket.server.configuration;
2-
3-
import org.springframework.context.annotation.Bean;
4-
import org.springframework.context.annotation.Configuration;
5-
6-
import springfox.documentation.builders.ApiInfoBuilder;
7-
import springfox.documentation.builders.PathSelectors;
8-
import springfox.documentation.service.ApiInfo;
9-
import springfox.documentation.service.ApiKey;
10-
import springfox.documentation.service.AuthorizationScope;
11-
import springfox.documentation.service.SecurityReference;
12-
import springfox.documentation.spi.DocumentationType;
13-
import springfox.documentation.spi.service.contexts.SecurityContext;
14-
import springfox.documentation.spring.web.plugins.Docket;
15-
import springfox.documentation.swagger2.annotations.EnableSwagger2;
16-
17-
import static io.swagger.v3.oas.annotations.enums.SecuritySchemeIn.HEADER;
18-
import static java.util.Collections.singletonList;
19-
import static org.springframework.http.HttpHeaders.AUTHORIZATION;
20-
21-
@Configuration
22-
@EnableSwagger2
23-
public class SwaggerConfiguration {
24-
25-
@Bean
26-
public Docket confDataContext() {
27-
return new Docket(DocumentationType.SWAGGER_2)
28-
.securitySchemes(singletonList(new ApiKey("JWT", AUTHORIZATION, HEADER.name())))
29-
.securityContexts(singletonList(
30-
SecurityContext.builder()
31-
.securityReferences(
32-
singletonList(SecurityReference.builder()
33-
.reference("JWT")
34-
.scopes(new AuthorizationScope[0])
35-
.build()
36-
)
37-
)
38-
.build())
39-
)
40-
.select()
41-
.paths(PathSelectors.regex(".*/api/(bucket/.*|public/signin)"))
42-
.paths(PathSelectors.regex("(?!.*/history.*).+")) // do not show data history methods
43-
.build()
44-
.useDefaultResponseMessages(false)
45-
.apiInfo(apiInfo());
46-
}
47-
48-
private ApiInfo apiInfo() {
49-
return new ApiInfoBuilder()
50-
.title("Databucket API")
51-
.version("3.5.0")
52-
.build();
53-
}
54-
}
1+
//package pl.databucket.server.configuration;
2+
//
3+
//import org.springframework.context.annotation.Bean;
4+
//import org.springframework.context.annotation.Configuration;
5+
//
6+
//import springfox.documentation.builders.ApiInfoBuilder;
7+
//import springfox.documentation.builders.PathSelectors;
8+
//import springfox.documentation.service.ApiInfo;
9+
//import springfox.documentation.service.ApiKey;
10+
//import springfox.documentation.service.AuthorizationScope;
11+
//import springfox.documentation.service.SecurityReference;
12+
//import springfox.documentation.spi.DocumentationType;
13+
//import springfox.documentation.spi.service.contexts.SecurityContext;
14+
//import springfox.documentation.spring.web.plugins.Docket;
15+
//import springfox.documentation.swagger2.annotations.EnableSwagger2;
16+
//
17+
//import static io.swagger.v3.oas.annotations.enums.SecuritySchemeIn.HEADER;
18+
//import static java.util.Collections.singletonList;
19+
//import static org.springframework.http.HttpHeaders.AUTHORIZATION;
20+
//
21+
//@Configuration
22+
//@EnableSwagger2
23+
//public class SwaggerConfiguration {
24+
//
25+
// @Bean
26+
// public Docket confDataContext() {
27+
// return new Docket(DocumentationType.SWAGGER_2)
28+
// .securitySchemes(singletonList(new ApiKey("JWT", AUTHORIZATION, HEADER.name())))
29+
// .securityContexts(singletonList(
30+
// SecurityContext.builder()
31+
// .securityReferences(
32+
// singletonList(SecurityReference.builder()
33+
// .reference("JWT")
34+
// .scopes(new AuthorizationScope[0])
35+
// .build()
36+
// )
37+
// )
38+
// .build())
39+
// )
40+
// .select()
41+
// .paths(PathSelectors.regex(".*/api/(bucket/.*|public/signin)"))
42+
// .paths(PathSelectors.regex("(?!.*/history.*).+")) // do not show data history methods
43+
// .build()
44+
// .useDefaultResponseMessages(false)
45+
// .apiInfo(apiInfo());
46+
// }
47+
//
48+
// private ApiInfo apiInfo() {
49+
// return new ApiInfoBuilder()
50+
// .title("Databucket API")
51+
// .version("3.5.0")
52+
// .build();
53+
// }
54+
//}

0 commit comments

Comments
 (0)