Merge remote-tracking branch 'origin/development' into development

# Conflicts:
#	src/main/java/com/pj/keycloak/security/Roles.java
#	src/main/java/com/pj/keycloak/security/SecurityConfig.java

Author: Pavan Jadda

src/main/java/com/pj/keycloak/security/CustomCsrfFilter.java

@@ -0,0 +1,42 @@
+package com.pj.keycloak.security;
+
+import org.springframework.security.web.csrf.CsrfToken;
+import org.springframework.web.filter.OncePerRequestFilter;
+import org.springframework.web.util.WebUtils;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class CustomCsrfFilter extends OncePerRequestFilter
+{
+
+    public static final String CSRF_COOKIE_NAME = "XSRF-TOKEN";
+
+    @Override
+    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+            throws ServletException, IOException
+    {
+
+        CsrfToken csrf = (CsrfToken) request.getAttribute(CsrfToken.class.getName());
+
+        if (csrf != null)
+        {
+
+            Cookie cookie = WebUtils.getCookie(request, CSRF_COOKIE_NAME);
+            String token = csrf.getToken();
+
+            if (cookie == null || token != null && !token.equals(cookie.getValue()))
+            {
+                cookie = new Cookie(CSRF_COOKIE_NAME, token);
+                cookie.setPath("/");
+                response.addCookie(cookie);
+            }
+        }
+
+        filterChain.doFilter(request, response);
+    }
+}

src/main/java/com/pj/keycloak/service/EmployeeService.java

@@ -14,4 +14,6 @@ public interface EmployeeService
     void updateProfile(Employee employee);
 
     void saveAndFlush(Employee employee);
+
+    void deleteById(Long id);
 }

src/main/java/com/pj/keycloak/service/EmployeeServiceImpl.java

@@ -46,4 +46,10 @@ public void saveAndFlush(Employee employee)
     {
         employeeRepository.saveAndFlush(employee);
     }
+
+    @Override
+    public void deleteById(Long id)
+    {
+        employeeRepository.deleteById(id);
+    }
 }

src/main/java/com/pj/keycloak/util/UserInfoUtil.java

@@ -26,10 +26,6 @@ public String getPreferredUsername(HttpServletRequest httpServletRequest)
                 KeycloakAuthenticationToken keycloakAuthenticationToken= (KeycloakAuthenticationToken) httpServletRequest.getUserPrincipal();
                 logger.info("Subject: {}",keycloakAuthenticationToken.getAccount().getKeycloakSecurityContext().getToken().getSubject());
         */
-
-        logger.info("getUserPrincipal(): {}",httpServletRequest.getUserPrincipal());
-        logger.info("User GUID: {}",accessToken.getSubject());
-
         return accessToken.getPreferredUsername();
     }
 }

src/main/java/com/pj/keycloak/web/EmployeeController.java

@@ -5,10 +5,7 @@
 import com.pj.keycloak.util.UserInfoUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -35,8 +32,7 @@ public EmployeeController(EmployeeService employeeService, UserInfoUtil userInfo
     public List<Employee> findAll(HttpServletRequest httpServletRequest)
     {
         logger.info("User Id: {}",userInfoUtil.getPreferredUsername(httpServletRequest));
-        List<Employee> employees=employeeService.findAll();
-        return employees;
+        return employeeService.findAll();
     }
 
     @GetMapping(path = "/find/{id}")
@@ -52,22 +48,22 @@ public List<Employee> update(@PathVariable Long id)
         return employeeService.findAll();
     }
 
-    @GetMapping(path = "/create")
-    public List<Employee> create()
+    @PostMapping(path = "/create")
+    public List<Employee> create(@RequestBody Employee employee)
     {
-        Employee employee=new Employee();
-        employee.setFirstName(generateString());
-        employee.setLastName(generateString());
-        employee.setEmail(generateString());
-        employee.setSalary(new Random().nextDouble()*10000000);
         employee.setEmployeeId((long) new Random().nextInt(999999));
         employee.setUserGuid(generateString());
-        employee.setLocation(generateString());
         employeeService.saveAndFlush(employee);
 
         return employeeService.findAll();
     }
 
+    @DeleteMapping(path = "/delete/{id}")
+    public void deleteEmployee(@PathVariable Long id)
+    {
+        employeeService.deleteById(id);
+    }
+
     private String generateString()
     {
         int leftLimit = 97; // letter 'a'

src/main/resources/application.yml

@@ -9,8 +9,7 @@ keycloak:
   resource: angular-app
   public-client: true
   principal-attribute: preferred_username
-
-
+  enabled: true
 
 #Spring Properties
 spring:

src/main/webapp/spring-data-ui/package-lock.json

@@ -14,6 +14,7 @@
       <th scope="col">Phone</th>
       <th scope="col">Salary</th>
       <th scope="col">Location</th>
+      <th scope="col">Action</th>
     </tr>
     </thead>
     <tbody *ngFor="let employee of employees">
@@ -26,6 +27,7 @@
       <td>{{employee.phone}}</td>
       <td>${{employee.salary}}</td>
       <td>{{employee.location}}</td>
+      <td><button (click)="deleteEmployee(employee.id)" class="btn btn-danger">Delete</button></td>
     </tr>
     </tbody>
   </table>

src/main/webapp/spring-data-ui/src/app/employee-list/employee-list.component.html

@@ -1,4 +1,5 @@
 import {Component, OnInit} from "@angular/core";
+import {Router} from "@angular/router";
 import {NgxSpinnerService} from "ngx-spinner";
 import {KeycloakService} from "../keycloak/keycloak.service";
 import {Employee} from "./employee";
@@ -15,7 +16,9 @@ export class EmployeeListComponent implements OnInit
 
   constructor(private employeeService:EmployeeService,
               private keycloakService:KeycloakService,
-              private ngxSpinnerService:NgxSpinnerService) { }
+              private ngxSpinnerService:NgxSpinnerService,
+              private router:Router)
+  { }
 
   ngOnInit()
   {
@@ -62,7 +65,17 @@ export class EmployeeListComponent implements OnInit
   createEmployee()
   {
     this.ngxSpinnerService.show();
-    this.employeeService.createEmployee('http://localhost:8081/api/v1/employee/create').subscribe(
+    let employee=new Employee();
+    employee.employeeId=1001;
+    employee.location='Falls Church';
+    employee.salary=200000;
+    employee.email='[email protected]';
+    employee.firstName='John';
+    employee.lastName='Doe';
+    employee.phone='202-345-2333';
+
+
+    this.employeeService.createEmployee('http://localhost:8081/api/v1/employee/create',employee).subscribe(
       data=>
       {
         this.employees=data;
@@ -74,4 +87,18 @@ export class EmployeeListComponent implements OnInit
       }
     );
   }
+
+  deleteEmployee(id: number)
+  {
+    this.employeeService.deleteEmployee('http://localhost:8081/api/v1/employee/delete/'+id).subscribe(
+      data=>
+      {
+        this.getEmployees();
+      },
+      error1 =>
+      {
+        this.ngxSpinnerService.hide();
+      }
+    );
+  }
 }

src/main/webapp/spring-data-ui/src/app/employee-list/employee-list.component.ts

@@ -19,8 +19,13 @@ export class EmployeeService {
     return this.httpClient.get<Employee[]>(url);
   }
 
-  createEmployee(url: string)
+  createEmployee(url: string, employee: Employee)
   {
-    return this.httpClient.get<Employee[]>(url);
+    return this.httpClient.post<Employee[]>(url, employee);
+  }
+
+  deleteEmployee(url: string)
+  {
+    return this.httpClient.delete(url);
   }
 }