Bt 21 new

.gitignore

@@ -0,0 +1 @@
+/bugtracker/target/

bugtracker/.gitignore

@@ -45,4 +45,21 @@ $RECYCLE.BIN/
 *.DS_Store
 *.iml
 target
-../.idea
+../.idea
+
+# Eclipse
+.classpath
+.project
+.settings/
+
+# Intellij
+.idea/
+*.iml
+*.iws
+
+# Mac
+.DS_Store
+
+# Maven
+log/
+target/

bugtracker/src/main/java/bugtracker/MvcConfig.java

@@ -12,7 +12,8 @@
 public class MvcConfig implements WebMvcConfigurer {
 	public void addViewControllers(ViewControllerRegistry registry) {
 		registry.addViewController("/").setViewName("login");
-		registry.addViewController("/home").setViewName("hello");
+		registry.addViewController("/home").setViewName("main");
+		registry.addViewController("/main").setViewName("main");
 		registry.addViewController("/login").setViewName("login");
 		registry.addViewController("/ticket/all").setViewName("tickets");
 		registry.addViewController("/ticket").setViewName("ticket");
@@ -40,5 +41,8 @@ public void addCorsMappings(CorsRegistry registry) {
 	@Override
 	public void addResourceHandlers(final ResourceHandlerRegistry registry) {
 	    registry.addResourceHandler("/resources/**").addResourceLocations("/resources/");
+	    registry.addResourceHandler("/css/**").addResourceLocations("classpath:/static/css/");
+	    registry.addResourceHandler("/js/**").addResourceLocations("classpath:/static/js/");
+		registry.addResourceHandler("/img/**").addResourceLocations("classpath:/static/img/");
 	}
 }

bugtracker/src/main/java/bugtracker/SecurityConfig.java

@@ -32,31 +32,31 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 	@Override
 	protected void configure(HttpSecurity httpSecurity) throws Exception {
 
-
-
 		httpSecurity.authorizeRequests()
-				.antMatchers("/login*").access("hasRole('ROLE_USER') or hasRole('ROLE_ADMIN') or hasRole('ROLE_DEVELOPER') or hasRole('ROLE_APPROVER')")
-				.antMatchers("/user/new").access(" hasRole('ROLE_ADMIN')")
-				.antMatchers("/user/all*").access("hasRole('ROLE_USER') or hasRole('ROLE_ADMIN') or hasRole('ROLE_DEVELOPER') or hasRole('ROLE_APPROVER')")
-				.antMatchers("/user/modify*").access("hasRole('ROLE_ADMIN')")
-				.antMatchers("/project/**").access("hasRole('ROLE_USER') or hasRole('ROLE_ADMIN') or hasRole('ROLE_DEVELOPER') or hasRole('ROLE_APPROVER')")
-				.antMatchers("/api/**").access("hasRole('ROLE_USER') or hasRole('ROLE_ADMIN') or hasRole('ROLE_DEVELOPER') or hasRole('ROLE_APPROVER')")
-				.antMatchers("/ticket/**").access("hasRole('ROLE_USER') or hasRole('ROLE_ADMIN') or hasRole('ROLE_DEVELOPER') or hasRole('ROLE_APPROVER')")
-				.and()
-				.csrf().disable()
-				.formLogin()
-				.loginPage("/login")
-				.successForwardUrl("/api/user/dispatch")
-				.permitAll()
-				.and()
-				.logout()
-				.permitAll();
+			.antMatchers("/css/**", "/js/**", "/images/**").permitAll()
+			.antMatchers("/login*").access("hasRole('ROLE_USER') or hasRole('ROLE_ADMIN') or hasRole('ROLE_DEVELOPER') or hasRole('ROLE_APPROVER')")
+			.antMatchers("/user/new").access(" hasRole('ROLE_ADMIN')")
+			.antMatchers("/user/all*").access("hasRole('ROLE_USER') or hasRole('ROLE_ADMIN') or hasRole('ROLE_DEVELOPER') or hasRole('ROLE_APPROVER')")
+			.antMatchers("/user/modify*").access("hasRole('ROLE_ADMIN')")
+			.antMatchers("/project/**").access("hasRole('ROLE_USER') or hasRole('ROLE_ADMIN') or hasRole('ROLE_DEVELOPER') or hasRole('ROLE_APPROVER')")
+			.antMatchers("/api/user/current/**").permitAll()
+			.antMatchers("/api/**").access("hasRole('ROLE_USER') or hasRole('ROLE_ADMIN') or hasRole('ROLE_DEVELOPER') or hasRole('ROLE_APPROVER')")
+			.antMatchers("/ticket/**").access("hasRole('ROLE_USER') or hasRole('ROLE_ADMIN') or hasRole('ROLE_DEVELOPER') or hasRole('ROLE_APPROVER')")
+		.and()
+		.csrf().disable()
+			.formLogin()
+			.loginPage("/login")
+			.successForwardUrl("/api/user/dispatch")
+			.permitAll()
+		.and()
+			.logout()
+			.permitAll();
 		httpSecurity.userDetailsService(userService);
 	}
 
 	@Override
 	protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-		auth.userDetailsService(userDetailsService())
+		auth.userDetailsService(userService)
 				.passwordEncoder(passwordEncoder());
 	}
 

bugtracker/src/main/java/bugtracker/user/UserController.java

@@ -6,13 +6,19 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.web.bind.annotation.*;
 import javax.inject.Inject;
+import javax.validation.constraints.Null;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.List;
+import java.util.stream.Collectors;
+
+import static java.util.stream.Collectors.toList;
 
 @RestController
 @RequestMapping("/api/user")
@@ -71,7 +77,7 @@ public ResponseEntity<Void> dispatchUser() {
         if (cc.getAuthentication() != null) {
             Authentication auth = cc.getAuthentication();
             try {
-                headers.setLocation(new URI("/project/all"));
+                headers.setLocation(new URI("/home"));
             } catch (URISyntaxException ignored) {}
         }
 
@@ -87,4 +93,25 @@ public ResponseEntity<List<UserEntity>> getAllDeveloper(){
     public ResponseEntity<List<UserEntity>> getAllSimpleUser(){
         return new ResponseEntity<>(userService.getUsersByType(2), HttpStatus.OK);
     }
+
+    @GetMapping("/current/roles")
+    public ResponseEntity<List<String>> getCurrentUser(Authentication authentication){
+        if (authentication != null) {
+            BTUserDetails principal = (BTUserDetails) authentication.getPrincipal();
+            return new ResponseEntity<>(principal.getAuthorities().stream().map(t -> ((GrantedAuthority) t).getAuthority()).collect(toList()), HttpStatus.OK);
+        } else {
+            return new ResponseEntity<>(null, HttpStatus.UNAUTHORIZED);
+        }
+    }
+
+    @GetMapping("/searchUsers/")
+    public ResponseEntity<List<UserEntity>> searchAllUsers(){
+        return new ResponseEntity<>(userService.getAllUser(), HttpStatus.OK);
+    }
+
+    @GetMapping("/searchUsers/{searchText}")
+    public ResponseEntity<List<UserEntity>> searchUsers(@PathVariable String searchText){
+        List<UserEntity> users = userService.searchByName(searchText);
+        return new ResponseEntity<>(users, HttpStatus.OK);
+    }
 }

bugtracker/src/main/java/bugtracker/user/UserRepository.java

@@ -16,6 +16,8 @@ public interface UserRepository extends JpaRepository<UserEntity, Long> {
 
     List<UserEntity> findByType(Integer type);
 
+    List<UserEntity> findByNameContaining(String text);
+
     UserEntity findByName(String name);
 
 }

bugtracker/src/main/java/bugtracker/user/UserService.java

@@ -74,4 +74,5 @@ public BCryptPasswordEncoder passwordEncoder() {
     public List<UserEntity> getUsersByType(Integer type){
         return userRepository.findByType(type);
     }
+    public List<UserEntity> searchByName(String text) { return userRepository.findByNameContaining(text); }
 }

bugtracker/src/main/resources/application.properties

@@ -1,5 +1,5 @@
 # ==============================================================
-# = Data Source : TODO
+# = Data Source
 # ==============================================================
 #spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 #spring.datasource.url=jdbc:mysql://127.0.0.1:3306/dbname?useSSL=false
@@ -64,3 +64,5 @@ spring.jpa.hibernate.ddl-auto = update
 
 spring.resources.chain.cache=false
 
+spring.resources.add-mappings=true
+

bugtracker/src/main/resources/static/css/pictos.css

@@ -0,0 +1,21 @@
+/* Pictos Custom Font
+* Copyright (C) 2010-2012 Drew Wilson
+* http://www.pictos.cc/server    -    http://drewwilson.com
+*
+* The fonts included in this document and used on this website are subject to the
+* End User License Agreement entered into by the website owner. The fonts are protected
+* under domestic and international trademark and copyright law. All parties other than
+* the owner of this website are prohibited from using, modifying, reverse engineering,
+* duplicating, or distributing the fonts in this document.
+* These fonts are NOT free. It is illegal to use these fonts without paying for a license.
+*
+*/
+@font-face {
+  font-family: 'Pictos';
+  src: url('pictos.eot');
+  src: url('pictos.eot?#iefix') format('embedded-opentype'),
+  		url('pictos.woff') format('woff'),
+  		url('pictos.ttf') format('truetype');
+  font-weight: normal;
+  font-style: normal;
+}