feat: setup for setting first password

main.py

@@ -8,11 +8,13 @@ from sqlmodel import (
 from fastapi.middleware.cors import CORSMiddleware
 from analysis import analysis_router
 from security import (
+    change_password,
     get_current_active_user,
     login_for_access_token,
     logout,
-    read_users_me,
+    read_player_me,
     read_own_items,
+    set_first_password,
 )
 
 
@@ -66,6 +68,11 @@ def list_teams():
 player_router = APIRouter(prefix="/player")
 player_router.add_api_route("/list", endpoint=list_players, methods=["GET"])
 player_router.add_api_route("/add", endpoint=add_player, methods=["POST"])
+player_router.add_api_route("/me", endpoint=read_player_me, methods=["GET"])
+player_router.add_api_route("/me/items", endpoint=read_own_items, methods=["GET"])
+player_router.add_api_route(
+    "/change_password", endpoint=change_password, methods=["POST"]
+)
 
 team_router = APIRouter(prefix="/team")
 team_router.add_api_route("/list", endpoint=list_teams, methods=["GET"])
@@ -103,8 +110,7 @@ api_router.include_router(
     dependencies=[Security(get_current_active_user, scopes=["analysis"])],
 )
 api_router.add_api_route("/token", endpoint=login_for_access_token, methods=["POST"])
+api_router.add_api_route("/set_password", endpoint=set_first_password, methods=["POST"])
 api_router.add_api_route("/logout", endpoint=logout, methods=["POST"])
-api_router.add_api_route("/users/me/", endpoint=read_users_me, methods=["GET"])
-api_router.add_api_route("/users/me/items/", endpoint=read_own_items, methods=["GET"])
 app.include_router(api_router)
 app.mount("/", SPAStaticFiles(directory="dist", html=True), name="site")

security.py

@@ -189,8 +189,13 @@ async def logout(response: Response):
 
 
 def generate_one_time_token(username):
+    user = get_user(username)
+    if user:
         expire = timedelta(days=7)
-    token = create_access_token(data={"sub": username}, expires_delta=expire)
+        token = create_access_token(
+            data={"sub": username, "name": user.display_name},
+            expires_delta=expire,
+        )
         return token
 
 

src/Login.tsx

@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import { currentUser, login, User } from "./api";
 import Header from "./Header";
 
@@ -9,12 +9,12 @@ export interface LoginProps {
 export const Login = ({ onLogin }: LoginProps) => {
   const [username, setUsername] = useState("");
   const [password, setPassword] = useState("");
-  const [error, setError] = useState<unknown>(null);
+  const [error, setError] = useState("");
   const [loading, setLoading] = useState(false);
 
   async function doLogin() {
     setLoading(true);
-    setError(null);
+    setError("");
     const timeout = new Promise((r) => setTimeout(r, 1000));
     let user: User;
     try {
@@ -22,7 +22,7 @@ export const Login = ({ onLogin }: LoginProps) => {
       user = await currentUser();
     } catch (e) {
       await timeout;
-      setError(e);
+      setError("failed");
       setLoading(false);
       return;
     }
@@ -35,6 +35,14 @@ export const Login = ({ onLogin }: LoginProps) => {
     doLogin();
   }
 
+  useEffect(() => {
+    const params = new URLSearchParams(window.location.search);
+    const queryUsername = params.get("username");
+    const queryPassword = params.get("password");
+    if (queryUsername) setUsername(queryUsername);
+    if (queryPassword) setPassword(queryPassword);
+  }, []);
+
   return (
     <>
       <Header />
@@ -47,7 +55,10 @@ export const Login = ({ onLogin }: LoginProps) => {
             placeholder="username"
             required
             value={username}
-            onChange={(evt) => setUsername(evt.target.value)}
+            onChange={(evt) => {
+              setError("");
+              setUsername(evt.target.value);
+            }}
           />
         </div>
         <div>
@@ -59,9 +70,13 @@ export const Login = ({ onLogin }: LoginProps) => {
             minLength={8}
             value={password}
             required
-            onChange={(evt) => setPassword(evt.target.value)}
+            onChange={(evt) => {
+              setError("");
+              setPassword(evt.target.value);
+            }}
           />
         </div>
+        <div>{error && <span style={{ color: "red" }}>{error}</span>}</div>
         <button type="submit" value="login" style={{ fontSize: "small" }}>
           login
         </button>

src/SetPassword.tsx

@@ -1,25 +1,36 @@
-import { jwtDecode } from "jwt-decode";
+import { InvalidTokenError, jwtDecode, JwtPayload } from "jwt-decode";
 import { useEffect, useState } from "react";
 import { baseUrl } from "./api";
-import { Navigate, useNavigate } from "react-router";
+import { redirect, useNavigate } from "react-router";
+
+interface SetPassToken extends JwtPayload {
+  name: string;
+}
 
 export const SetPassword = () => {
+  const [name, setName] = useState("after getting your token.");
   const [username, setUsername] = useState("");
   const [password, setPassword] = useState("");
   const [passwordr, setPasswordr] = useState("");
   const [token, setToken] = useState("");
   const [error, setError] = useState("");
   const [loading, setLoading] = useState(false);
-
   const navigate = useNavigate();
+
   useEffect(() => {
     const params = new URLSearchParams(window.location.search);
     const token = params.get("token");
     if (token) {
       setToken(token);
-      const payload = jwtDecode(token);
+      try {
+        const payload = jwtDecode<SetPassToken>(token);
+        if (payload.name) setName(payload.name);
+        else if (payload.sub) setName(payload.sub);
+        else setName("Mr. I-have-no Token");
         payload.sub && setUsername(payload.sub);
-      console.log(payload);
+      } catch (InvalidTokenError) {
+        setName("Mr. I-have-no-valid Token");
+      }
     }
   }, []);
 
@@ -40,20 +51,39 @@ export const SetPassword = () => {
       } catch (e) {
         throw new Error(`request failed: ${e}`);
       }
+      setLoading(false);
+
+      if (resp.ok) {
+        console.log(resp);
+        navigate({
+          pathname: "/",
+          search: `?username=${encodeURI(username)}&password=${encodeURI(password)}`,
+        });
+      }
 
       if (!resp.ok) {
         if (resp.status === 401) {
-          setError("unauthorized");
+          resp.statusText
-          setLoading(false);
+            ? setError(resp.statusText)
+            : setError("unauthorized");
           throw new Error("Unauthorized");
         }
-      } else navigate("/");
+      }
     } else setError("passwords are not the same");
   }
 
   return (
     <>
-      <h2>set your password, {username}</h2>
+      <h2>
+        set your password,
+        <br />
+        {name}
+      </h2>
+      {username && (
+        <span>
+          your username is: <i>{username}</i>
+        </span>
+      )}
       <form onSubmit={handleSubmit}>
         <div>
           <input