Changeset 46fd0c7 for src/main/java/edu/gjoko/schedlr/config

Timestamp:

03/13/23 00:58:07 (20 months ago)

Author:

Gjoko Kostadinov <gjoko.kostadinov@…>

Branches:

master

Children:

9050790

Parents:

2b0a4db

Message:

Add admin page initial work.

Location:

src/main/java/edu/gjoko/schedlr/config

Files:

• AppFilter.java (modified) (3 diffs)
• AppSecurityConfig.java (modified) (1 diff)
• MvcConfig.java (modified) (2 diffs)

src/main/java/edu/gjoko/schedlr/config/AppFilter.java

@@ -4 +4 @@
 import org.springframework.security.core.context.SecurityContextImpl;
 import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.util.StringUtils;
 import org.springframework.web.filter.GenericFilterBean;
 
@@ -23 +24 @@
         HttpSession session = httpServletRequest.getSession(false);
 
+        if(httpServletRequest.getRequestURI().endsWith(".js") || httpServletRequest.getRequestURI().endsWith(".css")) {
+            filterChain.doFilter(servletRequest, servletResponse);
+            return;
+        }
         if(session != null) {
             Map<String, String> roleTargetUrlMap = new HashMap<>();
-            roleTargetUrlMap.put("ADMIN", "/date");
-            roleTargetUrlMap.put("CUSTOMER", "/number");
-            roleTargetUrlMap.put("BUSINESS_OWNER", "");
+            roleTargetUrlMap.put("ADMIN", "/admin");
+            roleTargetUrlMap.put("CUSTOMER", "/homepage");
+            roleTargetUrlMap.put("BUSINESS_OWNER", "/business_homepage");
             SecurityContextImpl sci = (SecurityContextImpl) session.getAttribute("SPRING_SECURITY_CONTEXT");
             if(sci != null) {
@@ -34 +39 @@
                 for (final GrantedAuthority grantedAuthority : authorities) {
                     String authorityName = grantedAuthority.getAuthority();
-                    if("DATE".equalsIgnoreCase(authorityName)) {
-                        servletRequest.getRequestDispatcher("date").forward(servletRequest, servletResponse);
-                        return;
-                    } else if("GUESS_NUMBER".equalsIgnoreCase(authorityName)) {
-                        try {
-                            servletRequest.getRequestDispatcher("number").forward(servletRequest, servletResponse);
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-
+                    String page = "";
+                    switch (authorityName) {
+                        case "ADMIN":
+                            page = "/admin";
+                            break;
+                        case "CUSTOMER":
+                        case "BUSINESS_OWNER":
+                            page = "/homepage";
+                            break;
+                        default:
+                            break;
+                    }
+                    if(page != null && !page.trim().isEmpty()) {
+                        servletRequest.getRequestDispatcher(page).forward(servletRequest, servletResponse);
                         return;
                     }

src/main/java/edu/gjoko/schedlr/config/AppSecurityConfig.java

@@ -60 +60 @@
                 .antMatchers("/register_business").permitAll()
                 .antMatchers("/api/nomenclatures/*").permitAll()
+                .antMatchers("/api/business").permitAll()
                 .antMatchers("/homepage").permitAll()
                 .antMatchers("/css/**").permitAll()

src/main/java/edu/gjoko/schedlr/config/MvcConfig.java

@@ -2 +2 @@
 
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -14 +15 @@
         registry.addViewController("/register_business").setViewName("register_business");
         registry.addViewController("/homepage").setViewName("homepage");
+        registry.addViewController("/admin").setViewName("admin");
     }
 
-
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("/resources/**")
+                .addResourceLocations("/resources/");
+    }
 }