) {
22 | this.dateAdapter.setLocale('en-GB'); //dd/MM/yyyy
23 | }
24 |
25 | ngOnInit(): void {
26 | this.authStatusSub = this.authService.getAuthStatusListener().subscribe(
27 | authStatus => {
28 | this.isLoading = false;
29 | this.loggedUserId = this.authService.getUserId();
30 | }
31 | );
32 | this.isLoading = false;
33 | this.loggedUserId = this.authService.getUserId();
34 | this.form = new FormGroup({
35 | firstName: new FormControl(null, []),
36 | lastName: new FormControl(null, []),
37 | birthdate: new FormControl(null, []),
38 | city: new FormControl(null, []),
39 | country: new FormControl(null, [])
40 | });
41 | this.route.paramMap.subscribe((paramMap: ParamMap) => {
42 | this.userId = Number(paramMap.get('userId'));
43 | this.isLoading = true;
44 | this.authService.getUserById(this.userId)
45 | .subscribe(userData => {
46 | this.isLoading = false;
47 | this.form.setValue({
48 | firstName: userData.firstName,
49 | lastName: userData.lastName,
50 | birthdate: new Date(userData.timestamp),
51 | city: userData.city,
52 | country: userData.country
53 | });
54 | });
55 | });
56 | }
57 |
58 | ngOnDestroy(): void {
59 | this.authStatusSub.unsubscribe();
60 | }
61 |
62 | }
63 |
--------------------------------------------------------------------------------
/frontend/src/polyfills.ts:
--------------------------------------------------------------------------------
1 | /**
2 | * This file includes polyfills needed by Angular and is loaded before the app.
3 | * You can add your own extra polyfills to this file.
4 | *
5 | * This file is divided into 2 sections:
6 | * 1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers.
7 | * 2. Application imports. Files imported after ZoneJS that should be loaded before your main
8 | * file.
9 | *
10 | * The current setup is for so-called "evergreen" browsers; the last versions of browsers that
11 | * automatically update themselves. This includes recent versions of Safari, Chrome (including
12 | * Opera), Edge on the desktop, and iOS and Chrome on mobile.
13 | *
14 | * Learn more in https://angular.io/guide/browser-support
15 | */
16 |
17 | /***************************************************************************************************
18 | * BROWSER POLYFILLS
19 | */
20 |
21 | /**
22 | * By default, zone.js will patch all possible macroTask and DomEvents
23 | * user can disable parts of macroTask/DomEvents patch by setting following flags
24 | * because those flags need to be set before `zone.js` being loaded, and webpack
25 | * will put import in the top of bundle, so user need to create a separate file
26 | * in this directory (for example: zone-flags.ts), and put the following flags
27 | * into that file, and then add the following code before importing zone.js.
28 | * import './zone-flags';
29 | *
30 | * The flags allowed in zone-flags.ts are listed here.
31 | *
32 | * The following flags will work for all browsers.
33 | *
34 | * (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
35 | * (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
36 | * (window as any).__zone_symbol__UNPATCHED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
37 | *
38 | * in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
39 | * with the following flag, it will bypass `zone.js` patch for IE/Edge
40 | *
41 | * (window as any).__Zone_enable_cross_context_check = true;
42 | *
43 | */
44 |
45 | /***************************************************************************************************
46 | * Zone JS is required by default for Angular itself.
47 | */
48 | import 'zone.js'; // Included with Angular CLI.
49 |
50 |
51 | /***************************************************************************************************
52 | * APPLICATION IMPORTS
53 | */
54 |
--------------------------------------------------------------------------------
/frontend/src/app/cars/car-list/car-list.component.ts:
--------------------------------------------------------------------------------
1 | import { Component, OnDestroy, OnInit } from '@angular/core';
2 | import { PageEvent } from '@angular/material/paginator';
3 | import { Subscription } from 'rxjs';
4 | import { AuthService } from 'src/app/auth/auth.service';
5 | import { Car } from '../car.model';
6 | import { CarsService } from '../cars.service';
7 |
8 | @Component({
9 | selector: 'app-car-list',
10 | templateUrl: './car-list.component.html',
11 | styleUrls: ['./car-list.component.css']
12 | })
13 | export class CarListComponent implements OnInit, OnDestroy {
14 | cars: Car[] = [];
15 | isLoading: boolean = false;
16 | totalCars = 0;
17 | carsPerPage = 2;
18 | currentPage = 0;
19 | pageSizeOptions = [1, 2, 5, 10, 20];
20 | userIsAuthenticated: boolean = false;
21 | userId!: number;
22 | displayedColumns: string[] = ['title', 'brand', 'model', 'price', 'carInfo', 'path'];
23 | private carsSub!: Subscription;
24 | private authStatusSub!: Subscription;
25 |
26 | constructor(public carsService: CarsService, private authService: AuthService) { }
27 |
28 | ngOnInit(): void {
29 | this.isLoading = true;
30 | this.carsService.getCars(this.carsPerPage, this.currentPage);
31 | this.userId = this.authService.getUserId();
32 | this.carsSub = this.carsService.getCarsUpdateListener()
33 | .subscribe((carData: {cars: Car[], carCount: number}) => {
34 | this.isLoading = false;
35 | this.totalCars = carData.carCount;
36 | this.cars = carData.cars;
37 | });
38 | this.userIsAuthenticated = this.authService.getIsAuth();
39 | this.authStatusSub = this.authService.getAuthStatusListener()
40 | .subscribe(isAuthenticated => {
41 | this.userIsAuthenticated = isAuthenticated;
42 | this.userId = this.authService.getUserId();
43 | });
44 | }
45 |
46 | onChangedPage(pageData: PageEvent) {
47 | this.isLoading = true;
48 | this.currentPage = pageData.pageIndex;
49 | this.carsPerPage = pageData.pageSize;
50 | this.carsService.getCars(this.carsPerPage, this.currentPage);
51 | }
52 |
53 | onDelete(carId: number) {
54 | this.isLoading = true;
55 | this.carsService.deleteCar(carId)
56 | .subscribe({
57 | next: response => {
58 | this.carsService.getCars(this.carsPerPage, this.currentPage);
59 | },
60 | error: error => {
61 | this.isLoading = false;
62 | }
63 | });
64 | }
65 |
66 | ngOnDestroy(): void {
67 | this.carsSub.unsubscribe();
68 | this.authStatusSub.unsubscribe();
69 | }
70 |
71 | }
72 |
--------------------------------------------------------------------------------
/frontend/src/app/cars/car-info/car-info.component.html:
--------------------------------------------------------------------------------
1 |
5 |
6 |
10 |
11 |
12 |
13 | Novi oglas
14 |
15 |
16 |
59 |
63 |
--------------------------------------------------------------------------------
/frontend/src/app/cars/my-car-list/my-car-list.component.ts:
--------------------------------------------------------------------------------
1 | import { Component, OnDestroy, OnInit } from '@angular/core';
2 | import { Subscription } from 'rxjs';
3 | import { Car } from '../car.model';
4 | import { CarsService } from '../cars.service';
5 | import { AuthService } from 'src/app/auth/auth.service';
6 | import { PageEvent } from '@angular/material/paginator';
7 |
8 | @Component({
9 | selector: 'app-my-car-list',
10 | templateUrl: './my-car-list.component.html',
11 | styleUrls: ['./my-car-list.component.css']
12 | })
13 | export class MyCarListComponent implements OnInit, OnDestroy {
14 | myCars: Car[] = [];
15 | isLoading: boolean = false;
16 | totalCars = 0;
17 | carsPerPage = 2;
18 | currentPage = 0;
19 | pageSizeOptions = [1, 2, 5, 10, 20];
20 | userIsAuthenticated: boolean = false;
21 | userId!: number;
22 | private myCarsSub!: Subscription;
23 | private authStatusSub!: Subscription;
24 |
25 | constructor(public carsService: CarsService, public authService: AuthService) { }
26 |
27 | ngOnInit(): void {
28 | this.isLoading = true;
29 | this.userId = this.authService.getUserId();
30 | this.carsService.getMyCars(this.userId, this.carsPerPage, this.currentPage);
31 | this.myCarsSub = this.carsService.getMyCarsUpdateListener()
32 | .subscribe((myCarData: {cars: Car[], carCount: number}) => {
33 | this.isLoading = false;
34 | this.totalCars = myCarData.carCount;
35 | this.myCars = myCarData.cars;
36 | });
37 | this.userIsAuthenticated = this.authService.getIsAuth();
38 | this.authStatusSub = this.authService.getAuthStatusListener()
39 | .subscribe(isAuthenticated => {
40 | this.userIsAuthenticated = isAuthenticated;
41 | this.userId = this.authService.getUserId();
42 | });
43 | }
44 |
45 | onChangedPage(pageData: PageEvent) {
46 | this.isLoading = true;
47 | this.currentPage = pageData.pageIndex;
48 | this.carsPerPage = pageData.pageSize;
49 | this.userId = this.authService.getUserId();
50 | this.carsService.getMyCars(this.userId, this.carsPerPage, this.currentPage);
51 | }
52 |
53 | onDelete(carId: number) {
54 | this.isLoading = true;
55 | this.carsService.deleteCar(carId)
56 | .subscribe({
57 | next: response => {
58 | console.log(response);
59 | this.carsService.getMyCars(this.userId, this.carsPerPage, this.currentPage);
60 | },
61 | error: error => {
62 | console.log(error);
63 | this.isLoading = false;
64 | }
65 | });
66 | }
67 |
68 | ngOnDestroy(): void {
69 | this.myCarsSub.unsubscribe();
70 | this.authStatusSub.unsubscribe();
71 | }
72 |
73 | }
74 |
--------------------------------------------------------------------------------
/backend/pom.xml:
--------------------------------------------------------------------------------
1 |
2 |
5 | 4.0.0
6 |
7 | org.springframework.boot
8 | spring-boot-starter-parent
9 | 2.6.4
10 |
11 |
12 | com.app
13 | backend
14 | 0.0.1-SNAPSHOT
15 | jar
16 | backend
17 | Demo project for Spring Boot
18 |
19 | 11
20 |
21 |
22 |
23 | org.springframework.boot
24 | spring-boot-starter-web
25 |
26 |
27 | org.springframework.boot
28 | spring-boot-starter-data-jpa
29 |
30 |
31 | mysql
32 | mysql-connector-java
33 |
34 |
35 | org.apache.tika
36 | tika-core
37 | 1.24.1
38 |
39 |
40 |
41 | org.springframework.boot
42 | spring-boot-starter-security
43 |
44 |
45 | com.auth0
46 | java-jwt
47 | 3.18.1
48 |
49 |
50 | org.springframework.boot
51 | spring-boot-devtools
52 | runtime
53 | true
54 |
55 |
56 | org.projectlombok
57 | lombok
58 | true
59 |
60 |
61 | org.springframework.security
62 | spring-security-test
63 | test
64 |
65 |
66 |
67 | org.springframework.boot
68 | spring-boot-starter-test
69 | test
70 |
71 |
72 |
73 |
74 |
75 |
76 | org.springframework.boot
77 | spring-boot-maven-plugin
78 |
79 |
80 |
81 | org.projectlombok
82 | lombok
83 |
84 |
85 |
86 |
87 |
88 |
89 |
90 |
91 |
--------------------------------------------------------------------------------
/frontend/src/app/auth/register/register.component.html:
--------------------------------------------------------------------------------
1 |
2 |
3 | Registracija korisnika
4 |
5 |
6 |
7 |
60 |
--------------------------------------------------------------------------------
/frontend/src/app/cars/car-info/car-info.component.ts:
--------------------------------------------------------------------------------
1 | import { Component, OnDestroy, OnInit } from '@angular/core';
2 | import { FormControl, FormGroup } from '@angular/forms';
3 | import { ActivatedRoute, ParamMap } from '@angular/router';
4 | import { Subscription } from 'rxjs';
5 | import { AdminService } from 'src/app/admin/admin.service';
6 | import { AuthService } from 'src/app/auth/auth.service';
7 | import { CarsService } from '../cars.service';
8 |
9 | @Component({
10 | selector: 'app-car-info',
11 | templateUrl: './car-info.component.html',
12 | styleUrls: ['./car-info.component.css']
13 | })
14 | export class CarInfoComponent implements OnInit, OnDestroy {
15 | path!:string;
16 | isLoading: boolean = false;
17 | form!: FormGroup;
18 | ownerName!: string;
19 | ownerId!: number;
20 | userIsAuthenticated: boolean = false;
21 | userIsAdmin: boolean = false;
22 | private carId!: number;
23 | private authStatusSub!: Subscription;
24 | private adminStatusSub!: Subscription;
25 |
26 | constructor(public carsService: CarsService, public route: ActivatedRoute, private authService: AuthService, private adminService: AdminService) { }
27 |
28 | ngOnInit(): void {
29 | this.userIsAuthenticated = this.authService.getIsAuth();
30 | this.authStatusSub = this.authService.getAuthStatusListener()
31 | .subscribe(authStatus => {
32 | this.userIsAuthenticated = authStatus;
33 | this.isLoading = false;
34 | });
35 | this.userIsAdmin = this.authService.getIsAdmin();
36 | this.adminStatusSub = this.authService.getAdminStatusListener()
37 | .subscribe(isAdmin => {
38 | this.userIsAdmin = isAdmin;
39 | });
40 | this.isLoading = false;
41 | this.form = new FormGroup({
42 | title: new FormControl(null, []),
43 | brand: new FormControl(null, []),
44 | model: new FormControl(null, []),
45 | mileage: new FormControl(null, []),
46 | registration: new FormControl(null, []),
47 | price: new FormControl(null,[]),
48 | fuel: new FormControl(null, []),
49 | color: new FormControl(null, []),
50 | phone: new FormControl(null, []),
51 | content: new FormControl(null, [])
52 | });
53 | this.route.paramMap.subscribe((paramMap: ParamMap) => {
54 | this.carId = Number(paramMap.get('carId'));
55 | this.isLoading = true;
56 | this.carsService.getCar(this.carId)
57 | .subscribe(carData => {
58 | this.path = carData.path;
59 | this.isLoading = false;
60 | this.ownerName = carData.owner.firstName + " " + carData.owner.lastName;
61 | this.ownerId = carData.owner.id;
62 | this.form.setValue({
63 | title: carData.title,
64 | brand: carData.brand.name,
65 | model: carData.model.name,
66 | mileage: carData.mileage,
67 | registration: carData.registration,
68 | price: carData.price,
69 | fuel: carData.fuel.name,
70 | color: carData.color.name,
71 | phone: carData.phone,
72 | content: carData.content
73 | });
74 | });
75 | });
76 | }
77 |
78 | onAdminDelete() {
79 | if (this.carId) {
80 | this.isLoading = true;
81 | this.adminService.adminDeleteCar(this.carId);
82 | }
83 | }
84 |
85 | ngOnDestroy(): void {
86 | this.authStatusSub.unsubscribe();
87 | this.adminStatusSub.unsubscribe();
88 | }
89 |
90 |
91 | }
92 |
--------------------------------------------------------------------------------
/backend/src/main/java/com/app/backend/filters/CustomAuthorizationFilter.java:
--------------------------------------------------------------------------------
1 | package com.app.backend.filters;
2 |
3 | import java.io.IOException;
4 | import java.util.ArrayList;
5 | import java.util.Collection;
6 | import java.util.HashMap;
7 | import java.util.Map;
8 |
9 | import javax.servlet.FilterChain;
10 | import javax.servlet.ServletException;
11 | import javax.servlet.http.HttpServletRequest;
12 | import javax.servlet.http.HttpServletResponse;
13 |
14 | import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
15 | import org.springframework.security.core.authority.SimpleGrantedAuthority;
16 | import org.springframework.security.core.context.SecurityContextHolder;
17 | import org.springframework.web.filter.OncePerRequestFilter;
18 |
19 | import com.auth0.jwt.JWT;
20 | import com.auth0.jwt.algorithms.Algorithm;
21 | import com.auth0.jwt.interfaces.DecodedJWT;
22 | import com.auth0.jwt.interfaces.JWTVerifier;
23 | import com.fasterxml.jackson.databind.ObjectMapper;
24 |
25 | import lombok.extern.slf4j.Slf4j;
26 |
27 | @Slf4j
28 | public class CustomAuthorizationFilter extends OncePerRequestFilter {
29 |
30 | @Override
31 | protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
32 | throws ServletException, IOException {
33 | if (request.getServletPath().equals("/api/users/login") || request.getServletPath().equals("/api/users/signup")
34 | || request.getServletPath().contains("/api/posts/allPosts")) {
35 | log.info("Ovde se preskace za neke rute {}", request.getRequestURI());
36 | filterChain.doFilter(request, response);
37 | } else {
38 | String authorizationHeader = request.getHeader(org.springframework.http.HttpHeaders.AUTHORIZATION);
39 | if (authorizationHeader != null && authorizationHeader.startsWith("Bearer ")) {
40 | log.info("Header nije null: {}, {}", authorizationHeader, request.getRequestURI());
41 | try {
42 | String token = authorizationHeader.substring("Bearer ".length());
43 | Algorithm algorithm = Algorithm.HMAC256("secret".getBytes());
44 | JWTVerifier verifier = JWT.require(algorithm).build();
45 | DecodedJWT decodedJWT = verifier.verify(token);
46 | String username = decodedJWT.getSubject();
47 | String[] roles = decodedJWT.getClaim("roles").asArray(String.class);
48 | Collection authorities = new ArrayList<>();
49 | java.util.Arrays.stream(roles).forEach(role -> {
50 | authorities.add(new SimpleGrantedAuthority(role));
51 | });
52 | UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username, null, authorities);
53 | SecurityContextHolder.getContext().setAuthentication(authenticationToken);
54 | filterChain.doFilter(request, response);
55 | } catch (Exception exception) {
56 | log.error("Error logging in: {}", exception.getMessage());
57 | response.setHeader("error", exception.getMessage());
58 | response.setStatus(org.springframework.http.HttpStatus.FORBIDDEN.value());
59 | Map error = new HashMap<>();
60 | error.put("error_message", exception.getMessage());
61 | response.setContentType(org.springframework.http.MediaType.APPLICATION_JSON_VALUE);
62 | new ObjectMapper().writeValue(response.getOutputStream(), error);
63 | }
64 | } else {
65 | log.info("Ako je header null {}", request.getRequestURI());
66 | filterChain.doFilter(request, response);
67 | }
68 | }
69 | }
70 |
71 | }
72 |
--------------------------------------------------------------------------------
/backend/src/main/java/com/app/backend/filters/CustomAuthenticationFilter.java:
--------------------------------------------------------------------------------
1 | package com.app.backend.filters;
2 |
3 | import java.io.IOException;
4 | import java.util.Date;
5 | import java.util.HashMap;
6 | import java.util.Map;
7 | import java.util.stream.Collectors;
8 |
9 | import javax.servlet.FilterChain;
10 | import javax.servlet.ServletException;
11 | import javax.servlet.http.HttpServletRequest;
12 | import javax.servlet.http.HttpServletResponse;
13 |
14 | import org.springframework.security.authentication.AuthenticationManager;
15 | import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
16 | import org.springframework.security.core.Authentication;
17 | import org.springframework.security.core.AuthenticationException;
18 | import org.springframework.security.core.GrantedAuthority;
19 | import org.springframework.security.core.userdetails.User;
20 | import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
21 |
22 | import com.app.backend.models.LoginData;
23 | import com.auth0.jwt.JWT;
24 | import com.auth0.jwt.algorithms.Algorithm;
25 | import com.fasterxml.jackson.databind.ObjectMapper;
26 |
27 | import lombok.extern.slf4j.Slf4j;
28 |
29 | @Slf4j
30 | public class CustomAuthenticationFilter extends UsernamePasswordAuthenticationFilter {
31 | private AuthenticationManager authenticationManager;
32 |
33 | public CustomAuthenticationFilter(AuthenticationManager authenticationManager) {
34 | this.authenticationManager = authenticationManager;
35 | }
36 |
37 | @Override
38 | public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response)
39 | throws AuthenticationException {
40 | LoginData authClass;
41 | try {
42 | authClass = new ObjectMapper().readValue(request.getInputStream(), LoginData.class);
43 | String username = authClass.getUsername();
44 | String password = authClass.getPassword();
45 | log.info("Username is: {}", username);
46 | log.info("Password is: {}", password);
47 | UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username, password);
48 | return authenticationManager.authenticate(authenticationToken);
49 | } catch (IOException e) {
50 | throw new RuntimeException(e);
51 | }
52 | }
53 |
54 | @Override
55 | protected void successfulAuthentication(HttpServletRequest request, HttpServletResponse response, FilterChain chain,
56 | Authentication authentication) throws IOException, ServletException {
57 | User user = (User)authentication.getPrincipal();
58 | Algorithm algorithm = Algorithm.HMAC256("secret".getBytes());
59 | String access_token = JWT.create()
60 | .withSubject(user.getUsername())
61 | .withExpiresAt(new Date(System.currentTimeMillis() + 10 * 60 * 1000))
62 | .withIssuer(request.getRequestURL().toString())
63 | .withClaim("roles", user.getAuthorities().stream().map(GrantedAuthority::getAuthority).collect(Collectors.toList()))
64 | .sign(algorithm);
65 | Map tokens = new HashMap<>();
66 | tokens.put("access_token", access_token);
67 | tokens.put("expiresIn", "600");
68 | response.setContentType(org.springframework.http.MediaType.APPLICATION_JSON_VALUE);
69 | new ObjectMapper().writeValue(response.getOutputStream(), tokens);
70 | }
71 |
72 | @Override
73 | protected void unsuccessfulAuthentication(HttpServletRequest request, HttpServletResponse response,
74 | AuthenticationException failed) throws IOException, ServletException {
75 | log.info("Unsuccessful Authentication");
76 | response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Pogresni kredencijali za prijavu");
77 | }
78 | }
79 |
--------------------------------------------------------------------------------
/frontend/src/app/app-routing.module.ts:
--------------------------------------------------------------------------------
1 | import { NgModule } from '@angular/core';
2 | import { RouterModule, Routes } from '@angular/router';
3 | import { AddBrandComponent } from './admin/add-brand/add-brand.component';
4 | import { AddColorComponent } from './admin/add-color/add-color.component';
5 | import { AddFuelTypeComponent } from './admin/add-fuel-type/add-fuel-type.component';
6 | import { AddModelComponent } from './admin/add-model/add-model.component';
7 | import { AdminControllerComponent } from './admin/admin-controller/admin-controller.component';
8 | import { AdminGuard } from './admin/admin.guard';
9 | import { BlockGuard } from './admin/block.guard';
10 | import { DeleteBrandComponent } from './admin/delete-brand/delete-brand.component';
11 | import { DeleteColorComponent } from './admin/delete-color/delete-color.component';
12 | import { DeleteFuelTypeComponent } from './admin/delete-fuel-type/delete-fuel-type.component';
13 | import { DeleteModelComponent } from './admin/delete-model/delete-model.component';
14 | import { AuthGuard } from './auth/auth.guard';
15 | import { LoginComponent } from './auth/login/login.component';
16 | import { PasswordChangeComponent } from './auth/password-change/password-change.component';
17 | import { RegisterComponent } from './auth/register/register.component';
18 | import { UserChangeComponent } from './auth/user-change/user-change.component';
19 | import { UserInfoComponent } from './auth/user-info/user-info.component';
20 | import { CarAddComponent } from './cars/car-add/car-add.component';
21 | import { CarEditComponent } from './cars/car-edit/car-edit.component';
22 | import { CarInfoComponent } from './cars/car-info/car-info.component';
23 | import { CarListComponent } from './cars/car-list/car-list.component';
24 | import { MyCarListComponent } from './cars/my-car-list/my-car-list.component';
25 |
26 | const routes: Routes = [
27 | { path: '', component: CarListComponent },
28 | { path: 'add', component: CarAddComponent, canActivate: [AuthGuard, BlockGuard]},
29 | { path: 'carInfo/:carId', component: CarInfoComponent, canActivate: [AuthGuard] },
30 | { path: 'carEdit/:carId', component: CarEditComponent, canActivate: [AuthGuard, BlockGuard] },
31 | { path: 'myCarList', component: MyCarListComponent, canActivate: [AuthGuard, BlockGuard] },
32 | { path: 'admin', component: AdminControllerComponent, canActivate: [AuthGuard, AdminGuard] },
33 | { path: 'addFuelType', component: AddFuelTypeComponent, canActivate: [AuthGuard, AdminGuard] },
34 | { path: 'deleteFuelType', component: DeleteFuelTypeComponent, canActivate: [AuthGuard, AdminGuard] },
35 | { path: 'addColor', component: AddColorComponent, canActivate: [AuthGuard, AdminGuard] },
36 | { path: 'deleteColor', component: DeleteColorComponent, canActivate: [AuthGuard, AdminGuard] },
37 | { path: 'addBrand', component: AddBrandComponent, canActivate: [AuthGuard, AdminGuard] },
38 | { path: 'deleteBrand', component: DeleteBrandComponent, canActivate: [AuthGuard, AdminGuard] },
39 | { path: 'addModel', component: AddModelComponent, canActivate: [AuthGuard, AdminGuard] },
40 | { path: 'deleteModel', component: DeleteModelComponent, canActivate: [AuthGuard, AdminGuard] },
41 | { path: 'userInfo/:userId', component: UserInfoComponent, canActivate: [AuthGuard] },
42 | { path: 'passwordChange/:userId', component: PasswordChangeComponent, canActivate: [AuthGuard] },
43 | { path: 'userChange/:userId', component: UserChangeComponent, canActivate: [AuthGuard] },
44 | { path: 'login', component: LoginComponent},
45 | { path: 'register', component: RegisterComponent }
46 | ];
47 |
48 | @NgModule({
49 | imports: [RouterModule.forRoot(routes)],
50 | exports: [RouterModule],
51 | providers: [AuthGuard, AdminGuard, BlockGuard]
52 | })
53 | export class AppRoutingModule { }
54 |
--------------------------------------------------------------------------------
/frontend/src/app/admin/admin-controller/admin-controller.component.html:
--------------------------------------------------------------------------------
1 |
2 |
3 | Administratorske kontrole
4 |
5 |
6 |
7 | -
8 |
9 |
10 | -
11 |
12 |
13 |
14 |
15 |
16 |
17 |
18 | -
19 |
20 |
21 | -
22 |
23 |
24 |
25 |
26 |
27 |
28 |
29 | -
30 |
31 |
32 | -
33 |
34 |
35 | -
36 |
37 |
38 | -
39 |
40 |
41 |
42 |
43 |
44 |
45 |
46 | Korisnici
47 |
48 |
49 |
50 | Ime
51 | {{element.firstName}}
52 |
53 |
54 | Prezime
55 | {{element.lastName}}
56 |
57 |
58 | Informacije
59 |
60 |
63 |
64 |
65 |
66 | Dozvole za korisnika
67 |
68 |
72 |
76 |
77 |
78 |
79 |
80 |
81 |
82 |
--------------------------------------------------------------------------------
/backend/src/main/java/com/app/backend/security/SecurityConfig.java:
--------------------------------------------------------------------------------
1 | package com.app.backend.security;
2 |
3 | import org.springframework.beans.factory.annotation.Autowired;
4 | import org.springframework.context.annotation.Bean;
5 | import org.springframework.context.annotation.Configuration;
6 | import org.springframework.http.HttpMethod;
7 | import org.springframework.security.authentication.AuthenticationManager;
8 | import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
9 | import org.springframework.security.config.annotation.web.builders.HttpSecurity;
10 | import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
11 | import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
12 | import org.springframework.security.config.http.SessionCreationPolicy;
13 | import org.springframework.security.core.userdetails.UserDetailsService;
14 | import org.springframework.security.crypto.password.PasswordEncoder;
15 | import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
16 |
17 | import com.app.backend.filters.CustomAuthenticationFilter;
18 | import com.app.backend.filters.CustomAuthorizationFilter;
19 |
20 | @Configuration
21 | @EnableWebSecurity
22 | public class SecurityConfig extends WebSecurityConfigurerAdapter {
23 | @Autowired
24 | private UserDetailsService userDetailsService;
25 | @Autowired
26 | private PasswordEncoder passwordEncoder;
27 |
28 | @Override
29 | protected void configure(AuthenticationManagerBuilder auth) throws Exception {
30 | auth.userDetailsService(userDetailsService).passwordEncoder(passwordEncoder);
31 | }
32 |
33 | @Override
34 | protected void configure(HttpSecurity http) throws Exception {
35 | CustomAuthenticationFilter customAuthenticationFilter = new CustomAuthenticationFilter(authenticationManagerBean());
36 | customAuthenticationFilter.setFilterProcessesUrl("/api/users/login");
37 | http.csrf().disable();
38 | http.cors();
39 | http.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS);
40 | http.authorizeRequests().antMatchers("/api/users/login/**", "/api/users/signup/**", "/error").permitAll();
41 | http.authorizeRequests().antMatchers(HttpMethod.GET, "/api/users/logout/**").permitAll();
42 | http.authorizeRequests().antMatchers(HttpMethod.GET, "/api/users/getUserId/**", "/api/users/hasAdminPrivilege",
43 | "/api/users/getUserById/**").hasAnyAuthority("ROLE_USER");
44 | http.authorizeRequests().antMatchers(HttpMethod.POST, "/api/users/changePassword/**").hasAnyAuthority("ROLE_USER");
45 | http.authorizeRequests().antMatchers(HttpMethod.PUT, "/api/users/updateUser/**").hasAnyAuthority("ROLE_USER");
46 | http.authorizeRequests().antMatchers(HttpMethod.GET, "/api/users/allUsers/**", "/api/role/save/**",
47 | "/api/role/addtouser/**").hasAnyAuthority("ROLE_ADMIN");
48 | http.authorizeRequests().antMatchers(HttpMethod.POST, "/api/cars/addCar/**").hasAnyAuthority("ROLE_USER");
49 | http.authorizeRequests().antMatchers(HttpMethod.GET, "/api/cars/getCar/**", "/api/cars/getCars/**",
50 | "/api/cars/getMyCars/**", "/images/**").permitAll();
51 | http.authorizeRequests().antMatchers(HttpMethod.PUT, "/api/cars/updateCarImage/**", "/api/cars/updateCarNoImage/**").hasAnyAuthority("ROLE_USER");
52 | http.authorizeRequests().antMatchers(HttpMethod.DELETE, "/api/cars/deleteCar/**").hasAnyAuthority("ROLE_USER");
53 | http.authorizeRequests().antMatchers(HttpMethod.GET, "/api/admin/getUsers/**", "/api/admin/blockUser/**", "/api/admin/unblockUser/**").hasAnyAuthority("ROLE_ADMIN");
54 | http.authorizeRequests().antMatchers(HttpMethod.GET, "/api/admin/getBrands/**", "/api/admin/getModels/**",
55 | "/api/admin/getFuelTypes/**", "/api/admin/getColors/**").hasAnyAuthority("ROLE_USER");
56 | http.authorizeRequests().antMatchers(HttpMethod.POST, "/api/admin/addBrand/**", "/api/admin/addModel/**",
57 | "/api/admin/addFuelType/**", "/api/admin/addColor/**").hasAnyAuthority("ROLE_ADMIN");
58 | http.authorizeRequests().antMatchers(HttpMethod.DELETE, "/api/admin/deleteBrand/**", "/api/admin/deleteModel/**",
59 | "/api/admin/deleteFuelType/**", "/api/admin/deleteColor/**").hasAnyAuthority("ROLE_ADMIN");
60 | http.authorizeRequests().anyRequest().authenticated();
61 | http.addFilter(customAuthenticationFilter);
62 | http.addFilterBefore(new CustomAuthorizationFilter(), UsernamePasswordAuthenticationFilter.class);
63 |
64 | }
65 |
66 | @Bean
67 | @Override
68 | public AuthenticationManager authenticationManagerBean() throws Exception {
69 | return super.authenticationManagerBean();
70 | }
71 |
72 | }
73 |
--------------------------------------------------------------------------------
/frontend/src/app/app.module.ts:
--------------------------------------------------------------------------------
1 | import { NgModule } from '@angular/core';
2 | import { BrowserModule } from '@angular/platform-browser';
3 | import { AppRoutingModule } from './app-routing.module';
4 | import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
5 | import { FormsModule, ReactiveFormsModule } from '@angular/forms';
6 | import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
7 |
8 | import { AppComponent } from './app.component';
9 | import { HeaderComponent } from './header/header.component';
10 | import { RegisterComponent } from './auth/register/register.component';
11 | import { LoginComponent } from './auth/login/login.component';
12 | import { ErrorComponent } from './error/error.component';
13 | import { CarAddComponent } from './cars/car-add/car-add.component';
14 | import { CarListComponent } from './cars/car-list/car-list.component';
15 | import { AuthInterceptor } from './auth/auth-interceptor';
16 | import { ErrorInterceptor } from './error-interceptor';
17 |
18 | import { MatInputModule } from '@angular/material/input';
19 | import { MatCardModule } from '@angular/material/card';
20 | import { MatButtonModule } from '@angular/material/button';
21 | import { MatToolbarModule } from '@angular/material/toolbar';
22 | import { MatExpansionModule } from '@angular/material/expansion';
23 | import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
24 | import { MatPaginatorModule } from '@angular/material/paginator';
25 | import { MatDialogModule } from '@angular/material/dialog';
26 | import { MatDatepickerModule } from '@angular/material/datepicker';
27 | import { MatNativeDateModule } from "@angular/material/core";
28 | import { MatSelectModule } from '@angular/material/select';
29 | import { MatTableModule } from '@angular/material/table';
30 | import { MatIconModule } from '@angular/material/icon';
31 | import { CarInfoComponent } from './cars/car-info/car-info.component';
32 | import { MyCarListComponent } from './cars/my-car-list/my-car-list.component';
33 | import { CarEditComponent } from './cars/car-edit/car-edit.component';
34 | import { AdminControllerComponent } from './admin/admin-controller/admin-controller.component';
35 | import { AddFuelTypeComponent } from './admin/add-fuel-type/add-fuel-type.component';
36 | import { DeleteFuelTypeComponent } from './admin/delete-fuel-type/delete-fuel-type.component';
37 | import { AddColorComponent } from './admin/add-color/add-color.component';
38 | import { DeleteColorComponent } from './admin/delete-color/delete-color.component';
39 | import { AddBrandComponent } from './admin/add-brand/add-brand.component';
40 | import { DeleteBrandComponent } from './admin/delete-brand/delete-brand.component';
41 | import { AddModelComponent } from './admin/add-model/add-model.component';
42 | import { DeleteModelComponent } from './admin/delete-model/delete-model.component';
43 | import { UserInfoComponent } from './auth/user-info/user-info.component';
44 | import { PasswordChangeComponent } from './auth/password-change/password-change.component';
45 | import { UserChangeComponent } from './auth/user-change/user-change.component';
46 |
47 |
48 | @NgModule({
49 | declarations: [
50 | AppComponent,
51 | HeaderComponent,
52 | RegisterComponent,
53 | LoginComponent,
54 | ErrorComponent,
55 | CarAddComponent,
56 | CarListComponent,
57 | CarInfoComponent,
58 | MyCarListComponent,
59 | CarEditComponent,
60 | AdminControllerComponent,
61 | AddFuelTypeComponent,
62 | DeleteFuelTypeComponent,
63 | AddColorComponent,
64 | DeleteColorComponent,
65 | AddBrandComponent,
66 | DeleteBrandComponent,
67 | AddModelComponent,
68 | DeleteModelComponent,
69 | UserInfoComponent,
70 | PasswordChangeComponent,
71 | UserChangeComponent
72 | ],
73 | imports: [
74 | BrowserModule,
75 | AppRoutingModule,
76 | BrowserAnimationsModule,
77 | ReactiveFormsModule,
78 | FormsModule,
79 | MatInputModule,
80 | MatCardModule,
81 | MatButtonModule,
82 | MatToolbarModule,
83 | MatExpansionModule,
84 | MatProgressSpinnerModule,
85 | MatPaginatorModule,
86 | MatDatepickerModule,
87 | MatNativeDateModule,
88 | MatDialogModule,
89 | MatSelectModule,
90 | MatTableModule,
91 | MatIconModule,
92 | HttpClientModule
93 | ],
94 | providers: [
95 | {provide: HTTP_INTERCEPTORS, useClass: AuthInterceptor, multi: true},
96 | {provide: HTTP_INTERCEPTORS, useClass: ErrorInterceptor, multi: true}
97 | ],
98 | bootstrap: [AppComponent],
99 | entryComponents: [ErrorComponent]
100 | })
101 | export class AppModule { }
102 |
--------------------------------------------------------------------------------
/frontend/angular.json:
--------------------------------------------------------------------------------
1 | {
2 | "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3 | "version": 1,
4 | "newProjectRoot": "projects",
5 | "projects": {
6 | "frontend": {
7 | "projectType": "application",
8 | "schematics": {
9 | "@schematics/angular:application": {
10 | "strict": true
11 | }
12 | },
13 | "root": "",
14 | "sourceRoot": "src",
15 | "prefix": "app",
16 | "architect": {
17 | "build": {
18 | "builder": "@angular-devkit/build-angular:browser",
19 | "options": {
20 | "outputPath": "dist/frontend",
21 | "index": "src/index.html",
22 | "main": "src/main.ts",
23 | "polyfills": "src/polyfills.ts",
24 | "tsConfig": "tsconfig.app.json",
25 | "assets": [
26 | "src/favicon.ico",
27 | "src/assets"
28 | ],
29 | "styles": [
30 | "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
31 | "src/styles.css"
32 | ],
33 | "scripts": []
34 | },
35 | "configurations": {
36 | "production": {
37 | "budgets": [{
38 | "type": "initial",
39 | "maximumWarning": "500kb",
40 | "maximumError": "1mb"
41 | },
42 | {
43 | "type": "anyComponentStyle",
44 | "maximumWarning": "2kb",
45 | "maximumError": "4kb"
46 | }
47 | ],
48 | "fileReplacements": [{
49 | "replace": "src/environments/environment.ts",
50 | "with": "src/environments/environment.prod.ts"
51 | }],
52 | "outputHashing": "all"
53 | },
54 | "development": {
55 | "buildOptimizer": false,
56 | "optimization": false,
57 | "vendorChunk": true,
58 | "extractLicenses": false,
59 | "sourceMap": true,
60 | "namedChunks": true
61 | }
62 | },
63 | "defaultConfiguration": "production"
64 | },
65 | "serve": {
66 | "builder": "@angular-devkit/build-angular:dev-server",
67 | "configurations": {
68 | "production": {
69 | "browserTarget": "frontend:build:production"
70 | },
71 | "development": {
72 | "browserTarget": "frontend:build:development"
73 | }
74 | },
75 | "defaultConfiguration": "development"
76 | },
77 | "extract-i18n": {
78 | "builder": "@angular-devkit/build-angular:extract-i18n",
79 | "options": {
80 | "browserTarget": "frontend:build"
81 | }
82 | },
83 | "test": {
84 | "builder": "@angular-devkit/build-angular:karma",
85 | "options": {
86 | "main": "src/test.ts",
87 | "polyfills": "src/polyfills.ts",
88 | "tsConfig": "tsconfig.spec.json",
89 | "karmaConfig": "karma.conf.js",
90 | "assets": [
91 | "src/favicon.ico",
92 | "src/assets"
93 | ],
94 | "styles": [
95 | "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
96 | "src/styles.css"
97 | ],
98 | "scripts": []
99 | }
100 | }
101 | }
102 | }
103 | },
104 | "defaultProject": "frontend"
105 | }
--------------------------------------------------------------------------------
/backend/src/main/java/com/app/backend/controllers/CarController.java:
--------------------------------------------------------------------------------
1 | package com.app.backend.controllers;
2 |
3 | import java.io.IOException;
4 |
5 | import org.springframework.beans.factory.annotation.Autowired;
6 | import org.springframework.http.HttpStatus;
7 | import org.springframework.http.ResponseEntity;
8 | import org.springframework.web.bind.annotation.DeleteMapping;
9 | import org.springframework.web.bind.annotation.GetMapping;
10 | import org.springframework.web.bind.annotation.PathVariable;
11 | import org.springframework.web.bind.annotation.PostMapping;
12 | import org.springframework.web.bind.annotation.PutMapping;
13 | import org.springframework.web.bind.annotation.RequestBody;
14 | import org.springframework.web.bind.annotation.RequestHeader;
15 | import org.springframework.web.bind.annotation.RequestMapping;
16 | import org.springframework.web.bind.annotation.RequestParam;
17 | import org.springframework.web.bind.annotation.RestController;
18 | import org.springframework.web.multipart.MultipartFile;
19 |
20 | import com.app.backend.models.Car;
21 | import com.app.backend.models.FrontCar;
22 | import com.app.backend.models.User;
23 | import com.app.backend.services.CarService;
24 | import com.app.backend.services.UserService;
25 | import com.app.backend.util.CarResponse;
26 |
27 | import lombok.extern.slf4j.Slf4j;
28 |
29 |
30 | @RestController
31 | @RequestMapping("/api/cars")
32 | @Slf4j
33 | public class CarController {
34 | @Autowired
35 | private UserService userService;
36 | @Autowired
37 | private CarService carService;
38 |
39 | @PostMapping("/addCar")
40 | public ResponseEntity addCar(@RequestParam(name = "image") MultipartFile image,
41 | @RequestParam(name = "car") String carData, @RequestHeader (name="Authorization") String authorizationHeader) {
42 | try {
43 | log.info(carData);
44 | User user = userService.getUserFromAuthorizationHeader(authorizationHeader);
45 | return ResponseEntity.ok().body(carService.addCar(image, carData, user));
46 | } catch (IOException ex) {
47 | return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(new Error("Greska na serveru!"));
48 | }
49 | }
50 |
51 | @GetMapping("/getCar/{id}")
52 | public ResponseEntity getCar(@PathVariable Long id) {
53 | return ResponseEntity.ok().body(carService.getCar(id));
54 | }
55 |
56 | @GetMapping("/getCars")
57 | public ResponseEntity getCars(@RequestParam(value = "pagesize", required = false) Integer pagesize,
58 | @RequestParam(value = "page", required = false) Integer page) {
59 | return ResponseEntity.ok().body(carService.getCars(page, pagesize));
60 | }
61 |
62 | @GetMapping("/getMyCars/{id}")
63 | public ResponseEntity getMyCars(@PathVariable Long id, @RequestParam(value = "pagesize", required = false) Integer pagesize,
64 | @RequestParam(value = "page", required = false) Integer page) {
65 | User user = userService.getUserById(id);
66 | return ResponseEntity.ok().body(carService.getMyCars(user, page, pagesize));
67 | }
68 |
69 | @PutMapping("/updateCarImage/{id}")
70 | public ResponseEntity updatePostImage(@PathVariable Long id, @RequestParam(name = "image") MultipartFile image,
71 | @RequestParam(name = "car") String carData, @RequestHeader (name="Authorization") String authorizationHeader) {
72 | User user = userService.getUserFromAuthorizationHeader(authorizationHeader);
73 | try {
74 | Car savedCar = carService.updateCarImage(id, image, carData, user);
75 | if (savedCar != null) {
76 | return ResponseEntity.ok().body(savedCar);
77 | } else {
78 | return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(new Error("Niste autorizovani!"));
79 | }
80 | } catch (IOException ex) {
81 | return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(new Error("Greska na serveru!"));
82 | }
83 | }
84 |
85 | @PutMapping("/updateCarNoImage/{id}")
86 | public ResponseEntity updatePostNoImage(@PathVariable Long id, @RequestBody FrontCar frontCar, @RequestHeader (name="Authorization") String authorizationHeader) {
87 | User user = userService.getUserFromAuthorizationHeader(authorizationHeader);
88 | Car savedCar = carService.updateCarNoImage(id, frontCar, user);
89 | if (savedCar != null) {
90 | return ResponseEntity.ok().body(savedCar);
91 | } else {
92 | return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(new Error("Niste autorizovani!"));
93 | }
94 | }
95 |
96 | @DeleteMapping("/deleteCar/{id}")
97 | public ResponseEntity deleteCar(@PathVariable Long id, @RequestHeader (name="Authorization") String authorizationHeader) {
98 | User user = userService.getUserFromAuthorizationHeader(authorizationHeader);
99 | Long deletedCarId = carService.deleteCar(id, user);
100 | if (deletedCarId != null) {
101 | return ResponseEntity.ok().body(deletedCarId);
102 | } else {
103 | return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(new Error("Niste autorizovani!"));
104 | }
105 | }
106 | }
107 |
--------------------------------------------------------------------------------
/frontend/src/app/cars/car-add/car-add.component.html:
--------------------------------------------------------------------------------
1 |
2 |
3 | Novi oglas
4 |
5 |
6 |
106 |
--------------------------------------------------------------------------------
/frontend/src/app/cars/car-edit/car-edit.component.html:
--------------------------------------------------------------------------------
1 |
5 |
6 |
7 | Azuriraj podatke o oglasu
8 |
9 |
10 |
109 |
--------------------------------------------------------------------------------
/backend/src/main/java/com/app/backend/controllers/UserController.java:
--------------------------------------------------------------------------------
1 | package com.app.backend.controllers;
2 |
3 | import java.net.URI;
4 | import java.time.ZoneId;
5 |
6 | import javax.servlet.http.HttpServletRequest;
7 | import javax.servlet.http.HttpServletResponse;
8 |
9 | import org.springframework.beans.factory.annotation.Autowired;
10 | import org.springframework.http.HttpStatus;
11 | import org.springframework.http.ResponseEntity;
12 | import org.springframework.web.bind.annotation.GetMapping;
13 | import org.springframework.web.bind.annotation.PathVariable;
14 | import org.springframework.web.bind.annotation.PostMapping;
15 | import org.springframework.web.bind.annotation.PutMapping;
16 | import org.springframework.web.bind.annotation.RequestBody;
17 | import org.springframework.web.bind.annotation.RequestHeader;
18 | import org.springframework.web.bind.annotation.RequestMapping;
19 | import org.springframework.web.bind.annotation.RestController;
20 | import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
21 |
22 | import com.app.backend.models.FrontUser;
23 | import com.app.backend.models.Role;
24 | import com.app.backend.models.SignupData;
25 | import com.app.backend.models.User;
26 | import com.app.backend.services.UserService;
27 |
28 | import lombok.Data;
29 |
30 | @RestController
31 | @RequestMapping("/api")
32 | public class UserController {
33 | @Autowired
34 | private UserService userService;
35 |
36 | @GetMapping("/users/getUserId")
37 | public ResponseEntity getUserId(@RequestHeader (name="Authorization") String authorizationHeader) {
38 | User user = userService.getUserFromAuthorizationHeader(authorizationHeader);
39 | return ResponseEntity.ok().body(user.getId());
40 | }
41 |
42 | @GetMapping("/users/hasAdminPrivilege")
43 | public ResponseEntity hasAdminPrivilege(@RequestHeader (name="Authorization") String authorizationHeader) {
44 | return ResponseEntity.ok().body(userService.hasAdminPrivilege(authorizationHeader));
45 | }
46 |
47 | @GetMapping("/users/isBlocked/{userId}")
48 | public ResponseEntity isBlocked(@PathVariable Long userId) {
49 | return ResponseEntity.ok().body(userService.isBlocked(userId));
50 | }
51 |
52 | @GetMapping("/users/getUserById/{userId}")
53 | public ResponseEntity getUserById(@PathVariable Long userId) {
54 | User user = userService.getUserById(userId);
55 | FrontUser frontUser = new FrontUser(user.getId(), user.getFirstName(), user.getLastName(),
56 | user.getBrithdate().atStartOfDay(ZoneId.systemDefault()).toInstant().toEpochMilli(),
57 | user.getCity(), user.getCountry());
58 | return ResponseEntity.ok().body(frontUser);
59 | }
60 |
61 | @PostMapping("/users/signup")
62 | public ResponseEntity signupUser(@RequestBody SignupData signupData) {
63 | URI uri = URI.create(ServletUriComponentsBuilder.fromCurrentContextPath().path("/api/users/signup").toUriString());
64 | User savedUser = userService.signupUser(signupData);
65 | if (savedUser != null) {
66 | return ResponseEntity.created(uri).body(savedUser);
67 | } else {
68 | return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new Error("E-mail adresa je zauzeta!"));
69 | }
70 | }
71 |
72 | @PostMapping("/users/changePassword")
73 | public ResponseEntity changePassword(@RequestBody ChangePasswordData changePasswordData) {
74 | User changedUser = userService.changePassword(changePasswordData.getUserId(), changePasswordData.getOldPassword(), changePasswordData.getNewPassword());
75 | if (changedUser != null) {
76 | return ResponseEntity.ok().body(changedUser);
77 | } else {
78 | return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new Error("Nije dobra stara lozinka!"));
79 | }
80 | }
81 |
82 | @PutMapping("/users/updateUser/{userId}")
83 | public ResponseEntity updateUser(@PathVariable Long userId, @RequestBody ChangeUserData changeUserData) {
84 | User user = userService.getUserById(userId);
85 | User updatedUser = userService.updateUser(user, changeUserData.getFirstName(), changeUserData.getLastName(),
86 | changeUserData.getTimestamp(), changeUserData.getCity(), changeUserData.getCountry());
87 | return ResponseEntity.ok().body(updatedUser);
88 | }
89 |
90 | @GetMapping("/users/logout")
91 | public ResponseEntity logout(HttpServletRequest request, HttpServletResponse response) {
92 | return ResponseEntity.ok().body(userService.logoutUser(request, response));
93 | }
94 |
95 | @PostMapping("/role/save")
96 | public ResponseEntity saveRole(@RequestBody Role role) {
97 | URI uri = URI.create(ServletUriComponentsBuilder.fromCurrentContextPath().path("/api/role/save").toUriString());
98 | return ResponseEntity.created(uri).body(userService.saveRole(role));
99 | }
100 |
101 | @PostMapping("/role/addtouser")
102 | public ResponseEntity addRoleToUser(@RequestBody RoleToUserForm form) {
103 | userService.addRoleToUser(form.getUsername(), form.getRoleName());
104 | return ResponseEntity.ok().build();
105 | }
106 | }
107 |
108 | @Data
109 | class RoleToUserForm {
110 | private String username;
111 | private String roleName;
112 | }
113 |
114 | @Data
115 | class ChangePasswordData {
116 | private Long userId;
117 | private String oldPassword;
118 | private String newPassword;
119 | }
120 |
121 | @Data
122 | class ChangeUserData {
123 | private String firstName;
124 | private String lastName;
125 | private Long timestamp;
126 | private String city;
127 | private String country;
128 | }
129 |
--------------------------------------------------------------------------------
/frontend/src/app/cars/car-add/car-add.component.ts:
--------------------------------------------------------------------------------
1 | import { Component, OnDestroy, OnInit } from '@angular/core';
2 | import { FormControl, FormGroup, Validators } from '@angular/forms';
3 | import { ActivatedRoute, ParamMap } from '@angular/router';
4 | import { Subscription } from 'rxjs';
5 | import { AdminService } from 'src/app/admin/admin.service';
6 | import { AuthService } from 'src/app/auth/auth.service';
7 | import { CarsService } from '../cars.service';
8 | import { mimeType } from "./mime-type.validator";
9 |
10 |
11 | @Component({
12 | selector: 'app-car-add',
13 | templateUrl: './car-add.component.html',
14 | styleUrls: ['./car-add.component.css']
15 | })
16 | export class CarAddComponent implements OnInit, OnDestroy {
17 | form!: FormGroup;
18 | imagePreview!: string;
19 | isLoading: boolean = false;
20 | brands: string[] = [];
21 | models: string[] = [];
22 | fuelTypes: string[] = [];
23 | colors: string[] = [];
24 | years: number[] = [];
25 | imageErrorMessage: string = "";
26 | private authStatusSub!: Subscription;
27 | private brandsSub!: Subscription;
28 | private modelsSub!: Subscription;
29 | private fuelTypesSub!: Subscription;
30 | private colorsSub!: Subscription;
31 |
32 | constructor(public carsService: CarsService, public route: ActivatedRoute, private authService: AuthService, private adminService: AdminService) { }
33 |
34 | ngOnInit(): void {
35 | let date: Date = new Date();
36 | let finalYear = date.getFullYear();
37 | for(let i = finalYear; i >= 1980; i--) {
38 | this.years.push(i);
39 | }
40 |
41 | this.authStatusSub = this.authService.getAuthStatusListener().subscribe(
42 | authStatus => {
43 | this.isLoading = false;
44 | }
45 | );
46 | this.adminService.getBrands();
47 | this.brandsSub = this.adminService.getBrandsUpdateListener()
48 | .subscribe((brandsData: {brands: string[]}) => {
49 | this.brands = brandsData.brands;
50 | });
51 | this.modelsSub = this.adminService.getModelsUpdateListener()
52 | .subscribe((modelsData: {models: string[]}) => {
53 | this.models = modelsData.models;
54 | });
55 | this.adminService.getFuelTypes();
56 | this.fuelTypesSub = this.adminService.getFuelTypesUpdateListener()
57 | .subscribe((fuelTypesData: {fuelTypes: string[]}) => {
58 | this.fuelTypes = fuelTypesData.fuelTypes;
59 | });
60 | this.adminService.getColors();
61 | this.colorsSub = this.adminService.getColorsUpdateListener()
62 | .subscribe((colorsData: {colors: string[]}) => {
63 | this.colors = colorsData.colors;
64 | });
65 |
66 | this.form = new FormGroup({
67 | title: new FormControl(null, {
68 | validators: [Validators.required]
69 | }),
70 | brand: new FormControl(null, {
71 | validators: [Validators.required]
72 | }),
73 | model: new FormControl(null, {
74 | validators: [Validators.required]
75 | }),
76 | image: new FormControl(null, {
77 | validators: [Validators.required],
78 | asyncValidators: [mimeType]
79 | }),
80 | mileage: new FormControl(null, {
81 | validators: [
82 | Validators.required,
83 | Validators.pattern("^\\d{1,6}$")
84 | ]
85 | }),
86 | registration: new FormControl(null, {
87 | validators: [Validators.required]
88 | }),
89 | price: new FormControl(null, {
90 | validators: [
91 | Validators.required,
92 | Validators.pattern("^\\d{1,6}$")
93 | ]
94 | }),
95 | fuel: new FormControl(null, {
96 | validators: [Validators.required]
97 | }),
98 | color: new FormControl(null, {
99 | validators: [Validators.required]
100 | }),
101 | phone: new FormControl(null, {
102 | validators: [
103 | Validators.required,
104 | Validators.pattern("^\\+381/?[0-9]{2}-?[0-9]{2}-?[0-9]{2}-?[0-9]{3}$")
105 | ]
106 | }),
107 | content: new FormControl(null, {
108 | validators: [Validators.required]
109 | })
110 | });
111 | }
112 |
113 | onImagePicked(event: Event) {
114 | const files = (event.target as HTMLInputElement).files;
115 | if (files !== null) {
116 | const file = files[0];
117 | this.form.patchValue({ 'image': file });
118 | this.form.get('image')?.updateValueAndValidity();
119 | const reader = new FileReader();
120 | reader.onload = () => {
121 | this.imagePreview = reader.result as string;
122 | };
123 | reader.readAsDataURL(file);
124 | }
125 | }
126 |
127 | onSaveCar() {
128 | if (this.form.get('image')?.invalid) {
129 | this.imageErrorMessage = "Unesite sliku.";
130 | }
131 | if (this.form.invalid) {
132 | return;
133 | }
134 | this.isLoading = true;
135 | this.carsService.addCar(
136 | this.form.value.title,
137 | this.form.value.brand,
138 | this.form.value.model,
139 | this.form.value.mileage,
140 | this.form.value.registration,
141 | this.form.value.price,
142 | this.form.value.fuel,
143 | this.form.value.color,
144 | this.form.value.phone,
145 | this.form.value.content,
146 | this.form.value.image
147 | );
148 | this.form.reset();
149 | }
150 |
151 | onChange(brandName: string) {
152 | this.adminService.getModels(brandName);
153 | }
154 |
155 | ngOnDestroy(): void {
156 | this.authStatusSub.unsubscribe();
157 | this.brandsSub.unsubscribe();
158 | this.modelsSub.unsubscribe();
159 | this.fuelTypesSub.unsubscribe();
160 | this.colorsSub.unsubscribe();
161 | }
162 |
163 | }
164 |
--------------------------------------------------------------------------------
/backend/src/main/java/com/app/backend/services/AdminServiceImpl.java:
--------------------------------------------------------------------------------
1 | package com.app.backend.services;
2 |
3 | import java.util.ArrayList;
4 | import java.util.List;
5 |
6 | import org.springframework.beans.factory.annotation.Autowired;
7 | import org.springframework.stereotype.Service;
8 |
9 | import com.app.backend.models.Brand;
10 | import com.app.backend.models.Car;
11 | import com.app.backend.models.Color;
12 | import com.app.backend.models.Fuel;
13 | import com.app.backend.models.Model;
14 | import com.app.backend.models.User;
15 | import com.app.backend.repositories.BrandRepository;
16 | import com.app.backend.repositories.CarRepository;
17 | import com.app.backend.repositories.ColorRepository;
18 | import com.app.backend.repositories.FuelRepository;
19 | import com.app.backend.repositories.ModelRepository;
20 | import com.app.backend.repositories.UserRepository;
21 |
22 | import lombok.extern.slf4j.Slf4j;
23 |
24 | @Service
25 | @Slf4j
26 | public class AdminServiceImpl implements AdminService {
27 | @Autowired
28 | private UserRepository userRepository;
29 | @Autowired
30 | private CarRepository carRepository;
31 | @Autowired
32 | private BrandRepository brandRepository;
33 | @Autowired
34 | private ModelRepository modelRepository;
35 | @Autowired
36 | private FuelRepository fuelRepository;
37 | @Autowired
38 | private ColorRepository colorRepository;
39 |
40 | @Override
41 | public User blockUser(Long userId) {
42 | log.info("Block user");
43 | User user = userRepository.getById(userId);
44 | user.setBanned(true);
45 | return userRepository.save(user);
46 | }
47 |
48 | @Override
49 | public User unblockUser(Long userId) {
50 | log.info("Unblock user");
51 | User user = userRepository.getById(userId);
52 | user.setBanned(false);
53 | return userRepository.save(user);
54 | }
55 |
56 | @Override
57 | public List getUsers(User user) {
58 | log.info("Fetching all users");
59 | List users = userRepository.findAll();
60 | List returnUsers = new ArrayList<>();
61 | users.forEach(currentUser -> {
62 | if (currentUser.getId() != user.getId()) {
63 | returnUsers.add(currentUser);
64 | }
65 | });
66 | return returnUsers;
67 | }
68 |
69 | @Override
70 | public Long adminDeleteCar(Long carId) {
71 | carRepository.deleteById(carId);
72 | log.info("Admin delete car");
73 | return carId;
74 | }
75 |
76 | @Override
77 | public List getBrands() {
78 | log.info("Get brands");
79 | return brandRepository.findAll();
80 | }
81 |
82 | @Override
83 | public Brand saveBrand(String brandName) {
84 | Brand brand = brandRepository.findByName(brandName);
85 | if (brand != null) return null;
86 | log.info("Saving new brand {} to the database", brandName);
87 | return brandRepository.save(new Brand(null, brandName));
88 | }
89 |
90 | @Override
91 | public Long deleteBrand(String brandName) {
92 | Brand brand = brandRepository.findByName(brandName);
93 | // List cars = carRepository.findByBrand(brand);
94 | List models = modelRepository.findByBrand(brand);
95 | // if(cars.size() > 0 || models.size() > 0) return null;
96 | if (models.size() > 0) return null;
97 | Long id = brand.getId();
98 | brandRepository.deleteById(id);
99 | log.info("Delete a brand");
100 | return id;
101 | }
102 |
103 | @Override
104 | public List getModels(String brandName) {
105 | Brand brand = brandRepository.findByName(brandName);
106 | log.info("Get models for brand {}", brandName);
107 | return modelRepository.findByBrand(brand);
108 | }
109 |
110 | @Override
111 | public Model addModelToBrand(String brandName, String modelName) {
112 | Model modelCheck = modelRepository.findByName(modelName);
113 | if (modelCheck != null) return null;
114 | modelRepository.save(new Model(null, modelName, null));
115 | Brand brand = brandRepository.findByName(brandName);
116 | Model model = modelRepository.findByName(modelName);
117 | model.setBrand(brand);
118 | log.info("Adding model {} to brand {}", modelName, brandName);
119 | return modelRepository.save(model);
120 | }
121 |
122 | @Override
123 | public Long deleteModelFromBrand(String brandName, String modelName) {
124 | Model model = modelRepository.findByName(modelName);
125 | List cars = carRepository.findByModel(model);
126 | log.info("Brisanje modela {} iz brenda {} ", modelName, brandName );
127 | if (cars.size() > 0) return null;
128 | Long id = model.getId();
129 | modelRepository.deleteById(id);
130 | log.info("Delete a model");
131 | return id;
132 | }
133 |
134 | @Override
135 | public List getFuelTypes() {
136 | log.info("Get fuel types");
137 | return fuelRepository.findAll();
138 | }
139 |
140 | @Override
141 | public Fuel saveFuel(String fuelType) {
142 | Fuel fuel = fuelRepository.findByName(fuelType);
143 | if (fuel != null) return null;
144 | log.info("Saving fuel {} to the database", fuelType);
145 | return fuelRepository.save(new Fuel(null, fuelType));
146 | }
147 |
148 | @Override
149 | public Long deleteFuel(String fuelType) {
150 | Fuel fuel = fuelRepository.findByName(fuelType);
151 | List cars = carRepository.findByFuel(fuel);
152 | if (cars.size() > 0) return null;
153 | Long id = fuel.getId();
154 | fuelRepository.deleteById(id);
155 | log.info("Delete a fuel type");
156 | return id;
157 | }
158 |
159 | @Override
160 | public List getColors() {
161 | log.info("Get colors");
162 | return colorRepository.findAll();
163 | }
164 |
165 | @Override
166 | public Color saveColor(String colorName) {
167 | Color color = colorRepository.findByName(colorName);
168 | if (color != null) return null;
169 | log.info("Saving new color {} to the database", colorName);
170 | return colorRepository.save(new Color(null, colorName));
171 | }
172 |
173 | @Override
174 | public Long deleteColor(String colorName) {
175 | Color color = colorRepository.findByName(colorName);
176 | List cars = carRepository.findByColor(color);
177 | if (cars.size() > 0) return null;
178 | Long id = color.getId();
179 | colorRepository.deleteById(id);
180 | log.info("Delete a color");
181 | return id;
182 | }
183 | }
184 |
--------------------------------------------------------------------------------
/frontend/src/app/cars/car-edit/car-edit.component.ts:
--------------------------------------------------------------------------------
1 | import { Component, OnDestroy, OnInit } from '@angular/core';
2 | import { FormControl, FormGroup, Validators } from '@angular/forms';
3 | import { ActivatedRoute, ParamMap } from '@angular/router';
4 | import { Subscription } from 'rxjs';
5 | import { AdminService } from 'src/app/admin/admin.service';
6 | import { AuthService } from 'src/app/auth/auth.service';
7 | import { mimeType } from '../car-add/mime-type.validator';
8 | import { CarsService } from '../cars.service';
9 |
10 | @Component({
11 | selector: 'app-car-edit',
12 | templateUrl: './car-edit.component.html',
13 | styleUrls: ['./car-edit.component.css']
14 | })
15 | export class CarEditComponent implements OnInit, OnDestroy {
16 | isLoading: boolean = false;
17 | form!: FormGroup;
18 | private carId!: number;
19 | imagePreview!: string;
20 | brands: string[] = [];
21 | models: string[] = [];
22 | fuelTypes: string[] = [];
23 | colors: string[] = [];
24 | years: number[] = [];
25 | private authStatusSub!: Subscription;
26 | private brandsSub!: Subscription;
27 | private modelsSub!: Subscription;
28 | private fuelTypesSub!: Subscription;
29 | private colorsSub!: Subscription;
30 |
31 | constructor(public carsService: CarsService, public route: ActivatedRoute, private authService: AuthService, private adminService: AdminService) { }
32 |
33 | ngOnInit(): void {
34 | let date: Date = new Date();
35 | let finalYear = date.getFullYear();
36 | for(let i = finalYear; i >= 1980; i--) {
37 | this.years.push(i);
38 | }
39 |
40 | this.authStatusSub = this.authService.getAuthStatusListener().subscribe(
41 | authStatus => {
42 | this.isLoading = false;
43 | }
44 | );
45 | this.adminService.getBrands();
46 | this.brandsSub = this.adminService.getBrandsUpdateListener()
47 | .subscribe((brandsData: {brands: string[]}) => {
48 | this.brands = brandsData.brands;
49 | });
50 |
51 | this.modelsSub = this.adminService.getModelsUpdateListener()
52 | .subscribe((modelsData: {models: string[]}) => {
53 | this.models = modelsData.models;
54 | });
55 | this.adminService.getFuelTypes();
56 | this.fuelTypesSub = this.adminService.getFuelTypesUpdateListener()
57 | .subscribe((fuelTypesData: {fuelTypes: string[]}) => {
58 | this.fuelTypes = fuelTypesData.fuelTypes;
59 | });
60 | this.adminService.getColors();
61 | this.colorsSub = this.adminService.getColorsUpdateListener()
62 | .subscribe((colorsData: {colors: string[]}) => {
63 | this.colors = colorsData.colors;
64 | });
65 |
66 | this.form = new FormGroup({
67 | title: new FormControl(null, {
68 | validators: [Validators.required]
69 | }),
70 | brand: new FormControl(null, {
71 | validators: [Validators.required]
72 | }),
73 | model: new FormControl(null, {
74 | validators: [Validators.required]
75 | }),
76 | image: new FormControl(null, {
77 | validators: [Validators.required],
78 | asyncValidators: [mimeType]
79 | }),
80 | mileage: new FormControl(null, {
81 | validators: [
82 | Validators.required,
83 | Validators.pattern("^\\d{1,6}$")
84 | ]
85 | }),
86 | registration: new FormControl(null, {
87 | validators: [Validators.required]
88 | }),
89 | price: new FormControl(null, {
90 | validators: [
91 | Validators.required,
92 | Validators.pattern("^\\d{1,6}$")
93 | ]
94 | }),
95 | fuel: new FormControl(null, {
96 | validators: [Validators.required]
97 | }),
98 | color: new FormControl(null, {
99 | validators: [Validators.required]
100 | }),
101 | phone: new FormControl(null, {
102 | validators: [
103 | Validators.required,
104 | Validators.pattern("^\\+381/?[0-9]{2}-?[0-9]{2}-?[0-9]{2}-?[0-9]{3}$")
105 | ]
106 | }),
107 | content: new FormControl(null, {
108 | validators: [Validators.required]
109 | })
110 | });
111 | this.route.paramMap.subscribe((paramMap: ParamMap) => {
112 | if(paramMap.has('carId')) {
113 | this.carId = Number(paramMap.get('carId'));
114 | this.isLoading = true;
115 | this.carsService.getCar(this.carId)
116 | .subscribe(carData => {
117 | this.adminService.getModels(carData.brand.name);
118 | this.imagePreview = carData.path;
119 | this.isLoading = false;
120 | console.log(carData);
121 | this.form.setValue({
122 | title: carData.title,
123 | brand: carData.brand.name,
124 | model: carData.model.name,
125 | image: carData.path,
126 | mileage: carData.mileage,
127 | registration: carData.registration,
128 | price: carData.price,
129 | fuel: carData.fuel.name,
130 | color: carData.color.name,
131 | phone: carData.phone,
132 | content: carData.content
133 | });
134 | });
135 | }
136 | });
137 | }
138 |
139 | onImagePicked(event: Event) {
140 | const files = (event.target as HTMLInputElement).files;
141 | if (files !== null) {
142 | const file = files[0];
143 | this.form.patchValue({ 'image': file });
144 | this.form.get('image')?.updateValueAndValidity();
145 | const reader = new FileReader();
146 | reader.onload = () => {
147 | this.imagePreview = reader.result as string;
148 | };
149 | reader.readAsDataURL(file);
150 | }
151 | }
152 |
153 | onUpdateCar() {
154 | if (this.form.invalid) {
155 | return;
156 | }
157 | this.carsService.updateCar(
158 | this.carId,
159 | this.form.value.title,
160 | this.form.value.brand,
161 | this.form.value.model,
162 | this.form.value.image,
163 | this.form.value.mileage,
164 | this.form.value.registration,
165 | this.form.value.price,
166 | this.form.value.fuel,
167 | this.form.value.color,
168 | this.form.value.phone,
169 | this.form.value.content);
170 | this.form.reset();
171 | }
172 |
173 | onChange(brandName: string) {
174 | this.adminService.getModels(brandName);
175 | this.form.get('model')?.patchValue(null);
176 | }
177 |
178 | ngOnDestroy(): void {
179 | this.authStatusSub.unsubscribe();
180 | this.brandsSub.unsubscribe();
181 | this.modelsSub.unsubscribe();
182 | this.fuelTypesSub.unsubscribe();
183 | this.colorsSub.unsubscribe();
184 | }
185 |
186 |
187 | }
188 |
--------------------------------------------------------------------------------
/backend/src/main/java/com/app/backend/services/UserServiceImpl.java:
--------------------------------------------------------------------------------
1 | package com.app.backend.services;
2 |
3 | import java.time.Instant;
4 | import java.time.ZoneId;
5 | import java.util.ArrayList;
6 | import java.util.Collection;
7 |
8 | import javax.servlet.http.HttpServletRequest;
9 | import javax.servlet.http.HttpServletResponse;
10 |
11 | import org.springframework.beans.factory.annotation.Autowired;
12 | import org.springframework.security.core.Authentication;
13 | import org.springframework.security.core.authority.SimpleGrantedAuthority;
14 | import org.springframework.security.core.context.SecurityContextHolder;
15 | import org.springframework.security.core.userdetails.UserDetails;
16 | import org.springframework.security.core.userdetails.UserDetailsService;
17 | import org.springframework.security.core.userdetails.UsernameNotFoundException;
18 | import org.springframework.security.crypto.password.PasswordEncoder;
19 | import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
20 | import org.springframework.stereotype.Service;
21 |
22 | import com.app.backend.models.Role;
23 | import com.app.backend.models.SignupData;
24 | import com.app.backend.models.User;
25 | import com.app.backend.repositories.RoleRepository;
26 | import com.app.backend.repositories.UserRepository;
27 | import com.auth0.jwt.JWT;
28 | import com.auth0.jwt.algorithms.Algorithm;
29 | import com.auth0.jwt.interfaces.DecodedJWT;
30 | import com.auth0.jwt.interfaces.JWTVerifier;
31 |
32 | import lombok.extern.slf4j.Slf4j;
33 |
34 | @Service
35 | @Slf4j
36 | public class UserServiceImpl implements UserService, UserDetailsService {
37 | @Autowired
38 | private UserRepository userRepository;
39 | @Autowired
40 | private RoleRepository roleRepository;
41 | @Autowired
42 | private PasswordEncoder passwordEncoder;
43 |
44 | @Override
45 | public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
46 | User user = userRepository.findByUsername(username);
47 | if (user == null) {
48 | log.error("User not found in the database");
49 | throw new UsernameNotFoundException("User not found in the database");
50 | } else {
51 | log.info("User found in the database: {}", username);
52 | Collection authorities = new ArrayList<>();
53 | user.getRoles().forEach(role -> authorities.add(new SimpleGrantedAuthority(role.getName())));
54 | return new org.springframework.security.core.userdetails.User(user.getUsername(), user.getPassword(), authorities);
55 | }
56 | }
57 |
58 | @Override
59 | public boolean hasAdminPrivilege(String authorizationHeader) {
60 | String token = authorizationHeader.substring("Bearer ".length());
61 | Algorithm algorithm = Algorithm.HMAC256("secret".getBytes());
62 | JWTVerifier verifier = JWT.require(algorithm).build();
63 | DecodedJWT decodedJWT = verifier.verify(token);
64 | String[] roles = decodedJWT.getClaim("roles").asArray(String.class);
65 | boolean hasPrivilege = false;
66 | for (int i = 0; i < roles.length; i++) {
67 | if ("ROLE_ADMIN".equals(roles[i])) {
68 | hasPrivilege = true;
69 | }
70 | }
71 | return hasPrivilege;
72 | }
73 |
74 | @Override
75 | public boolean isBlocked(Long userId) {
76 | return userRepository.getById(userId).getBanned();
77 | }
78 |
79 | @Override
80 | public User getUserById(Long id) {
81 | log.info("Fetching user by id");
82 | return userRepository.getById(id);
83 | }
84 |
85 | @Override
86 | public User getUser(String username) {
87 | log.info("Fetching user {}", username);
88 | return userRepository.findByUsername(username);
89 | }
90 |
91 | @Override
92 | public User getUserFromAuthorizationHeader(String authorizationHeader) {
93 | String token = authorizationHeader.substring("Bearer ".length());
94 | Algorithm algorithm = Algorithm.HMAC256("secret".getBytes());
95 | JWTVerifier verifier = JWT.require(algorithm).build();
96 | DecodedJWT decodedJWT = verifier.verify(token);
97 | String username = decodedJWT.getSubject();
98 | return getUser(username);
99 | }
100 |
101 | @Override
102 | public User signupUser(SignupData signupData) {
103 | log.info("Signup user {}", signupData.getFirstName());
104 | User user = getUser(signupData.getUsername());
105 | if (user != null) return null;
106 | user = new User();
107 | user.setFirstName(signupData.getFirstName());
108 | user.setLastName(signupData.getLastName());
109 | user.setUsername(signupData.getUsername());
110 | user.setPassword(signupData.getPassword());
111 | user.setBrithdate(Instant.ofEpochMilli(signupData.getTimestamp()).atZone(ZoneId.systemDefault()).toLocalDate());
112 | user.setCity(signupData.getCity());
113 | user.setCountry(signupData.getCountry());
114 | user.setBanned(false);
115 | User savedUser = saveUser(user);
116 | addRoleToUser(savedUser.getUsername(), "ROLE_USER");
117 | return savedUser;
118 | }
119 |
120 | @Override
121 | public User changePassword(Long userId, String oldPassword, String newPassword) {
122 | User user = getUserById(userId);
123 | if (passwordEncoder.matches(oldPassword, user.getPassword())) {
124 | log.info("Password is changed");
125 | user.setPassword(passwordEncoder.encode(newPassword));
126 | return userRepository.save(user);
127 | }
128 | log.info("Password isn't changed");
129 | return null;
130 | }
131 |
132 | @Override
133 | public User updateUser(User user, String firstName, String lastName, Long timestamp, String city, String country) {
134 | log.info("Update user data");
135 | user.setFirstName(firstName);
136 | user.setLastName(lastName);
137 | user.setBrithdate(Instant.ofEpochMilli(timestamp).atZone(ZoneId.systemDefault()).toLocalDate());
138 | user.setCity(city);
139 | user.setCountry(country);
140 | return userRepository.save(user);
141 | }
142 |
143 | @Override
144 | public Boolean logoutUser(HttpServletRequest request, HttpServletResponse response) {
145 | Authentication auth = SecurityContextHolder.getContext().getAuthentication();
146 | SecurityContextLogoutHandler handler = null;
147 | if (auth != null) {
148 | handler = new SecurityContextLogoutHandler();
149 | handler.logout(request, response, auth);
150 | }
151 | return handler.isInvalidateHttpSession();
152 | }
153 |
154 | @Override
155 | public User saveUser(User user) {
156 | log.info("Saving new user {} to the database", user.getFirstName());
157 | user.setPassword(passwordEncoder.encode(user.getPassword()));
158 | return userRepository.save(user);
159 | }
160 |
161 | @Override
162 | public Role saveRole(Role role) {
163 | log.info("Saving new role {} to the database", role.getName());
164 | return roleRepository.save(role);
165 | }
166 |
167 | @Override
168 | public void addRoleToUser(String username, String roleName) {
169 | log.info("Adding role {} to user {}", roleName, username);
170 | User user = userRepository.findByUsername(username);
171 | Role role = roleRepository.findByName(roleName);
172 | user.getRoles().add(role);
173 | userRepository.save(user);
174 | }
175 | }
176 |
--------------------------------------------------------------------------------
/backend/src/main/java/com/app/backend/services/CarServiceImpl.java:
--------------------------------------------------------------------------------
1 | package com.app.backend.services;
2 |
3 | import java.io.IOException;
4 | import java.util.HashMap;
5 | import java.util.Map;
6 |
7 | import org.apache.tika.Tika;
8 | import org.springframework.beans.factory.annotation.Autowired;
9 | import org.springframework.data.domain.Page;
10 | import org.springframework.data.domain.PageRequest;
11 | import org.springframework.data.domain.Pageable;
12 | import org.springframework.stereotype.Service;
13 | import org.springframework.util.StringUtils;
14 | import org.springframework.web.multipart.MultipartFile;
15 |
16 | import com.app.backend.models.Brand;
17 | import com.app.backend.models.Car;
18 | import com.app.backend.models.Color;
19 | import com.app.backend.models.FrontCar;
20 | import com.app.backend.models.Fuel;
21 | import com.app.backend.models.Model;
22 | import com.app.backend.models.User;
23 | import com.app.backend.repositories.BrandRepository;
24 | import com.app.backend.repositories.CarRepository;
25 | import com.app.backend.repositories.ColorRepository;
26 | import com.app.backend.repositories.FuelRepository;
27 | import com.app.backend.repositories.ModelRepository;
28 | import com.app.backend.util.CarResponse;
29 | import com.app.backend.util.CarUrlName;
30 | import com.app.backend.util.FileUploadUtil;
31 | import com.fasterxml.jackson.databind.ObjectMapper;
32 |
33 | import lombok.extern.slf4j.Slf4j;
34 |
35 | @Service
36 | @Slf4j
37 | public class CarServiceImpl implements CarService {
38 | @Autowired
39 | private CarRepository carRepository;
40 | @Autowired
41 | private BrandRepository brandRepository;
42 | @Autowired
43 | private ModelRepository modelRepository;
44 | @Autowired
45 | private FuelRepository fuelRepository;
46 | @Autowired
47 | private ColorRepository colorRepository;
48 |
49 | @SuppressWarnings("serial")
50 | private Map mimeTypes = new HashMap() {
51 | {
52 | put("image/png", "png");
53 | put("image/jpeg", "jpg");
54 | put("image/jpg", "jpg");
55 | }
56 | };
57 |
58 | @Override
59 | public Car addCar(MultipartFile image, String carData, User user) throws IOException {
60 | CarUrlName temp = new CarUrlName();
61 | getCarFileName(image, carData, temp);
62 | temp.getCar().setOwner(user);
63 | Car savedCar = carRepository.save(temp.getCar());
64 | saveImage(temp.getFileName(), image);
65 | log.info("Add car");
66 | return savedCar;
67 | }
68 |
69 | @Override
70 | public Car getCar(Long id) {
71 | log.info("Get car");
72 | return carRepository.getById(id);
73 | }
74 |
75 | @Override
76 | public CarResponse getCars(Integer page, Integer pagesize) {
77 | Pageable pageable = PageRequest.of(page, pagesize);
78 | Page cars = carRepository.findAll(pageable);
79 | CarResponse response = new CarResponse();
80 | response.setCars(cars.getContent());
81 | response.setCount(cars.getTotalElements());
82 | log.info("Get cars");
83 | return response;
84 | }
85 |
86 | @Override
87 | public CarResponse getMyCars(User user, Integer page, Integer pagesize) {
88 | Pageable pageable = PageRequest.of(page, pagesize);
89 | Page cars = carRepository.findByOwner(user, pageable);
90 | CarResponse response = new CarResponse();
91 | response.setCars(cars.getContent());
92 | response.setCount(cars.getTotalElements());
93 | log.info("Get my cars");
94 | return response;
95 | }
96 |
97 | @Override
98 | public Car updateCarImage(Long id, MultipartFile image, String carData, User user) throws IOException {
99 | CarUrlName temp = new CarUrlName();
100 | getCarFileName(image, carData, temp);
101 | Car c = carRepository.getById(id);
102 | Car newCar = temp.getCar();
103 | c.setTitle(newCar.getTitle());
104 | c.setBrand(newCar.getBrand());
105 | c.setModel(newCar.getModel());
106 | c.setPath(newCar.getPath());
107 | c.setMileage(newCar.getMileage());
108 | c.setRegistration(newCar.getRegistration());
109 | c.setPrice(newCar.getPrice());
110 | c.setFuel(newCar.getFuel());
111 | c.setColor(newCar.getColor());
112 | c.setPhone(newCar.getPhone());
113 | c.setContent(newCar.getContent());
114 | if (user.getId() != c.getOwner().getId()) return null;
115 | Car savedCar = carRepository.save(c);
116 | saveImage(temp.getFileName(), image);
117 | log.info("Update car image");
118 | return savedCar;
119 | }
120 |
121 | @Override
122 | public Car updateCarNoImage(Long id, FrontCar frontCar, User user) {
123 | Car c = carRepository.getById(id);
124 | if (user.getId() != c.getOwner().getId()) return null;
125 | c.setTitle(frontCar.getTitle());
126 | Brand brand = brandRepository.findByName(frontCar.getBrand());
127 | c.setBrand(brand);
128 | Model model = modelRepository.findByName(frontCar.getModel());
129 | c.setModel(model);
130 | c.setMileage(frontCar.getMileage());
131 | c.setRegistration(frontCar.getRegistration());
132 | c.setPrice(frontCar.getPrice());
133 | Fuel fuel = fuelRepository.findByName(frontCar.getFuel());
134 | c.setFuel(fuel);
135 | Color color = colorRepository.findByName(frontCar.getColor());
136 | c.setColor(color);
137 | c.setPhone(frontCar.getPhone());
138 | c.setContent(frontCar.getContent());
139 | Car savedCar = carRepository.save(c);
140 | log.info("Update car no image");
141 | return savedCar;
142 | }
143 |
144 | @Override
145 | public Long deleteCar(Long id, User user) {
146 | Car p = carRepository.getById(id);
147 | if (user.getId() != p.getOwner().getId()) return null;
148 | carRepository.deleteById(id);
149 | log.info("Delete car");
150 | return id;
151 | }
152 |
153 | private void getCarFileName(MultipartFile image, String carData, CarUrlName temp) throws IOException {
154 | Car car = getCarFromString(carData);
155 | temp.setCar(car);
156 | String name = StringUtils.cleanPath(image.getOriginalFilename());
157 | Tika tika = new Tika();
158 | String ext = mimeTypes.get(tika.detect(image.getBytes()));
159 | temp.setFileName(name + "-" + System.currentTimeMillis() + "." + ext);
160 | temp.getCar().setPath("http://localhost:8081/images/" + temp.getFileName());
161 | }
162 |
163 | private void saveImage(String fileName, MultipartFile image) throws IOException {
164 | String uploadDir = "images";
165 | FileUploadUtil.saveFile(uploadDir, fileName, image);
166 | }
167 |
168 | private Car getCarFromString(String carData) throws IOException {
169 | FrontCar frontCar = new ObjectMapper().readValue(carData, FrontCar.class);
170 | Car car = new Car();
171 | car.setId(frontCar.getId());
172 | car.setTitle(frontCar.getTitle());
173 | Brand brand = brandRepository.findByName(frontCar.getBrand());
174 | car.setBrand(brand);
175 | Model model = modelRepository.findByName(frontCar.getModel());
176 | car.setModel(model);
177 | car.setMileage(frontCar.getMileage());
178 | car.setRegistration(frontCar.getRegistration());
179 | car.setPrice(frontCar.getPrice());
180 | Fuel fuel = fuelRepository.findByName(frontCar.getFuel());
181 | car.setFuel(fuel);
182 | Color color = colorRepository.findByName(frontCar.getColor());
183 | car.setColor(color);
184 | log.info(frontCar.getPhone());
185 | car.setPhone(frontCar.getPhone());
186 | car.setContent(frontCar.getContent());
187 | return car;
188 | }
189 | }
190 |
--------------------------------------------------------------------------------