added some features

+ sql file with all the requests needed to create all the database's tables + http file with some requests to test the backend + automatically sign out and redirect to home after any activity if the token has expired

Author: ElyesBerriri

angular-11-client/src/app/board-admin/board-admin.component.ts

@@ -1,4 +1,5 @@
 import { Component, OnInit } from '@angular/core';
+import { TokenStorageService } from '../_services/token-storage.service';
 import { UserService } from '../_services/user.service';
 
 @Component({
@@ -9,7 +10,7 @@ import { UserService } from '../_services/user.service';
 export class BoardAdminComponent implements OnInit {
  content?: string;
 
- constructor(private userService: UserService) { }
+ constructor(private userService: UserService, private tokenStorageService: TokenStorageService) { }
 
  ngOnInit(): void {
  this.userService.getAdminBoard().subscribe(
@@ -18,6 +19,8 @@ export class BoardAdminComponent implements OnInit {
  },
  err => {
  this.content = JSON.parse(err.error).message;
+ this.tokenStorageService.signOut();
+ window.location.assign("/home");
  }
  );
  }

angular-11-client/src/app/board-moderator/board-moderator.component.ts

@@ -1,4 +1,5 @@
 import { Component, OnInit } from '@angular/core';
+import { TokenStorageService } from '../_services/token-storage.service';
 import { UserService } from '../_services/user.service';
 
 @Component({
@@ -9,7 +10,7 @@ import { UserService } from '../_services/user.service';
 export class BoardModeratorComponent implements OnInit {
  content?: string;
 
- constructor(private userService: UserService) { }
+ constructor(private userService: UserService, private tokenStorageService: TokenStorageService) { }
 
  ngOnInit(): void {
  this.userService.getModeratorBoard().subscribe(
@@ -18,6 +19,8 @@ export class BoardModeratorComponent implements OnInit {
  },
  err => {
  this.content = JSON.parse(err.error).message;
+ this.tokenStorageService.signOut();
+ window.location.assign("/home");
  }
  );
  }

angular-11-client/src/app/board-user/board-user.component.ts

@@ -1,4 +1,5 @@
 import { Component, OnInit } from '@angular/core';
+import { TokenStorageService } from '../_services/token-storage.service';
 import { UserService } from '../_services/user.service';
 
 @Component({
@@ -9,7 +10,7 @@ import { UserService } from '../_services/user.service';
 export class BoardUserComponent implements OnInit {
  content?: string;
 
- constructor(private userService: UserService) { }
+ constructor(private userService: UserService, private tokenStorageService: TokenStorageService) { }
 
  ngOnInit(): void {
  this.userService.getUserBoard().subscribe(
@@ -18,6 +19,8 @@ export class BoardUserComponent implements OnInit {
  },
  err => {
  this.content = JSON.parse(err.error).message;
+ this.tokenStorageService.signOut();
+ window.location.assign("/home");
  }
  );
  }

angular-11-client/src/app/profile/profile.component.ts

@@ -1,5 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { TokenStorageService } from '../_services/token-storage.service';
+import { UserService } from '../_services/user.service';
 
 @Component({
  selector: 'app-profile',
@@ -9,9 +10,18 @@ import { TokenStorageService } from '../_services/token-storage.service';
 export class ProfileComponent implements OnInit {
  currentUser: any;
 
- constructor(private token: TokenStorageService) { }
-
+ constructor(private token: TokenStorageService, private userService: UserService) { }
+//me
  ngOnInit(): void {
- this.currentUser = this.token.getUser();
+ this.userService.getUserBoard().subscribe(
+ data => {
+ this.currentUser = this.token.getUser();
+ },
+ err => {
+ this.token.signOut();
+ window.location.assign("/home");
+ }
+ );
+ 
  }
 }

angular-11-client/src/assets/security.ico

@@ -5,7 +5,7 @@
  <title>Angular11JwtAuth</title>
  <base href="/" />
  <meta name="viewport" content="width=device-width, initial-scale=1" />
- <link rel="icon" type="image/x-icon" href="favicon.ico" />
+ <link rel="icon" type="image/x-icon" href="./assets/security.ico" />
  <link
  rel="stylesheet"
  href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"

angular-11-client/src/index.html

@@ -9,6 +9,6 @@
 import com.bezkoder.springjwt.models.Role;
 
 @Repository
-public interface RoleRepository extends JpaRepository<Role, Long> {
+public interface RoleRepository extends JpaRepository<Role, Integer> {
 Optional<Role> findByName(ERole name);
 }

spring-boot-server/src/main/java/com/bezkoder/springjwt/repository/RoleRepository.java

@@ -1,6 +1,6 @@
-spring.datasource.url= jdbc:mysql://localhost:3306/testdb?useSSL=false&useJDBCCompliantTimezoneShift=true&serverTimezone=UTC
+spring.datasource.url= jdbc:mysql://localhost:3306/cpc?useSSL=false&useJDBCCompliantTimezoneShift=true&serverTimezone=UTC
 spring.datasource.username= root
-spring.datasource.password= 123456
+spring.datasource.password= 472000
 
 spring.jpa.properties.hibernate.dialect= org.hibernate.dialect.MySQL5InnoDBDialect
 spring.jpa.hibernate.ddl-auto= update

spring-boot-server/src/main/resources/application.properties

@@ -0,0 +1,35 @@
+drop table user_roles;
+drop table roles;
+drop table users;
+
+create table users
+(
+ id bigint auto_increment
+ primary key,
+ username varchar(20) not null,
+ email varchar(50) not null,
+ password varchar(120) not null,
+ constraint email
+ unique (email),
+ constraint username
+ unique (username)
+);
+
+create table roles
+(
+ id int auto_increment
+ primary key,
+ name varchar(20) null
+);
+insert into roles (name) values ("ROLE_USER"),("ROLE_MODERATOR"),("ROLE_ADMIN");
+
+create table user_roles
+(
+ user_id bigint not null,
+ role_id int not null,
+ primary key (user_id, role_id),
+ constraint fk_user_role_role
+ foreign key (role_id) references roles (id),
+ constraint fk_user_role_user
+ foreign key (user_id) references users (id)
+);

spring-boot-server/src/main/resources/devTools/db.sql

@@ -0,0 +1,27 @@
+POST http://localhost:8080/api/auth/signup
+Content-Type: application/json
+
+{
+ "username" : "moderator",
+ "email" : "moderator@gmail.com",
+ "role": ["mod","user"],
+ "password" : "password"
+}
+###
+GET http://localhost:8080/api/test/all
+
+###
+POST http://localhost:8080/api/auth/signin
+Content-Type: application/json
+
+{
+ "username" : "moderator",
+ "password" : "password"
+}
+###
+GET http://localhost:8080/api/test/mod
+Authorization: Bearer replace_with_actual_access_token
+
+###
+GET http://localhost:8080/api/test/admin
+Authorization: Bearer replace_with_actual_access_token