Changeset 8bcd64c for src/main/java/edu/gjoko/schedlr/controllers

Timestamp:

04/19/23 21:19:08 (15 months ago)

Author:

Gjoko Kostadinov <gjoko.kostadinov@…>

Branches:

master

Children:

950fa0d

Parents:

9050790

Message:

Add admin functionality and business admin functionality.

Location:

src/main/java/edu/gjoko/schedlr/controllers

Files:

• AdminController.java (modified) (2 diffs)
• HomePageController.java (modified) (1 diff)
• LoginController.java (modified) (2 diffs)
• RegisterController.java (modified) (1 diff)
• rest/BusinessController.java (modified) (2 diffs)

src/main/java/edu/gjoko/schedlr/controllers/AdminController.java

@@ -1 +1 @@
 package edu.gjoko.schedlr.controllers;
 
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+
+import javax.servlet.http.HttpServletRequest;
+import java.security.Principal;
 
 @Controller
@@ -9 +14 @@
 
     @GetMapping(path = "/admin")
-    public String getAdminPageTemplate(Model model) {
+    public String getAdminPageTemplate(Model model, HttpServletRequest request) {
         return "admin";
     }
+
+    @GetMapping(path = "/business_admin")
+    public String getBusinessAdminPageTemplate(Model model, HttpServletRequest request) {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        String currentPrincipalName = authentication.getName();
+
+        return "business_admin";
+    }
+
+
 }

src/main/java/edu/gjoko/schedlr/controllers/HomePageController.java

@@ -6 +6 @@
 import org.springframework.web.bind.annotation.PostMapping;
 
-import java.security.Principal;
-
 @Controller
 public class HomePageController {
 
     @GetMapping(path = "/homepage")
-    public String getHomePageTemplate(Model model, Principal principal) {
-        System.out.println(principal);
+    public String getHomePageTemplate(Model model) {
         return "homepage";
     }

src/main/java/edu/gjoko/schedlr/controllers/LoginController.java

@@ -7 +7 @@
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.security.Principal;
 
 @Controller
@@ -12 +15 @@
 
     @GetMapping(path = "/login")
-    public String getMapping(@ModelAttribute Stakeholder customer, Model model) {
+    public String getMapping(@RequestParam(value = "error", required = false) String error,
+                             @ModelAttribute Stakeholder customer, Model model) {
         return "login";
     }

src/main/java/edu/gjoko/schedlr/controllers/RegisterController.java

@@ -28 +28 @@
     @PostMapping(path = "/register_customer")
     public String registerCustomer(@ModelAttribute Stakeholder customer, Model model) {
-        Stakeholder user = stakeholderService.saveStakeholder(customer);
+        stakeholderService.saveStakeholder(customer);
         return "redirect:login";
     }

src/main/java/edu/gjoko/schedlr/controllers/rest/BusinessController.java

@@ -4 +4 @@
 import edu.gjoko.schedlr.services.BusinessService;
 import lombok.AllArgsConstructor;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
@@ -29 +32 @@
         businessService.updateBusinesses(businessList);
     }
+
+    @GetMapping(path = "/me")
+    public Business getPersonalInfo(HttpServletRequest request) {
+        Long businessOwnerId = (long) request.getSession(true).getAttribute("stakeholderId");
+        return businessService.findByOwner(businessOwnerId);
+    }
 }