temp rollback of spring security features to allow testing

hooverdc · Apr 22, 2024 · 3503576 · 3503576
1 parent ac9ec2a
commit 3503576
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 16 deletions.
diff --git a/ReactFrontEnd/package-lock.json b/ReactFrontEnd/package-lock.json
diff --git a/ReactFrontEnd/package.json b/ReactFrontEnd/package.json
@@ -21,7 +21,7 @@
     "match-sorter": "^6.3.4",
     "react": "^18.2.0",
     "react-cookie": "^7.1.4",
-    "react-datepicker": "^6.6.0",
+    "react-datepicker": "^6.9.0",
     "react-dom": "^18.2.0",
     "react-icons": "^5.0.1",
     "react-leaflet": "^4.2.1",

diff --git a/ReactFrontEnd/src/Components/Header.jsx b/ReactFrontEnd/src/Components/Header.jsx
@@ -47,6 +47,11 @@ function Header() {
             icon:HiUser,
             path:'/profile'
         },
+        {
+            name: 'LOGIN',
+            icon: HiUser,
+            path: '/login'
+        }
 
     ]
     return (

diff --git a/ReactFrontEnd/src/Services/LoginService.jsx b/ReactFrontEnd/src/Services/LoginService.jsx
@@ -14,7 +14,7 @@ class LoginService {
         instance.interceptors.request.use((config) => {
             const hash = window.btoa(user.username+":"+user.password);
             if (hash) {
-                let authHeader = "Basic "+hash;
+                let authHeader = "Basic "+ hash;
                 instance.defaults.headers["Authorization"] = authHeader;
                 window.localStorage.setItem("Auth", authHeader);
             }

diff --git a/ReactFrontEnd/src/Services/ReviewServices.jsx b/ReactFrontEnd/src/Services/ReviewServices.jsx
@@ -18,7 +18,6 @@ const axiosInstance = axios.create({
 
 class ReviewService {
     createReview(review) {
-        console.log(window.localStorage.getItem("Auth"));
         return axiosInstance.post(REVIEW_API_BASE_URL, review)
     }
 }

diff --git a/...BootBackEnd/demo/src/main/java/com/nationalParkApp/demo/Config/ProjectSecurityConfig.java b/...BootBackEnd/demo/src/main/java/com/nationalParkApp/demo/Config/ProjectSecurityConfig.java
@@ -43,13 +43,13 @@ public CorsConfiguration getCorsConfiguration(HttpServletRequest request) {
                 return config;
             }
 
-        })).csrf((csrf) -> csrf.csrfTokenRequestHandler(requestHandler).ignoringRequestMatchers( "/register","/user")
+        })).csrf((csrf) -> csrf.csrfTokenRequestHandler(requestHandler).ignoringRequestMatchers( "/register","/user","/api/v1/**")
                                 .csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse()))
                         .addFilterAfter(new CsrfCookieFilter(), BasicAuthenticationFilter.class)
                         .authorizeHttpRequests((requests)->requests
 
-                                .requestMatchers("/api/v1/**").authenticated()
-                                .requestMatchers("/register","/user").permitAll())
+                                //.requestMatchers("/createreview").authenticated()
+                                .requestMatchers("/register","/user","/api/v1/**").permitAll())
 
                         .formLogin(Customizer.withDefaults())
                         .httpBasic(Customizer.withDefaults());

diff --git a/...otBackEnd/demo/src/main/java/com/nationalParkApp/demo/Controller/FavoritesController.java b/...otBackEnd/demo/src/main/java/com/nationalParkApp/demo/Controller/FavoritesController.java
@@ -24,7 +24,7 @@ public ResponseEntity<Favorites> getFavoritesById(@PathVariable Long id) {
         return ResponseEntity.ok(favorites);
     }
 
-    @PostMapping("/favorites")
+    @PostMapping("/addFavorites")
     public Favorites addToFavorites(@RequestBody Favorites favorites) {
         return favoritesService.addToFavorites(favorites);
     }

diff --git a/...ngBootBackEnd/demo/src/main/java/com/nationalParkApp/demo/Controller/LoginController.java b/...ngBootBackEnd/demo/src/main/java/com/nationalParkApp/demo/Controller/LoginController.java
@@ -39,9 +39,8 @@ public ResponseEntity<String> registerUser(@RequestBody User user) {
     }
 
     @RequestMapping("/user")
-    public ResponseEntity<String> loginUser (@RequestBody User user) {
-        return ResponseEntity
-                .status(HttpStatus.CREATED)
-                .body("Given user details are successfully registered");
-    }
+    public User loginUser (@RequestBody User user) {
+        return userRepository.findByUsername(user.getUsername());
+        }
+
 }