pushing changes before demo

Author: Hanyuan Li

backend/auth/user.py

@@ -3,7 +3,7 @@
 from email_validator import validate_email, EmailNotValidError
 
 from common.database import get_connection
-from common.exceptions import AuthError, InvalidError
+from common.exceptions import AuthError, InvalidError, RequestError
 
 hasher = PasswordHasher(
     time_cost=2,
@@ -46,10 +46,10 @@ def register(email, password):
         try:
             normalised = validate_email(email).email
         except EmailNotValidError as e:
-            raise AuthError(description="Invalid email") from e
+            raise RequestError(description="Invalid email") from e
 
         if User._email_exists(cursor, normalised):
-            raise AuthError(description="Email already registered")
+            raise RequestError(description="Email already registered")
 
         hashed = hasher.hash(password)
         new_id = User._add_user(conn, cursor, normalised, hashed)

backend/common/exceptions.py

@@ -1,7 +1,18 @@
-from werkzeug.exceptions import Unauthorized, InternalServerError
+from werkzeug.exceptions import BadRequest, Unauthorized, Forbidden, InternalServerError
+
+class IncorrectError(Exception):
+    def __init__(self, description):
+        super().__init__()
+        self.description = description
+
+class RequestError(BadRequest):
+    pass
 
 class AuthError(Unauthorized):
     pass
 
+class AccessError(Forbidden):
+    pass
+
 class InvalidError(InternalServerError):
     pass

backend/routes/auth.py

@@ -1,7 +1,8 @@
 from flask import Blueprint, request, jsonify
-from flask_jwt_extended import jwt_required, create_access_token, set_access_cookies, unset_jwt_cookies
+from flask_jwt_extended import jwt_required, create_access_token, set_access_cookies, unset_jwt_cookies, verify_jwt_in_request
 
 from auth.user import User
+from common.exceptions import AuthError
 
 # Constants
 
@@ -33,6 +34,15 @@ def register():
 
     return response, 200
 
+@auth.route("/verify", methods=["GET"])
+def verify():
+    try:
+        verify_jwt_in_request()
+    except:
+        raise AuthError("Not logged in")
+
+    return jsonify({}), 200
+
 @auth.route("/logout", methods=["DELETE"])
 @jwt_required()
 def logout():

frontend/src/App.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { BrowserRouter as Router, Routes, Route } from 'react-router-dom';
+import { BrowserRouter as Router, Routes, Route, Navigate } from 'react-router-dom';
 
 import 'bootstrap/dist/css/bootstrap.min.css';
 

frontend/src/components/Header.tsx

@@ -0,0 +1,9 @@
+import React from "react";
+
+const Header: React.FC<{}> = () => {
+  return (
+    <></>
+  );
+};
+
+export default Header;

frontend/src/components/ProtectedRoute.tsx

@@ -1,9 +1,20 @@
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 import { Button, Container } from "react-bootstrap";
+import { useNavigate } from "react-router-dom";
+
+import { BACKEND_URI } from "src/config";
 
 const Home: React.FC<{}> = () => {
   const [times, setTimes] = useState(0);
 
+  useEffect(() => {
+    const verifyToken = async () => {
+      const result = await fetch(`${BACKEND_URI}/verify`, )
+    };
+
+    verifyToken();
+  }, []);
+
   return (
     <>
       <Container className="justify-content-center text-center">

frontend/src/pages/Home.tsx

@@ -14,6 +14,10 @@ const Login: React.FC<{}> = () => {
   const [email, setEmail] = useState("");
   const [password, setPassword] = useState("");
 
+  const validEmailFormat = () => {
+    return /^([A-Za-z0-9_\-.])+@([A-Za-z0-9_\-.])+\.([A-Za-z]{2,})$/.test(email);
+  };
+
   const login = async () => {
     const result = await fetch(`${BACKEND_URI}/auth/login`, {
       method: "POST",
@@ -53,7 +57,10 @@ const Login: React.FC<{}> = () => {
             type="password"
             onChange={event => setPassword(event.target.value)} />
         </Form.Group>
-        <Button variant="primary" onClick={() => login()}>
+        <Button
+          variant="primary"
+          onClick={() => login()}
+          disabled={!validEmailFormat() || password === ""}>
           Submit
         </Button>
       </Form>