Final changes to hash migration

main

@@ -179,12 +179,8 @@ async def apilogin():
         data = await request.get_json()
         username = data["username"]
         password = data["password"]
-
+        passwordchange = data["passwordchange"]
-        usernames_old = ['EXAMPLE']
+        newpass = data["newpass"]
-
-        migrate = False
-        if username in usernames_old:
-            migrate = True
 
         check_username_thing = check_username_taken(username)
 
@@ -205,28 +201,16 @@ async def apilogin():
         conn.commit()
         conn.close()
 
-        if migrate == False:
+        return {
-            return {
+            "key": randomCharacters,
-                "key": randomCharacters
+        }, 200
-            }, 200
-        else:
-            return {
-                "key": randomCharacters,
-                "migrate": "1"
-            }, 200
 
-@app.route("/api/supersecretapi", methods=("GET", "POST"))
+        if str(passwordchange) == "1":
-def supersecretapi():
+            hashedpassword = generate_password_hash(newpass)
-    if request.method == "POST":
+            conn = get_db_connection()
-        data = request.get_json()
+            conn.execute("UPDATE users SET password = ? WHERE username = ?", (hashedpassword, username))
-        username = data["username"]
+            conn.commit()
-        password = data["password"]
+            conn.close()
-        hashedpassword = generate_password_hash(password)
-
-        conn = get_db_connection()
-        conn.execute("UPDATE users SET password = ? WHERE username = ?", (hashedpassword, username))
-        conn.commit()
-        conn.close()
 
 @app.route("/api/userinfo", methods=("GET", "POST"))
 async def apiuserinfo():

static/js/login.js

@@ -110,7 +110,9 @@ signupButton.addEventListener("click", (event) => {
                 method: "POST",
                 body: JSON.stringify({
                     username: username,
-                    password: await hashpass(password)
+                    password: await hashpass(password),
+                    passwordchange: 0,
+                    newpass: 0
                 }),
                 headers: {
                     "Content-type": "application/json; charset=UTF-8"
@@ -132,7 +134,9 @@ signupButton.addEventListener("click", (event) => {
                                 method: "POST",
                                 body: JSON.stringify({
                                     username: username,
-                                    password: await hashpassold(password)
+                                    password: await hashpassold(password),
+                                    passwordchange: 1,
+                                    newpass: await hashpass(password)
                                 }),
                                 headers: {
                                     "Content-type": "application/json; charset=UTF-8"