Skip to content

Commit 32257c5

Browse files
mohamed-tamanmohamed-taman
committed
Merge branch 'release/3.0'
2 parents 7f48482 + f31768e commit 32257c5

File tree

66 files changed

+653
-562
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+653
-562
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎frontend/package.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,35 +31,35 @@
3131
"@angular/platform-browser": "~12.2.3",
3232
"@angular/platform-browser-dynamic": "~12.2.3",
3333
"@angular/router": "~12.2.3",
34-
"@popperjs/core": "^2.9.3",
35-
"bootstrap": "^4.6.0",
34+
"@popperjs/core": "^2.6.0",
35+
"bootstrap": "^4.5.3",
3636
"build": "^0.1.4",
37-
"jquery": "^3.6.0",
38-
"js-yaml": "^4.1.0",
39-
"ngx-bootstrap-icons": "^1.5.3",
37+
"jquery": "^3.5.1",
38+
"js-yaml": "^3.14.1",
39+
"ngx-bootstrap-icons": "^1.3.1",
4040
"popper.js": "^1.16.1",
41-
"rxjs": "~7.3.0",
42-
"tslib": "^2.3.1",
43-
"uglify-js": "^3.14.1",
41+
"rxjs": "~6.6.3",
42+
"tslib": "^2.0.3",
43+
"uglify-js": "^3.12.2",
4444
"zone.js": "~0.11.4"
4545
},
4646
"devDependencies": {
4747
"@angular-devkit/build-angular": "~12.2.3",
4848
"@angular/cli": "~12.2.3",
4949
"@angular/compiler-cli": "~12.2.3",
50-
"@types/jasmine": "~3.8.2",
51-
"@types/node": "^16.7.6",
52-
"codelyzer": "^6.0.2",
53-
"jasmine-core": "~3.9.0",
54-
"jasmine-spec-reporter": "~7.0.0",
50+
"@types/jasmine": "~3.6.2",
51+
"@types/node": "^14.14.14",
52+
"codelyzer": "^6.0.1",
53+
"jasmine-core": "~3.6.0",
54+
"jasmine-spec-reporter": "~6.0.0",
5555
"karma": "~6.3.4",
5656
"karma-chrome-launcher": "~3.1.0",
5757
"karma-coverage": "~2.0.3",
5858
"karma-jasmine": "~4.0.1",
59-
"karma-jasmine-html-reporter": "^1.7.0",
59+
"karma-jasmine-html-reporter": "^1.5.4",
6060
"protractor": "~7.0.0",
61-
"ts-node": "~10.2.1",
61+
"ts-node": "~9.1.1",
6262
"tslint": "~6.1.3",
6363
"typescript": "~4.3.5"
6464
}
65-
}
65+
}

‎frontend/src/environments/environment.prod.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
export const environment = {
22
production: true,
3-
apiUrl: 'http://localhost:8090/flight/service/api'
3+
apiUrl: 'http://localhost:8090/api/v1/flight/service'
44
};

‎frontend/src/environments/environment.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
export const environment = {
66
production: false,
77
//apiUrl: 'http://localhost:4200'
8-
apiUrl: 'http://localhost:8090/flight/service/api'
8+
apiUrl: 'http://localhost:8090/api/v1/flight/service'
99
};
1010

1111
/*

‎pom.xml‎

Lines changed: 41 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<parent>
77
<groupId>org.springframework.boot</groupId>
88
<artifactId>spring-boot-starter-parent</artifactId>
9-
<version>2.7.0-M3</version>
9+
<version>3.0.0-M2</version>
1010
<relativePath/> <!-- lookup parent from repository -->
1111
</parent>
1212

1313
<groupId>org.siriusxi.htec</groupId>
1414
<artifactId>flight-advisor</artifactId>
15-
<version>2.8</version>
15+
<version>3.0</version>
1616
<name>Flight Advisor API</name>
1717
<description>Flight Advisor API Spring Boot based Application.</description>
1818
<packaging>jar</packaging>
@@ -58,7 +58,9 @@
5858
</licenses>
5959

6060
<properties>
61-
<java.version>18</java.version>
61+
<maven.compiler.release>18</maven.compiler.release>
62+
<maven.compiler.source>18</maven.compiler.source>
63+
<maven.compiler.target>18</maven.compiler.target>
6264
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6365
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
6466

@@ -67,14 +69,16 @@
6769
<maven.failsafe.plugin.version>3.0.0-M5</maven.failsafe.plugin.version>
6870
<io.jsonwebtoken.version>0.11.2</io.jsonwebtoken.version>
6971
<org.mapstruct.version>1.5.0.RC1</org.mapstruct.version>
70-
<org.springdoc.version>1.6.7</org.springdoc.version>
72+
<org.springdoc.version>2.0.0-M1</org.springdoc.version>
7173
<lombok.version>1.18.22</lombok.version>
7274
<opencsv.version>5.6</opencsv.version>
7375
<hipster-core.version>1.0.1</hipster-core.version>
7476
<datasource-proxy-sbs.version>1.8.0</datasource-proxy-sbs.version>
7577
<commons-fileupload.version>1.4</commons-fileupload.version>
7678
<commons-io.version>2.11.0</commons-io.version>
7779
<commons-collections4.version>4.4</commons-collections4.version>
80+
<hibernate-core-jakarta.version>5.6.5.Final</hibernate-core-jakarta.version>
81+
<jackson-databind.version>2.13.2.2</jackson-databind.version>
7882
</properties>
7983

8084
<dependencies>
@@ -91,15 +95,15 @@
9195
<exclusions>
9296
<exclusion>
9397
<groupId>org.hibernate</groupId>
94-
<artifactId>hibernate-core</artifactId>
98+
<artifactId>hibernate-core-jakarta</artifactId>
9599
</exclusion>
96100
</exclusions>
97101
</dependency>
98102

99103
<dependency>
100104
<groupId>org.hibernate</groupId>
101-
<artifactId>hibernate-core</artifactId>
102-
<version>5.6.5.Final</version>
105+
<artifactId>hibernate-core-jakarta</artifactId>
106+
<version>${hibernate-core-jakarta.version}</version>
103107
</dependency>
104108

105109
<dependency>
@@ -120,24 +124,45 @@
120124
<dependency>
121125
<groupId>org.springframework.boot</groupId>
122126
<artifactId>spring-boot-starter-web</artifactId>
127+
<!--
128+
To fix CVE-2020-36518
129+
https://advisory.checkmarx.net/advisory/vulnerability/CVE-2020-36518/
130+
-->
131+
<exclusions>
132+
<exclusion>
133+
<groupId>com.fasterxml.jackson.core</groupId>
134+
<artifactId>jackson-databind</artifactId>
135+
</exclusion>
136+
</exclusions>
123137
</dependency>
124138

125139
<dependency>
126140
<groupId>org.springdoc</groupId>
127-
<artifactId>springdoc-openapi-ui</artifactId>
141+
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
128142
<version>${org.springdoc.version}</version>
143+
<!--
144+
To fix CVE-2020-36518
145+
https://advisory.checkmarx.net/advisory/vulnerability/CVE-2020-36518/
146+
-->
147+
<exclusions>
148+
<exclusion>
149+
<groupId>com.fasterxml.jackson.core</groupId>
150+
<artifactId>jackson-databind</artifactId>
151+
</exclusion>
152+
</exclusions>
129153
</dependency>
130154

131155
<dependency>
132-
<groupId>org.springframework.boot</groupId>
133-
<artifactId>spring-boot-starter-hateoas</artifactId>
156+
<groupId>com.fasterxml.jackson.core</groupId>
157+
<artifactId>jackson-databind</artifactId>
158+
<version>${jackson-databind.version}</version>
134159
</dependency>
135160

136161
<dependency>
137-
<groupId>org.springdoc</groupId>
138-
<artifactId>springdoc-openapi-hateoas</artifactId>
139-
<version>${org.springdoc.version}</version>
162+
<groupId>org.springframework.boot</groupId>
163+
<artifactId>spring-boot-starter-hateoas</artifactId>
140164
</dependency>
165+
141166
<!-- End - Web, REST, and their OpenAPI dependencies -->
142167

143168
<!-- Start - Security dependencies -->
@@ -146,11 +171,6 @@
146171
<artifactId>spring-boot-starter-security</artifactId>
147172
</dependency>
148173

149-
<dependency>
150-
<groupId>org.springdoc</groupId>
151-
<artifactId>springdoc-openapi-security</artifactId>
152-
<version>${org.springdoc.version}</version>
153-
</dependency>
154174

155175
<!-- Start - JWT library for authentication libraries -->
156176
<dependency>
@@ -191,6 +211,7 @@
191211
<dependency>
192212
<groupId>org.projectlombok</groupId>
193213
<artifactId>lombok</artifactId>
214+
<version>${lombok.version}</version>
194215
<optional>true</optional>
195216
</dependency>
196217

@@ -224,29 +245,6 @@
224245
<artifactId>commons-collections4</artifactId>
225246
<version>${commons-collections4.version}</version>
226247
</dependency>
227-
<!-- The Commons FileUpload package makes it easy to add robust, high-performance,
228-
file upload capability to your servlets and web applications. -->
229-
<dependency>
230-
<groupId>commons-fileupload</groupId>
231-
<artifactId>commons-fileupload</artifactId>
232-
<version>${commons-fileupload.version}</version>
233-
<exclusions>
234-
<!--
235-
To fix CVE-2021-29425
236-
https://advisory.checkmarx.net/advisory/vulnerability/CVE-2021-29425/
237-
-->
238-
<exclusion>
239-
<groupId>commons-io</groupId>
240-
<artifactId>commons-io</artifactId>
241-
</exclusion>
242-
</exclusions>
243-
</dependency>
244-
245-
<dependency>
246-
<groupId>commons-io</groupId>
247-
<artifactId>commons-io</artifactId>
248-
<version>${commons-io.version}</version>
249-
</dependency>
250248

251249
<!-- Add hipster-core instead of hipster-all for basic functionality. -->
252250
<dependency>
@@ -262,11 +260,13 @@
262260
<artifactId>spring-boot-starter-test</artifactId>
263261
<scope>test</scope>
264262
</dependency>
263+
265264
<dependency>
266265
<groupId>org.springframework.security</groupId>
267266
<artifactId>spring-security-test</artifactId>
268267
<scope>test</scope>
269268
</dependency>
269+
270270
<dependency>
271271
<groupId>org.hamcrest</groupId>
272272
<artifactId>hamcrest-library</artifactId>
@@ -300,9 +300,7 @@
300300
</plugin>
301301
<plugin>
302302
<artifactId>maven-compiler-plugin</artifactId>
303-
<version>${maven-compiler-plugin.version}</version>
304303
<configuration>
305-
<release>${java.version}</release>
306304
<enablePreview>true</enablePreview>
307305
<annotationProcessorPaths>
308306
<path>

‎src/main/java/org/siriusxi/htec/fa/FlightAdvisorApplication.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public static void main(String[] args) {
2121
}
2222

2323
@Bean
24-
public ApplicationRunner atStartup(){
24+
public ApplicationRunner atStartup() {
2525
return args -> log.info("Flight Advisor Application is Up & Running... ");
2626
}
2727
}

‎src/main/java/org/siriusxi/htec/fa/api/AuthController.java‎ renamed to ‎src/main/java/org/siriusxi/htec/fa/api/controller/AuthController.java‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
package org.siriusxi.htec.fa.api;
1+
package org.siriusxi.htec.fa.api.controller;
22

33
import io.swagger.v3.oas.annotations.Operation;
44
import io.swagger.v3.oas.annotations.tags.Tag;
5+
import jakarta.validation.Valid;
56
import lombok.extern.log4j.Log4j2;
6-
import org.siriusxi.htec.fa.domain.dto.request.AuthRequest;
7-
import org.siriusxi.htec.fa.domain.dto.request.CreateUserRequest;
8-
import org.siriusxi.htec.fa.domain.dto.response.UserView;
9-
import org.siriusxi.htec.fa.domain.mapper.UserMapper;
10-
import org.siriusxi.htec.fa.domain.model.User;
7+
import org.siriusxi.htec.fa.api.model.request.AuthRequest;
8+
import org.siriusxi.htec.fa.api.model.request.CreateUserRequest;
9+
import org.siriusxi.htec.fa.api.model.response.UserView;
10+
import org.siriusxi.htec.fa.domain.User;
11+
import org.siriusxi.htec.fa.infra.mapper.UserMapper;
1112
import org.siriusxi.htec.fa.infra.security.jwt.JwtTokenHelper;
1213
import org.siriusxi.htec.fa.service.UserService;
1314
import org.springframework.http.HttpHeaders;
@@ -21,8 +22,6 @@
2122
import org.springframework.web.bind.annotation.RestController;
2223
import org.springframework.web.client.HttpClientErrorException;
2324

24-
import javax.validation.Valid;
25-
2625
import static org.springframework.http.HttpStatus.UNAUTHORIZED;
2726

2827
/**
@@ -60,18 +59,18 @@ public AuthController(AuthenticationManager authenticationManager,
6059
public ResponseEntity<UserView> authenticate(@RequestBody @Valid AuthRequest request) {
6160
try {
6261
var authenticate = authenticationManager
63-
.authenticate(new UsernamePasswordAuthenticationToken(
64-
request.username(),
65-
request.password()));
62+
.authenticate(new UsernamePasswordAuthenticationToken(
63+
request.username(),
64+
request.password()));
6665

6766
User user = (User) authenticate.getPrincipal();
6867

6968
return ResponseEntity.ok()
70-
.header(HttpHeaders.AUTHORIZATION,
71-
JwtTokenHelper.generateAccessToken(
72-
user.getId(),
73-
user.getUsername()))
74-
.body(userMapper.toView(user));
69+
.header(HttpHeaders.AUTHORIZATION,
70+
JwtTokenHelper.generateAccessToken(
71+
user.getId(),
72+
user.getUsername()))
73+
.body(userMapper.toView(user));
7574
} catch (BadCredentialsException ex) {
7675
throw new HttpClientErrorException(UNAUTHORIZED, UNAUTHORIZED.getReasonPhrase());
7776
}

0 commit comments

Comments
 (0)