gender mandatory

forgotten_password.py

@@ -0,0 +1,17 @@
+import sys
+from sqlmodel import Session, select
+from cutt.security import set_password_token
+from cutt.db import Player, TokenDB, engine
+
+
+if len(sys.argv) > 1:
+    with Session(engine) as session:
+        for p in session.exec(
+            select(Player.username).where(Player.username == sys.argv[1].strip())
+        ):
+            print(p)
+            token = set_password_token(p)
+            if token:
+                session.add(TokenDB(token=token))
+            print(f"https://cutt.0124816.xyz/setpassword?token={token}")
+            session.commit()

frontend/src/CUTT.tsx

@@ -27,6 +27,7 @@ function App() {
     <BrowserRouter>
       <Routes>
         <Route path="/register" element={<Register />} />
+        <Route path="/setpassword" element={<SetPassword />} />
         <Route
           path="/*"
           element={

frontend/src/Footer.tsx

@@ -1,10 +1,4 @@
-import { useLocation } from "react-router";
-import { Link } from "react-router";
-import { useSession } from "./Session";
-
 export default function Footer() {
-  const location = useLocation();
-  const { user, teams } = useSession();
   return (
     <footer className="footer">
       <div className="content has-text-centered">

frontend/src/Register.tsx

@@ -96,7 +96,7 @@ export const Register = () => {
   }
 
   return (
-    <section className="section">
+    <section className="section is-medium">
       <div className="container is-max-tablet">
         <div className="block">
           <p className="level-item has-text-centered">
@@ -179,14 +179,13 @@ export const Register = () => {
             </div>
             <hr />
             <div className="field">
-              <label className="label">
-                gender <small>(optional)</small>
-              </label>
+              <label className="label">gender</label>
               <div className="control">
                 <div className="select">
                   <select
                     name="gender"
                     value={gender}
+                    required
                     onChange={(e) => {
                       setGender(e.target.value as Gender);
                       setError("");

frontend/src/SetPassword.tsx

@@ -1,11 +1,7 @@
 import { jwtDecode, JwtPayload } from "jwt-decode";
-import { ReactNode, useEffect, useState } from "react";
-import { apiAuth, baseUrl, Gender, User } from "./api";
+import { useEffect, useState } from "react";
+import { baseUrl } from "./api";
 import { useNavigate } from "react-router";
-import { Eye, EyeSlash } from "./Icons";
-import { useSession } from "./Session";
-import { relative } from "path";
-import Header from "./Header";
 
 interface PassToken extends JwtPayload {
   username: string;
@@ -13,53 +9,46 @@ interface PassToken extends JwtPayload {
   team_id: number;
 }
 
-enum Mode {
-  register = "register",
-  set = "set password",
-  change = "change password",
-}
-
 export const SetPassword = () => {
-  const [mode, setMode] = useState<Mode>();
-  const [name, setName] = useState("after getting your token.");
+  const [name, setName] = useState("");
   const [username, setUsername] = useState("");
-  const [teamID, setTeamID] = useState<number>();
-  const [currentPassword, setCurrentPassword] = useState("");
   const [password, setPassword] = useState("");
   const [passwordr, setPasswordr] = useState("");
+  const [passwordHint, setPasswordHint] = useState("");
   const [token, setToken] = useState("");
   const [error, setError] = useState("");
   const [loading, setLoading] = useState(false);
-  const [visible, setVisible] = useState(false);
-  const newPlayerTemplate = {
-    username: "",
-    display_name: "",
-    number: "",
-    email: "",
-  } as User;
-  const [player, setPlayer] = useState(newPlayerTemplate);
   const navigate = useNavigate();
-  const { user } = useSession();
+
+  useEffect(() => {
+    const params = new URLSearchParams(window.location.search);
+    const token = params.get("token");
+    if (token) {
+      setToken(token);
+      try {
+        const payload = jwtDecode<PassToken>(token);
+        if (payload.sub === "set password") {
+          if (payload.name) setName(payload.name);
+          if (payload.username) setUsername(payload.username);
+        } else {
+          setError("not a valid token for setting your password");
+        }
+      } catch (InvalidTokenError) {
+        setError("not a valid token");
+      }
+    } else setError("no token found");
+  }, []);
+
+  function passwordCheck() {
+    if (password === passwordr) {
+      setPasswordHint("");
+    } else setPasswordHint("passwords do not match");
+  }
+  useEffect(() => passwordCheck(), [passwordr]);
 
   async function handleSubmit(e: React.FormEvent) {
     e.preventDefault();
     if (password === passwordr) {
-      setLoading(true);
-      if (mode === Mode.change) {
-        //====CHANGING PASSWORD====
-        const resp = await apiAuth(
-          "player/change_password",
-          { current_password: currentPassword, new_password: password },
-          "POST"
-        );
-        setLoading(false);
-        if (resp.detail) setError(resp.detail);
-        else {
-          setError(resp);
-          setTimeout(() => navigate("/"), 2000);
-        }
-      } else if (mode === Mode.set) {
-        //====SETTING PASSWORD====
       const req = new Request(`${baseUrl}api/set_password`, {
         method: "POST",
         headers: {
@@ -91,198 +80,32 @@ export const SetPassword = () => {
           throw new Error("Unauthorized");
         }
       }
-      } else if (mode === Mode.register) {
-        //====REGISTER NEW USER====
-        const req = new Request(`${baseUrl}api/register`, {
-          method: "POST",
-          headers: {
-            "Content-Type": "application/json",
-          },
-          body: JSON.stringify({
-            ...player,
-            team_id: teamID,
-            token: token,
-            password: password,
-          }),
-        });
-        let resp: Response;
-        try {
-          resp = await fetch(req);
-        } catch (e) {
-          throw new Error(`request failed: ${e}`);
-        }
-        setLoading(false);
-
-        if (resp.ok) {
-          console.log(resp);
-          navigate("/", {
-            replace: true,
-            state: { username: player.username, password: password },
-          });
-        }
-
-        if (!resp.ok) {
-          const { detail } = await resp.json();
-          if (detail) setError(detail);
-          else setError("unauthorized");
-          throw new Error("Unauthorized");
-        }
-      }
     } else setError("passwords are not the same");
   }
 
-  useEffect(() => {
-    if (user) {
-      setUsername(user.username);
-      setName(user.display_name);
-      setMode(Mode.change);
-    } else {
-      const params = new URLSearchParams(window.location.search);
-      const token = params.get("token");
-      if (token) {
-        setToken(token);
-        try {
-          const payload = jwtDecode<PassToken>(token);
-          console.log(payload);
-          switch (payload.sub) {
-            case "register":
-              setMode(Mode.register);
-              if (payload.team_id) setTeamID(payload.team_id);
-              break;
-            case "set password":
-              setMode(Mode.set);
-              if (payload.username) setUsername(payload.username);
-              break;
-          }
-          if (payload.name) setName(payload.name);
-        } catch (InvalidTokenError) {
-          setName("Mr. I-have-no-valid Token");
-        }
-      }
-    }
-  }, []);
-
-  let header: ReactNode;
-  switch (mode) {
-    case Mode.change:
-      header = <h2>change your password, {name}</h2>;
-      break;
-    case Mode.set:
-      header = (
-        <>
-          <Header />
-          <h2>set your password, {name}</h2>
-        </>
-      );
-      break;
-    case Mode.register:
-      header = (
-        <>
-          <Header />
-          <h2>
-            register as a member of <i>{name}</i>
-          </h2>
-        </>
-      );
-  }
-
-  let textInputs: ReactNode;
-  switch (mode) {
-    case Mode.change:
-      textInputs = (
-        <div>
-          <input
-            type={visible ? "text" : "password"}
-            id="password"
-            name="password"
-            placeholder="current password"
-            minLength={8}
-            value={currentPassword}
-            required
-            onChange={(evt) => {
-              setError("");
-              setCurrentPassword(evt.target.value);
-            }}
+  return (
+    <section className="section is-medium">
+      <div className="container is-max-tablet">
+        <div className="block">
+          <p className="level-item has-text-centered">
+            <img
+              className="image"
+              alt="cool ultimate team tool"
+              src="cutt.svg"
+              style={{ width: 200 }}
             />
-          <hr style={{ margin: "8px" }} />
+          </p>
         </div>
-      );
-      break;
-    case Mode.register:
-      textInputs = (
-        <div className="new-player-inputs">
-          <div>
-            <label>name</label>
+        <h1 className="title">
+          Set password for {name && username && `${name} (${username})`}
+        </h1>
+        <form onSubmit={handleSubmit}>
+          <div className="field">
+            <div className="field">
+              <label className="label">password</label>
               <input
-              type="text"
-              required
-              value={player.display_name}
-              onChange={(e) => {
-                setPlayer({
-                  ...player,
-                  display_name: e.target.value,
-                  username: e.target.value.toLowerCase().replace(/\W/g, ""),
-                });
-              }}
-            />
-          </div>
-          <div>
-            <label>username</label>
-            <input
-              type="text"
-              required
-              value={player.username}
-              onChange={(e) => {
-                setPlayer({ ...player, username: e.target.value });
-              }}
-            />
-          </div>
-          <div>
-            <label>gender</label>
-            <select
-              name="gender"
-              required
-              value={player.gender}
-              onChange={(e) => {
-                setPlayer({ ...player, gender: e.target.value as Gender });
-              }}
-            >
-              <option value={undefined}></option>
-              <option value="fmp">FMP</option>
-              <option value="mmp">MMP</option>
-            </select>
-          </div>
-          <div>
-            <label>number (optional)</label>
-            <input
-              type="text"
-              value={player.number || ""}
-              onChange={(e) => {
-                setPlayer({ ...player, number: e.target.value });
-              }}
-            />
-          </div>
-          <div>
-            <label>email (optional)</label>
-            <input
-              type="email"
-              value={player.email || ""}
-              onChange={(e) => {
-                setPlayer({ ...player, email: e.target.value });
-              }}
-            />
-          </div>
-          <hr style={{ margin: "8px" }} />
-        </div>
-      );
-      break;
-  }
-
-  let passwordInputs = (
-    <>
-      <div>
-        <input
-          type={visible ? "text" : "password"}
+                className="input"
+                type={"password"}
                 id="password"
                 name="password"
                 placeholder="password"
@@ -295,9 +118,10 @@ export const SetPassword = () => {
                 }}
               />
             </div>
-      <div>
+            <div className="field">
               <input
-          type={visible ? "text" : "password"}
+                className={"input" + (passwordHint ? " is-danger" : "")}
+                type={"password"}
                 id="password-repeat"
                 name="password-repeat"
                 placeholder="repeat password"
@@ -309,47 +133,18 @@ export const SetPassword = () => {
                   setPasswordr(evt.target.value);
                 }}
               />
+              <p className={"help is-danger"}>{passwordHint}</p>
             </div>
-    </>
-  );
-
-  return mode ? (
-    <>
-      {header}
-      <hr style={{ width: "100%" }} />
-      <form onSubmit={handleSubmit}>
-        <div
-          style={{
-            display: "flex",
-            alignItems: "center",
-            justifyContent: "center",
-            flexDirection: "column",
-          }}
-        >
-          {textInputs}
-          {passwordInputs}
-          <div
-            style={{
-              background: "unset",
-              fontSize: "medium",
-              cursor: "pointer",
-              display: "flex",
-              alignItems: "center",
-              gap: "8px",
-            }}
-            onClick={() => setVisible(!visible)}
-          >
-            {visible ? <Eye /> : <EyeSlash />} show passwords
+            <hr />
           </div>
+          <p className={"help" + (error ? " is-danger" : " is-success")}>
+            {error}
+          </p>
+          <div className="field is-grouped is-grouped-centered">
+            <button className="button is-light is-link">change password</button>
           </div>
-        <div>{error && <span style={{ color: "red" }}>{error}</span>}</div>
-        <button type="submit" value="login" style={{ fontSize: "small" }}>
-          submit
-        </button>
-        {loading && <span className="loader" />}
         </form>
-    </>
-  ) : (
-    <span className="loader" />
+      </div>
+    </section>
   );
 };