s

ZipTeamOrange-server/pom.xml

@@ -30,10 +30,22 @@
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
 		</dependency>
 		<dependency>
+			<groupId>io.jsonwebtoken</groupId>
+			<artifactId>jjwt</artifactId>
+			<version>0.9.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.datatype</groupId>
+			<artifactId>jackson-datatype-jsr310</artifactId>
+		</dependency>
+		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
-
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-security</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-rest</artifactId>

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Config/AuditingConfig.java

@@ -0,0 +1,42 @@
+package ZipTeamOrange.config;
+
+
+import ZipTeamOrange.security.UserPrincipal;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.domain.AuditorAware;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.security.authentication.AnonymousAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+
+import java.util.Optional;
+
+@Configuration
+@EnableJpaAuditing
+public class AuditingConfig {
+
+    @Bean
+    public AuditorAware<Long> auditorProvider() {
+        return new SpringSecurityAuditAwareImpl();
+    }
+
+
+    class SpringSecurityAuditAwareImpl implements AuditorAware<Long> {
+
+        @Override
+        public Optional<Long> getCurrentAuditor() {
+            Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+
+            if (authentication == null ||
+                    !authentication.isAuthenticated() ||
+                    authentication instanceof AnonymousAuthenticationToken) {
+                return Optional.empty();
+            }
+
+            UserPrincipal userPrincipal = (UserPrincipal) authentication.getPrincipal();
+
+            return Optional.ofNullable(userPrincipal.getId());
+        }
+    }
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Config/SecurityConfig.java

@@ -0,0 +1,96 @@
+package ZipTeamOrange.config;
+
+import ZipTeamOrange.security.CustomUserDetailsService;
+import ZipTeamOrange.security.JwtAuthenticationEntryPoint;
+import ZipTeamOrange.security.JwtAuthenticationFilter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpMethod;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.config.BeanIds;
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+
+@Configuration
+@EnableWebSecurity
+@EnableGlobalMethodSecurity(
+        securedEnabled = true,
+        jsr250Enabled = true,
+        prePostEnabled = true
+)
+public class SecurityConfig extends WebSecurityConfigurerAdapter {
+    @Autowired
+    CustomUserDetailsService customUserDetailsService;
+
+    @Autowired
+    private JwtAuthenticationEntryPoint unauthorizedHandler;
+
+    @Bean
+    public JwtAuthenticationFilter jwtAuthenticationFilter() {
+        return new JwtAuthenticationFilter();
+    }
+
+    @Override
+    public void configure(AuthenticationManagerBuilder authenticationManagerBuilder) throws Exception {
+        authenticationManagerBuilder
+                .userDetailsService(customUserDetailsService)
+                .passwordEncoder(passwordEncoder());
+    }
+
+    @Bean(BeanIds.AUTHENTICATION_MANAGER)
+    @Override
+    public AuthenticationManager authenticationManagerBean() throws Exception {
+        return super.authenticationManagerBean();
+    }
+
+    @Bean
+    public PasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
+
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        http
+                .cors()
+                .and()
+                .csrf()
+                .disable()
+                .exceptionHandling()
+                .authenticationEntryPoint(unauthorizedHandler)
+                .and()
+                .sessionManagement()
+                .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
+                .and()
+                .authorizeRequests()
+                .antMatchers("/",
+                        "/favicon.ico",
+                        "/**/*.png",
+                        "/**/*.gif",
+                        "/**/*.svg",
+                        "/**/*.jpg",
+                        "/**/*.html",
+                        "/**/*.css",
+                        "/**/*.js")
+                .permitAll()
+                .antMatchers("/api/auth/**")
+                .permitAll()
+                .antMatchers("/api/user/checkUsernameAvailability", "/api/user/checkEmailAvailability")
+                .permitAll()
+                .antMatchers(HttpMethod.GET, "/api/polls/**", "/api/users/**")
+                .permitAll()
+                .anyRequest()
+                .authenticated();
+
+        // Add our custom JWT security filter
+        http.addFilterBefore(jwtAuthenticationFilter(), UsernamePasswordAuthenticationFilter.class);
+
+    }
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Controller/ChatController.java

@@ -0,0 +1,30 @@
+//package ZipTeamOrange.controller;
+//
+//import ZipTeamOrange.model.Chat;
+//import ZipTeamOrange.repository.ChatRepository;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.controller;
+//import org.springframework.web.bind.annotation.*;
+//
+//@controller
+//@RequestMapping(path = "/chat")
+//@CrossOrigin(origins = {"http://localhost:8103"})
+//public class ChatController {
+//
+//    @Autowired
+//    private ChatRepository chatRepository;
+//
+//    @PostMapping(path="/add")
+//    public @ResponseBody
+//    Chat addNewChat(@RequestBody Chat chat){
+//        chatRepository.save(chat);
+//        return  chat;
+//    }
+//
+//    @GetMapping(path="/all")
+//    public @ResponseBody Iterable<Chat> getAllChat() {
+//        //this returns a JSON or XML with chats
+//        return chatRepository.findAll();
+//
+//    }
+//}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Controller/MessageController.java

@@ -0,0 +1,33 @@
+//package ZipTeamOrange.controller;
+//
+//import ZipTeamOrange.model.Message;
+//import ZipTeamOrange.repository.MessageRepository;
+//import com.fasterxml.jackson.core.JsonProcessingException;
+//import com.fasterxml.jackson.databind.ObjectMapper;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.*;
+//
+//@RestController
+//@RequestMapping(path = "/message")
+//@CrossOrigin("http://localhost:8100")
+//public class MessageController {
+//    ObjectMapper ob = new ObjectMapper();
+//
+//    @Autowired
+//    private MessageRepository messageRepository;
+//    @PostMapping(path = "/add")
+//    public String postMessage(@RequestBody Message message) throws JsonProcessingException {
+//
+//        messageRepository.save(message);
+//
+//        return ob.writeValueAsString(message);
+//
+//    }
+//
+//    @GetMapping(path = "/all")
+//    public @ResponseBody Iterable<Message> getAllMessages(){
+//        return messageRepository.findAll();
+//    }
+//
+//
+//}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/user/UserController.java → ZipTeamOrange-server/src/main/java/ZipTeamOrange/Controller/UserController.java

@@ -1,12 +1,13 @@
-package ZipTeamOrange.user;
+package ZipTeamOrange.controller;
 
+import ZipTeamOrange.model.User;
+import ZipTeamOrange.repository.UserRepository;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-@Controller
+@RestController
 @RequestMapping(path = "/user")
 public class UserController {
 

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Model/Audit/DateAudit.java

@@ -0,0 +1,45 @@
+package ZipTeamOrange.model.Audit;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import javax.persistence.Column;
+import javax.persistence.EntityListeners;
+import javax.persistence.MappedSuperclass;
+import java.io.Serializable;
+import java.time.Instant;
+
+@MappedSuperclass
+@EntityListeners(AuditingEntityListener.class)
+@JsonIgnoreProperties(
+        value = {"createdAt", "updatedAt"},
+        allowGetters = true
+)
+public abstract class DateAudit implements Serializable {
+
+    @CreatedDate
+    @Column(nullable = false, updatable = false)
+    private Instant createdAt;
+
+    @LastModifiedDate
+    @Column(nullable = false)
+    private Instant updatedAt;
+
+    public Instant getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Instant createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Instant getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Instant updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Model/Chat.java

@@ -0,0 +1,68 @@
+package ZipTeamOrange.model;
+
+import ZipTeamOrange.model.Audit.UserDateAudit;
+import ZipTeamOrange.model.Message;
+import ZipTeamOrange.model.User;
+import javax.persistence.*;
+import javax.validation.constraints.NotBlank;
+import java.util.Set;
+
+@Entity
+@Table(name = "chats")
+public class Chat extends UserDateAudit {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @NotBlank
+    private String topic;
+
+    @OneToMany(mappedBy = "chat",
+    cascade = CascadeType.ALL,
+    fetch = FetchType.EAGER,
+    orphanRemoval = true)
+    private Set<Message> messages;
+
+//    @ManyToMany(mappedBy = "chat")
+//    private Set<User> users;
+
+    public Chat(String topic, Set<Message> messages) {
+        this.topic = topic;
+        this.messages = messages;
+    }
+
+    public Chat() { }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getTopic() {
+        return topic;
+    }
+
+    public void setTopic(String topic) {
+        this.topic = topic;
+    }
+
+    public Set<Message> getMessages() {
+        return messages;
+    }
+
+    public void setMessages(Set<Message> messages) {
+        this.messages = messages;
+    }
+
+    //    public Set<User> getUsers() {
+//        return users;
+//    }
+//
+//    public void setUsers(Set<User> users) {
+//        this.users = users;
+//    }
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Model/Message.java

@@ -0,0 +1,55 @@
+package ZipTeamOrange.model;
+
+import ZipTeamOrange.model.Audit.DateAudit;
+import ZipTeamOrange.model.Audit.UserDateAudit;
+
+import javax.persistence.*;
+
+@Entity
+public class Message extends UserDateAudit {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private long id;
+
+    String text;
+
+//    @ManyToOne
+//    @JoinColumn(name="user_id")
+//    User user;
+
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
+    @JoinColumn(name = "chat_id", nullable = false)
+    private Chat chat;
+
+    public Message() { }
+
+    public Message(String text) {
+        this.text = text;
+        //this.user = user;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+//    public User getUser() {
+//        return user;
+//    }
+//
+//    public void setUser(User user) {
+//        this.user = user;
+//    }
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Model/Role.java

@@ -0,0 +1,42 @@
+package ZipTeamOrange.model;
+
+import org.hibernate.annotations.NaturalId;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "roles")
+public class Role {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Enumerated(EnumType.STRING)
+    @NaturalId
+    @Column(length = 60)
+    private RoleName name;
+
+    public Role() {
+
+    }
+
+    public Role(RoleName name) {
+        this.name = name;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public RoleName getName() {
+        return name;
+    }
+
+    public void setName(RoleName name) {
+        this.name = name;
+    }
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Model/RoleName.java

@@ -0,0 +1,6 @@
+package ZipTeamOrange.model;
+
+public enum  RoleName {
+    ROLE_USER,
+    ROLE_ADMIN
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Model/User.java

@@ -0,0 +1,106 @@
+package ZipTeamOrange.model;
+
+import org.hibernate.annotations.NaturalId;
+
+import javax.persistence.*;
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import java.util.HashSet;
+import java.util.Set;
+
+
+@Entity
+@Table(name = "users", uniqueConstraints = {
+        @UniqueConstraint(columnNames = {
+                "username"
+        }),
+        @UniqueConstraint(columnNames = {
+                "email"
+        })
+})
+public class User {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @NotBlank
+    private String username;
+
+    @NotBlank
+    @NaturalId
+    @Email
+    private String email;
+
+    @NotBlank
+    private String password;
+
+    @ManyToMany(fetch = FetchType.LAZY)
+    @JoinTable(name = "user_roles",
+            joinColumns = @JoinColumn(name = "user_id"),
+            inverseJoinColumns = @JoinColumn(name = "role_id"))
+    private Set<Role> roles = new HashSet<>();
+
+
+//    @OneToMany(mappedBy = "user")
+//    private Set<Message> messages;
+//
+//    @ManyToMany
+//    @JoinTable(
+//            name = "USER_CHAT",
+//            joinColumns = { @JoinColumn(name = "user_id") },
+//            inverseJoinColumns = { @JoinColumn(name = "chat_id") }
+//    )
+//    private Set<Chat> chat;
+
+
+    public User() {
+    }
+
+
+    public User(String username, String email, String password) {
+        this.username = username;
+        this.email = email;
+        this.password = password;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String userName) {
+        this.username = userName;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public Set<Role> getRoles() {
+        return roles;
+    }
+
+    public void setRoles(Set<Role> roles) {
+        this.roles = roles;
+    }
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Payload/ApiResponse.java

@@ -0,0 +1,27 @@
+package ZipTeamOrange.payload;
+
+public class ApiResponse {
+    private Boolean success;
+    private String message;
+
+    public ApiResponse(Boolean success, String message) {
+        this.success = success;
+        this.message = message;
+    }
+
+    public Boolean getSuccess() {
+        return success;
+    }
+
+    public void setSuccess(Boolean success) {
+        this.success = success;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Payload/JwtAuthenticationResponse.java

@@ -0,0 +1,26 @@
+package ZipTeamOrange.payload;
+
+public class JwtAuthenticationResponse {
+    private String accessToken;
+    private String tokenType = "Bearer";
+
+    public JwtAuthenticationResponse(String accessToken) {
+        this.accessToken = accessToken;
+    }
+
+    public String getAccessToken() {
+        return accessToken;
+    }
+
+    public void setAccessToken(String accessToken) {
+        this.accessToken = accessToken;
+    }
+
+    public String getTokenType() {
+        return tokenType;
+    }
+
+    public void setTokenType(String tokenType) {
+        this.tokenType = tokenType;
+    }
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Payload/LoginRequest.java

@@ -0,0 +1,27 @@
+package ZipTeamOrange.payload;
+
+import javax.validation.constraints.NotBlank;
+
+public class LoginRequest {
+    @NotBlank
+    private String usernameOrEmail;
+
+    @NotBlank
+    private String password;
+
+    public String getUsernameOrEmail() {
+        return usernameOrEmail;
+    }
+
+    public void setUsernameOrEmail(String usernameOrEmail) {
+        this.usernameOrEmail = usernameOrEmail;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Payload/SignUpRequest.java

@@ -0,0 +1,45 @@
+package ZipTeamOrange.payload;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+public class SignUpRequest {
+
+    @NotBlank
+    @Size(min = 3, max = 15)
+    private String username;
+
+    @NotBlank
+    @Size(max = 40)
+    @Email
+    private String email;
+
+    @NotBlank
+    @Size(min = 6, max = 20)
+    private String password;
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Repository/ChatRepository.java

@@ -0,0 +1,25 @@
+package ZipTeamOrange.repository;
+
+import ZipTeamOrange.model.Chat;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface ChatRepository extends JpaRepository<Chat, Long> {
+
+    Optional<Chat> findById(Long chatId);
+
+    Page<Chat> findByCreatedBy(Long userId, Pageable pageable);
+
+    long countByCreatedBy(Long userId);
+
+    List<Chat> findByIdIn(List<Long> chatIds);
+
+    List<Chat> findByIdIn(List<Long> chatIds, Sort sort);
+
+}
+

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Repository/MessageRepository.java

@@ -0,0 +1,30 @@
+package ZipTeamOrange.repository;
+
+import ZipTeamOrange.model.Chat;
+import ZipTeamOrange.model.Message;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface MessageRepository extends JpaRepository<Message, Long> {
+
+    Optional<Message> findById(Long messageId);
+
+    Page<Message> findByCreatedBy(Long userId, Pageable pageable);
+
+    long countByCreatedBy(Long userId);
+
+//    @Query("SELECT COUNT(m.id) from Message v where v.user.id = :userId")
+//    long countByUserId(@Param("userId") Long userId);
+
+    List<Message> findByIdIn(List<Long> messageIds);
+
+    List<Message> findByIdIn(List<Long> messageIds, Sort sort);
+
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Repository/RoleRepository.java

@@ -0,0 +1,13 @@
+package ZipTeamOrange.repository;
+
+import ZipTeamOrange.model.Role;
+import ZipTeamOrange.model.RoleName;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.Optional;
+
+@Repository
+public interface RoleRepository extends JpaRepository<Role, Long> {
+    Optional<Role> findByName(RoleName roleName);
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Repository/UserRepository.java

@@ -0,0 +1,23 @@
+package ZipTeamOrange.repository;
+
+import ZipTeamOrange.model.User;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Optional;
+
+
+@Repository
+public interface UserRepository extends JpaRepository<User, Long> {
+    Optional<User> findByEmail(String email);
+
+    Optional<User> findByUsernameOrEmail(String username, String email);
+
+    List<User> findByIdIn(List<Long> userIds);
+
+    Optional<User> findByUsername(String username);
+
+    Boolean existsByUsername(String username);
+
+    Boolean existsByEmail(String email);}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Security/CurrentUser.java

@@ -0,0 +1,13 @@
+package ZipTeamOrange.security;
+
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+
+import java.lang.annotation.*;
+
+@Target({ElementType.PARAMETER, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@AuthenticationPrincipal
+public @interface CurrentUser {
+
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Security/CustomUserDetailsService.java

@@ -0,0 +1,41 @@
+package ZipTeamOrange.security;
+
+import ZipTeamOrange.model.User;
+import ZipTeamOrange.repository.UserRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+public class CustomUserDetailsService implements UserDetailsService {
+
+    @Autowired
+    UserRepository userRepository;
+
+    @Override
+    @Transactional
+    public UserDetails loadUserByUsername(String usernameOrEmail)
+            throws UsernameNotFoundException {
+        // Let people login with either username or email
+        User user = userRepository.findByUsernameOrEmail(usernameOrEmail, usernameOrEmail)
+                .orElseThrow(() ->
+                        new UsernameNotFoundException("User not found with username or email : " + usernameOrEmail)
+                );
+
+        return UserPrincipal.create(user);
+    }
+
+    // This method is used by JWTAuthenticationFilter
+    @Transactional
+    public UserDetails loadUserById(Long id) {
+        User user = userRepository.findById(id).orElseThrow(
+                () -> new UsernameNotFoundException("User not found with id : " + id)
+        );
+
+        return UserPrincipal.create(user);
+    }
+}
+

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Security/JwtAuthenticationEntryPoint.java

@@ -0,0 +1,26 @@
+package ZipTeamOrange.security;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.web.AuthenticationEntryPoint;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@Component
+public class JwtAuthenticationEntryPoint implements AuthenticationEntryPoint {
+
+    private static final Logger logger = LoggerFactory.getLogger(JwtAuthenticationEntryPoint.class);
+    @Override
+    public void commence(HttpServletRequest httpServletRequest,
+                         HttpServletResponse httpServletResponse,
+                         AuthenticationException e) throws IOException, ServletException {
+        logger.error("Responding with unauthorized error. Message - {}", e.getMessage());
+        httpServletResponse.sendError(HttpServletResponse.SC_UNAUTHORIZED,
+                "Sorry, You're not authorized to access this resource.");
+    }
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Security/JwtAuthenticationFilter.java

@@ -0,0 +1,58 @@
+package ZipTeamOrange.security;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
+import org.springframework.util.StringUtils;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class JwtAuthenticationFilter extends OncePerRequestFilter {
+
+    @Autowired
+    private JwtTokenProvider tokenProvider;
+
+    @Autowired
+    private CustomUserDetailsService customUserDetailsService;
+
+    private static final Logger logger = LoggerFactory.getLogger(JwtAuthenticationFilter.class);
+
+    @Override
+    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
+        try {
+            String jwt = getJwtFromRequest(request);
+
+            if (StringUtils.hasText(jwt) && tokenProvider.validateToken(jwt)) {
+                Long userId = tokenProvider.getUserIdFromJWT(jwt);
+
+                UserDetails userDetails = customUserDetailsService.loadUserById(userId);
+                UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
+                authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
+
+                SecurityContextHolder.getContext().setAuthentication(authentication);
+            }
+        } catch (Exception ex) {
+            logger.error("Could not set user authentication in security context", ex);
+        }
+
+        filterChain.doFilter(request, response);
+    }
+
+    private String getJwtFromRequest(HttpServletRequest request) {
+        String bearerToken = request.getHeader("Authorization");
+        if (StringUtils.hasText(bearerToken) && bearerToken.startsWith("Bearer ")) {
+            return bearerToken.substring(7, bearerToken.length());
+        }
+        return null;
+    }
+}
+

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Security/JwtTokenProvider.java

@@ -0,0 +1,64 @@
+package ZipTeamOrange.security;
+
+import io.jsonwebtoken.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.core.Authentication;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+@Component
+public class JwtTokenProvider {
+
+    private static final Logger logger = LoggerFactory.getLogger(JwtTokenProvider.class);
+
+    @Value("${app.jwtSecret}")
+    private String jwtSecret;
+
+    @Value("${app.jwtExpirationInMs}")
+    private int jwtExpirationInMs;
+
+    public String generateToken(Authentication authentication) {
+
+        UserPrincipal userPrincipal = (UserPrincipal) authentication.getPrincipal();
+
+        Date now = new Date();
+        Date expiryDate = new Date(now.getTime() + jwtExpirationInMs);
+
+        return Jwts.builder()
+                .setSubject(Long.toString(userPrincipal.getId()))
+                .setIssuedAt(new Date())
+                .setExpiration(expiryDate)
+                .signWith(SignatureAlgorithm.HS512, jwtSecret)
+                .compact();
+    }
+
+    public Long getUserIdFromJWT(String token) {
+        Claims claims = Jwts.parser()
+                .setSigningKey(jwtSecret)
+                .parseClaimsJws(token)
+                .getBody();
+
+        return Long.parseLong(claims.getSubject());
+    }
+
+    public boolean validateToken(String authToken) {
+        try {
+            Jwts.parser().setSigningKey(jwtSecret).parseClaimsJws(authToken);
+            return true;
+        } catch (SignatureException ex) {
+            logger.error("Invalid JWT signature");
+        } catch (MalformedJwtException ex) {
+            logger.error("Invalid JWT token");
+        } catch (ExpiredJwtException ex) {
+            logger.error("Expired JWT token");
+        } catch (UnsupportedJwtException ex) {
+            logger.error("Unsupported JWT token");
+        } catch (IllegalArgumentException ex) {
+            logger.error("JWT claims string is empty.");
+        }
+        return false;
+    }
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Security/UserPrincipal.java

@@ -0,0 +1,107 @@
+package ZipTeamOrange.security;
+
+import ZipTeamOrange.model.User;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+public class UserPrincipal implements UserDetails {
+    private Long id;
+
+    private String name;
+
+    private String username;
+
+    @JsonIgnore
+    private String email;
+
+    @JsonIgnore
+    private String password;
+
+    private Collection<? extends GrantedAuthority> authorities;
+
+    public UserPrincipal(Long id, String username, String email, String password, Collection<? extends GrantedAuthority> authorities) {
+        this.id = id;
+        this.username = username;
+        this.email = email;
+        this.password = password;
+        this.authorities = authorities;
+    }
+
+    public static UserPrincipal create(User user) {
+        List<GrantedAuthority> authorities = user.getRoles().stream().map(role ->
+                new SimpleGrantedAuthority(role.getName().name())
+        ).collect(Collectors.toList());
+
+        return new UserPrincipal(
+                user.getId(),
+                user.getUsername(),
+                user.getEmail(),
+                user.getPassword(),
+                authorities
+        );
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    @Override
+    public String getUsername() {
+        return username;
+    }
+
+    @Override
+    public String getPassword() {
+        return password;
+    }
+
+    @Override
+    public Collection<? extends GrantedAuthority> getAuthorities() {
+        return authorities;
+    }
+
+    @Override
+    public boolean isAccountNonExpired() {
+        return true;
+    }
+
+    @Override
+    public boolean isAccountNonLocked() {
+        return true;
+    }
+
+    @Override
+    public boolean isCredentialsNonExpired() {
+        return true;
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return true;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        UserPrincipal that = (UserPrincipal) o;
+        return Objects.equals(id, that.id);
+    }
+
+    @Override
+    public int hashCode() {
+
+        return Objects.hash(id);
+    }
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/ZipTeamOrangeApplication.java

@@ -2,10 +2,24 @@ package ZipTeamOrange;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.data.jpa.convert.threeten.Jsr310JpaConverters;
+
+import javax.annotation.PostConstruct;
+import java.util.TimeZone;
 
 @SpringBootApplication
+@EntityScan(basePackageClasses = {
+
+		ZipTeamOrangeApplication.class,
+		Jsr310JpaConverters.class
+})
 public class ZipTeamOrangeApplication {
 
+	@PostConstruct
+	void init() {
+		TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+	}
 
 	public static void main(String[] args) {
 		SpringApplication.run(ZipTeamOrangeApplication.class, args);

ZipTeamOrange-server/src/main/java/ZipTeamOrange/chat/Chat.java

@@ -1,52 +0,0 @@
-package ZipTeamOrange.chat;
-
-import ZipTeamOrange.message.Message;
-import ZipTeamOrange.user.User;
-import javax.persistence.*;
-import java.util.Set;
-
-@Entity
-public class Chat {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-    private String name;
-
-    @OneToMany(mappedBy = "chat")
-    private Set<Message> messages;
-
-    @ManyToMany(mappedBy = "chat")
-    private Set<User> users;
-
-    public Chat(String name, Set<User> users) {
-        this.name = name;
-        this.users = users;
-    }
-
-    public Chat(){}
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Set<User> getUsers() {
-        return users;
-    }
-
-    public void setUsers(Set<User> users) {
-        this.users = users;
-    }
-}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/chat/ChatController.java

@@ -1,28 +0,0 @@
-package ZipTeamOrange.chat;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-@Controller
-@RequestMapping(path = "/chat")
-@CrossOrigin(origins = {"http://localhost:8103"})
-public class ChatController {
-
-    @Autowired
-    private ChatRepository chatRepository;
-
-    @PostMapping(path="/add")
-    public @ResponseBody
-    Chat addNewChat(@RequestBody Chat chat){
-        chatRepository.save(chat);
-        return  chat;
-    }
-
-    @GetMapping(path="/all")
-    public @ResponseBody Iterable<Chat> getAllChat() {
-        //this returns a JSON or XML with chats
-        return chatRepository.findAll();
-
-    }
-}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/chat/ChatRepository.java

@@ -1,6 +0,0 @@
-package ZipTeamOrange.chat;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface ChatRepository extends JpaRepository<Chat, Long> {
-}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/config/WebMvcConfig.java

@@ -0,0 +1,19 @@
+package ZipTeamOrange.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class WebMvcConfig implements WebMvcConfigurer {
+
+    private final long MAX_AGE_SECS = 3600;
+
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")
+                .allowedOrigins("*")
+                .allowedMethods("HEAD", "OPTIONS", "GET", "POST", "PUT", "PATCH", "DELETE")
+                .maxAge(MAX_AGE_SECS);
+    }
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/controller/AuthController.java

@@ -0,0 +1,98 @@
+package ZipTeamOrange.controller;
+
+import ZipTeamOrange.exception.AppException;
+import ZipTeamOrange.model.Role;
+import ZipTeamOrange.model.RoleName;
+import ZipTeamOrange.model.User;
+import ZipTeamOrange.payload.ApiResponse;
+import ZipTeamOrange.payload.JwtAuthenticationResponse;
+import ZipTeamOrange.payload.LoginRequest;
+import ZipTeamOrange.payload.SignUpRequest;
+import ZipTeamOrange.repository.RoleRepository;
+import ZipTeamOrange.repository.UserRepository;
+import ZipTeamOrange.security.JwtTokenProvider;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+
+import javax.validation.Valid;
+import java.net.URI;
+import java.util.Collections;
+
+@RestController
+@RequestMapping("/api/auth")
+public class AuthController {
+
+    @Autowired
+    AuthenticationManager authenticationManager;
+
+    @Autowired
+    UserRepository userRepository;
+
+    @Autowired
+    RoleRepository roleRepository;
+
+    @Autowired
+    PasswordEncoder passwordEncoder;
+
+    @Autowired
+    JwtTokenProvider tokenProvider;
+
+    @PostMapping("/signin")
+    public ResponseEntity<?> authenticateUser(@Valid @RequestBody LoginRequest loginRequest) {
+
+        Authentication authentication = authenticationManager.authenticate(
+                new UsernamePasswordAuthenticationToken(
+                        loginRequest.getUsernameOrEmail(),
+                        loginRequest.getPassword()
+                )
+        );
+
+        SecurityContextHolder.getContext().setAuthentication(authentication);
+
+        String jwt = tokenProvider.generateToken(authentication);
+        return ResponseEntity.ok(new JwtAuthenticationResponse(jwt));
+    }
+
+    @PostMapping("/signup")
+    public ResponseEntity<?> registerUser(@Valid @RequestBody SignUpRequest signUpRequest) {
+        if(userRepository.existsByUsername(signUpRequest.getUsername())) {
+            return new ResponseEntity(new ApiResponse(false, "Username is already taken!"),
+                    HttpStatus.BAD_REQUEST);
+        }
+
+        if(userRepository.existsByEmail(signUpRequest.getEmail())) {
+            return new ResponseEntity(new ApiResponse(false, "Email Address already in use!"),
+                    HttpStatus.BAD_REQUEST);
+        }
+
+        // Creating user's account
+        User user = new User(signUpRequest.getUsername(),
+                signUpRequest.getEmail(), signUpRequest.getPassword());
+
+        user.setPassword(passwordEncoder.encode(user.getPassword()));
+
+        Role userRole = roleRepository.findByName(RoleName.ROLE_USER)
+                .orElseThrow(() -> new AppException("User Role not set."));
+
+        user.setRoles(Collections.singleton(userRole));
+
+        User result = userRepository.save(user);
+
+        URI location = ServletUriComponentsBuilder
+                .fromCurrentContextPath().path("/api/users/{username}")
+                .buildAndExpand(result.getUsername()).toUri();
+
+        return ResponseEntity.created(location).body(new ApiResponse(true, "User registered successfully"));
+    }
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/exception/AppException.java

@@ -0,0 +1,15 @@
+package ZipTeamOrange.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+public class AppException extends RuntimeException {
+    public AppException(String message) {
+        super(message);
+    }
+
+    public AppException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/exception/BadRequestException.java

@@ -0,0 +1,16 @@
+package ZipTeamOrange.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(HttpStatus.BAD_REQUEST)
+public class BadRequestException extends RuntimeException {
+
+    public BadRequestException(String message) {
+        super(message);
+    }
+
+    public BadRequestException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/exception/ResourceNotFoundException.java

@@ -0,0 +1,30 @@
+package ZipTeamOrange.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(HttpStatus.NOT_FOUND)
+public class ResourceNotFoundException extends RuntimeException {
+    private String resourceName;
+    private String fieldName;
+    private Object fieldValue;
+
+    public ResourceNotFoundException( String resourceName, String fieldName, Object fieldValue) {
+        super(String.format("%s not found with %s : '%s'", resourceName, fieldName, fieldValue));
+        this.resourceName = resourceName;
+        this.fieldName = fieldName;
+        this.fieldValue = fieldValue;
+    }
+
+    public String getResourceName() {
+        return resourceName;
+    }
+
+    public String getFieldName() {
+        return fieldName;
+    }
+
+    public Object getFieldValue() {
+        return fieldValue;
+    }
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/message/Message.java

@@ -1,54 +0,0 @@
-package ZipTeamOrange.message;
-
-import ZipTeamOrange.chat.Chat;
-import ZipTeamOrange.user.User;
-import javax.persistence.*;
-
-@Entity
-public class Message {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private long id;
-    String message;
-    @ManyToOne
-    @JoinColumn(name="user_id")
-    User user;
-
-    @ManyToOne
-    @JoinColumn(name = "chat_id")
-    private Chat chat;
-
-
-    public Message(String message) {
-        this.message = message;
-        //this.user = user;
-    }
-
-
-    public Message(){}
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public User getUser() {
-        return user;
-    }
-
-    public void setUser(User user) {
-        this.user = user;
-    }
-}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/message/MessageController.java

@@ -1,31 +0,0 @@
-package ZipTeamOrange.message;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-@RestController
-@RequestMapping(path = "/message")
-@CrossOrigin("http://localhost:8100")
-public class MessageController {
-    ObjectMapper ob = new ObjectMapper();
-
-    @Autowired
-    private MessageRepository messageRepository;
-    @PostMapping(path = "/add")
-    public String postMessage(@RequestBody Message message) throws JsonProcessingException {
-
-        messageRepository.save(message);
-
-        return ob.writeValueAsString(message);
-
-    }
-
-    @GetMapping(path = "/all")
-    public @ResponseBody Iterable<Message> getAllMessages(){
-        return messageRepository.findAll();
-    }
-
-
-}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/message/MessageRepository.java

@@ -1,8 +0,0 @@
-package ZipTeamOrange.message;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface MessageRepository extends JpaRepository<Message, Long> {
-
-
-}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/model/Audit/UserDateAudit.java

@@ -0,0 +1,38 @@
+package ZipTeamOrange.model.Audit;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import org.springframework.data.annotation.CreatedBy;
+import org.springframework.data.annotation.LastModifiedBy;
+
+import javax.persistence.Column;
+import javax.persistence.MappedSuperclass;
+
+@MappedSuperclass
+@JsonIgnoreProperties(
+        value = {"createdBy", "updatedBy"},
+        allowGetters = true
+)
+public abstract class UserDateAudit extends DateAudit {
+    @CreatedBy
+    @Column(updatable = false)
+    private Long createdBy;
+
+    @LastModifiedBy
+    private Long updatedBy;
+
+    public Long getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(Long createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    public Long getUpdatedBy() {
+        return updatedBy;
+    }
+
+    public void setUpdatedBy(Long updatedBy) {
+        this.updatedBy = updatedBy;
+    }
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/payload/ChatRequest.java

@@ -0,0 +1,46 @@
+package ZipTeamOrange.payload;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.util.List;
+
+public class ChatRequest {
+    @NotBlank
+    @Size(max = 140)
+    private String topic;
+
+    @NotNull
+    @Size(min = 2, max = 6)
+    @Valid
+    private List<MessageRequest> choices;
+
+//    @NotNull
+//    @Valid
+//    private PollLength pollLength;
+
+    public String getTopic() {
+        return topic;
+    }
+
+    public void setTopic(String topic) {
+        this.topic = topic;
+    }
+
+    public List<MessageRequest> getChoices() {
+        return choices;
+    }
+
+    public void setChoices(List<MessageRequest> choices) {
+        this.choices = choices;
+    }
+
+//    public PollLength getPollLength() {
+//        return pollLength;
+//    }
+//
+//    public void setPollLength(PollLength pollLength) {
+//        this.pollLength = pollLength;
+//    }
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/payload/MessageRequest.java

@@ -0,0 +1,18 @@
+package ZipTeamOrange.payload;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+public class MessageRequest {
+    @NotBlank
+    @Size(max = 40)
+    private String text;
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/payload/UserIdentityAvailability.java

@@ -0,0 +1,17 @@
+package ZipTeamOrange.payload;
+
+public class UserIdentityAvailability {
+    private Boolean available;
+
+    public UserIdentityAvailability(Boolean available) {
+        this.available = available;
+    }
+
+    public Boolean getAvailable() {
+        return available;
+    }
+
+    public void setAvailable(Boolean available) {
+        this.available = available;
+    }
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/payload/UserSummary.java

@@ -0,0 +1,28 @@
+package ZipTeamOrange.payload;
+
+public class UserSummary {
+    private Long id;
+    private String username;
+
+    public UserSummary(Long id, String username, String name) {
+        this.id = id;
+        this.username = username;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/user/User.java

@@ -1,70 +0,0 @@
-package ZipTeamOrange.user;
-
-import ZipTeamOrange.chat.Chat;
-import ZipTeamOrange.message.Message;
-import javax.persistence.*;
-import java.util.Set;
-
-
-@Entity
-public class User {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-    private String userName;
-    private String email;
-    private String password;
-    @OneToMany(mappedBy = "user")
-    private Set<Message> messages;
-    @ManyToMany
-    @JoinTable(
-            name = "USER_CHAT",
-            joinColumns = { @JoinColumn(name = "user_id") },
-            inverseJoinColumns = { @JoinColumn(name = "chat_id") }
-    )
-    private Set<Chat> chat;
-
-
-    public User() {
-    }
-
-
-    public User(String userName, String email, String password) {
-        this.userName = userName;
-        this.email = email;
-        this.password = password;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/user/UserRepository.java

@@ -1,8 +0,0 @@
-package ZipTeamOrange.user;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-
-
-public interface UserRepository extends JpaRepository<User, Long>{
-
-}

ZipTeamOrange-server/src/main/resources/application.properties

@@ -1,7 +1,19 @@
 #spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect
+spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDialect
 spring.jpa.hibernate.ddl-auto=create-drop
-spring.datasource.url=jdbc:mysql://localhost:3306/ZipTeamOrange?useSSL=false
+
+spring.datasource.url=jdbc:mysql://localhost:3306/ZipTeamOrange?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false
 spring.datasource.username=root
-#spring.datasource.password=password
-logging.level.org.hibernate.SQL=DEBUG
-logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
+spring.datasource.password=password
+
+## Hibernate Logging
+logging.level.org.hibernate.SQL= DEBUG
+
+## Jackson Properties
+spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS= false
+spring.jackson.time-zone= UTC
+logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
+
+## App Properties
+app.jwtSecret= JWTSuperSecretKey
+app.jwtExpirationInMs = 604800000

ZipTeamOrange-server/src/main/resources/data.sql

@@ -0,0 +1,3 @@
+insert into roles(name) values ('ROLE_ADMIN');
+insert into roles(name) values ('ROLE_USER');
+--select count (m.id) from Messages where m.userId = userId;