implement user login

7 files changed, 92 insertions, 26 deletions

diff --git a/backend/src/main/java/com/blog/web/controllers/AuthController.java b/backend/src/main/java/com/blog/web/controllers/AuthController.java
index 1f854c3..a870086 100644
--- a/backend/src/main/java/com/blog/web/controllers/AuthController.java
+++ b/backend/src/main/java/com/blog/web/controllers/AuthController.java
@@ -19,22 +19,6 @@ public class AuthController {
         this.userService = userService;
     }
 
-    @GetMapping("/userlogin")
-    public String login(Model model) {
-        final UserEntity user = userService.getLoggedInUser().orElse(new UserEntity());
-        model.addAttribute("user", user);
-        return "auth/login";
-    }
-
-    /*
-    @GetMapping("/register")
-    public String getRegisterForm(Model model) {
-        final RegistrationDto user = new RegistrationDto();
-        model.addAttribute("user", user);
-        return "auth/register";
-    }
-    */
-
     //@PostMapping("/register/save")
     @PostMapping("/register")
     public RegistrationDto register(@Valid @ModelAttribute("user") RegistrationDto user, BindingResult result) {
@@ -48,13 +32,9 @@ public class AuthController {
             result.rejectValue("username", "There is already a user with this username");
         }
 
-        if (result.hasErrors()) {
-            //model.addAttribute("user", user);
-            //return "register";
-            return user;
+        if (!result.hasErrors()) {
+            userService.saveUser(user);
         }
-        userService.saveUser(user);
-        //return "redirect:/articles?success";
         return user;
     }
 }
diff --git a/backend/src/main/java/com/blog/web/security/SecurityConfig.java b/backend/src/main/java/com/blog/web/security/SecurityConfig.java
index 17e09c7..2be6909 100644
--- a/backend/src/main/java/com/blog/web/security/SecurityConfig.java
+++ b/backend/src/main/java/com/blog/web/security/SecurityConfig.java
@@ -28,7 +28,7 @@ public class SecurityConfig {
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
         // disabling csrf leaves us vulnerable, in a real production app do not do this
-        http.csrf(c -> c.disable()).cors(c -> c.disable()).authorizeHttpRequests(auths -> auths.anyRequest().permitAll()).formLogin(form -> form.loginPage("/userlogin").usernameParameter("username").passwordParameter("password").defaultSuccessUrl("/articles").loginProcessingUrl("/userlogin").failureUrl("/userlogin?error=true").permitAll()).logout(logout -> logout.logoutUrl("/logout").logoutSuccessUrl("/articles"));
+        http.csrf(c -> c.disable()).cors(c -> c.disable()).authorizeHttpRequests(auths -> auths.anyRequest().permitAll()).formLogin(form -> form.loginPage("/login").usernameParameter("username").passwordParameter("password").defaultSuccessUrl("/").loginProcessingUrl("/userlogin").failureUrl("/userlogin?error=true").permitAll()).logout(logout -> logout.logoutUrl("/logout").logoutSuccessUrl("/articles"));
         return http.build();
     }
 
diff --git a/frontend/.vite/deps/_metadata.json b/frontend/.vite/deps/_metadata.json
new file mode 100644
index 0000000..905310f
--- /dev/null
+++ b/frontend/.vite/deps/_metadata.json
@@ -0,0 +1,8 @@
+{
+  "hash": "bbd9c4a2",
+  "configHash": "b7c090cb",
+  "lockfileHash": "e3b0c442",
+  "browserHash": "f33efd09",
+  "optimized": {},
+  "chunks": {}
+}
\ No newline at end of file
diff --git a/frontend/.vite/deps/package.json b/frontend/.vite/deps/package.json
new file mode 100644
index 0000000..3dbc1ca
--- /dev/null
+++ b/frontend/.vite/deps/package.json
@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}
diff --git a/frontend/src/pages/Login.tsx b/frontend/src/pages/Login.tsx
new file mode 100644
index 0000000..317fdb9
--- /dev/null
+++ b/frontend/src/pages/Login.tsx
@@ -0,0 +1,73 @@
+import { useState, useEffect } from "react";
+import { useParams, useNavigate } from "react-router-dom";
+
+export default function Article () {
+	const navigate = useNavigate();
+
+const handleSubmit = async (e: FormEvent<HTMLFormElement>) => {
+		e.preventDefault(); //stops submit from happening
+
+		const target = e.target as typeof e.target & {
+			username: { value: string };
+			email: { value: string };
+			password: { value: string };
+		};
+
+		const formData = new FormData();
+		formData.append('username', target.username.value);
+		formData.append('password', target.password.value);
+
+		const response = await fetch(`${import.meta.env.VITE_API_TITLE}/api/v1/register`, {
+			credentials: 'include',
+			method: 'post',
+			body: formData,
+		});
+		if(response.ok) {
+			navigate("/");
+		}
+		else {
+			alert("error");
+		}
+	};
+
+	return(
+		<>
+<div className="text-xl p-4 bg-black text-red-500">Invalid Username/Password</div>
+<div className="text-xl p-4 bg-black text-red-500">You have been logged out</div>
+
+<div className="flex h-full justify-center bg-white p-12">
+    <form onSubmit={handleSubmit} method="post" className="w-full max-w-lg">
+        <div className="flex flex-wrap -mx-3 mb-6">
+            <div className="w-full md:w-1/2 px-3 mb-6 md:mb-0">
+                <label className="block uppercase tracking-wide text-gray-700 text-xs font-bold mb-2">
+                    Title
+                </label>
+                <input className="appearance-none block w-full bg-gray-200 text-gray-700 border rounded py-3 px-4 mb-3 leading-tight focus:outline-none focus:bg-white"
+                       id="username"
+                       type="text"
+                       name="username"
+                       placeholder="Ted"/>
+            </div>
+        </div>
+        <div className="flex flex-wrap -mx-3 mb-6">
+            <div className="w-full px-3">
+                <label className="block uppercase tracking-wide text-gray-700 text-xs font-bold mb-2">
+                    Password
+                </label>
+                <input className="appearance-none block w-full bg-gray-200 text-gray-700 border border-gray-200 rounded py-3 px-4 leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
+                       id="password"
+                       type="password"
+                       name="password"
+                       placeholder="Doe"/>
+            </div>
+        </div>
+        <div className="flex flex-wrap mb-2">
+        </div>
+        <button type="submit" value="Log in" className="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded">Log In</button>
+
+    </form>
+</div>
+		</>
+	);
+
+}
diff --git a/frontend/src/pages/Register.tsx b/frontend/src/pages/Register.tsx
index 786d252..14ceea4 100644
--- a/frontend/src/pages/Register.tsx
+++ b/frontend/src/pages/Register.tsx
@@ -14,9 +14,9 @@ const handleSubmit = async (e: FormEvent<HTMLFormElement>) => {
 		};
 
 		const formData = new FormData();
-		formData.append('user[username]', target.username.value);
-		formData.append('user[email]', target.email.value);
-		formData.append('user[password]', target.password.value);
+		formData.append('username', target.username.value);
+		formData.append('email', target.email.value);
+		formData.append('password', target.password.value);
 
 		const response = await fetch(`${import.meta.env.VITE_API_TITLE}/api/v1/register`, {
 			credentials: 'include',
diff --git a/frontend/src/routes/index.tsx b/frontend/src/routes/index.tsx
index 718268a..6d7ffb1 100644
--- a/frontend/src/routes/index.tsx
+++ b/frontend/src/routes/index.tsx
@@ -3,6 +3,7 @@ import Home from "../pages/Home";
 import Layout from "../components/Layout";
 import Article from "../pages/Article";
 import Register from "../pages/Register";
+import Login from "../pages/Login";
 
 export default function Index()
 {
@@ -13,6 +14,7 @@ export default function Index()
 							<Route index element={<Home />} />
 							<Route path="/article/:id" element={<Article />} />
 							<Route path="register" element={<Register />} />
+							<Route path="login" element={<Login />} />
 						</Route>
 					</Routes>
 				</Router>