diff --git a/config.ini b/config.ini index fbb0956..85eddf8 100644 --- a/config.ini +++ b/config.ini @@ -1,6 +1,6 @@ [config] -PORT = 8080 -SECRET_KEY = placeholder +PORT = 8083 +SECRET_KEY = placeholdiawolhkvghuilojkvghijhvmgaer UPLOAD_FOLDER = uploads PASSWORD_REQUIREMENT = 8 UPLOAD_LIMIT = 8 diff --git a/main b/main index 1bee844..7b15574 100644 --- a/main +++ b/main @@ -438,8 +438,10 @@ async def apioauth(): userID = check_username_taken(username) user = get_user(userID) if user == "error": - conn.execute("INSERT INTO users (username, password, created, htmldescription) VALUES (?, ?, ?, ?)", - (username, str("OAUTH-" + sub), str(time.time()), "")) + conn.execute("INSERT INTO users (username, password, created, htmldescription, banned) VALUES (?, ?, ?, ?, ?)", + (username, str("OAUTH-" + sub), str(time.time()), "", "0")) + userID = conn.execute("SELECT * FROM users WHERE lower(username) = ?", + (username.lower(),)).fetchone()["id"] else: if user["password"] != "OAUTH-" + sub: return {"error": "Migration required or username taken"}, 422 @@ -660,8 +662,9 @@ async def login(): conn.commit() conn.close() - response = Response("""""") + response = Response("""""") response.set_cookie("session_DO_NOT_SHARE", randomCharacters) + response.set_cookie("legacy_migrate", "1") return response #resp = await make_response(redirect("/")) @@ -750,6 +753,7 @@ async def logout(): session = request.cookies.get("session_DO_NOT_SHARE") resp.delete_cookie("session_DO_NOT_SHARE") resp.delete_cookie("prefuser") + resp.delete_cookie("legacy_migrate") return resp @app.errorhandler(500) diff --git a/templates/login.html b/templates/login.html index 6f5cf25..959f97c 100644 --- a/templates/login.html +++ b/templates/login.html @@ -14,7 +14,7 @@
back

-

Log in to burgercat

+

Migrate from legacy account

{% with messages = get_flashed_messages() %} {% if messages %} {% for message in messages %} @@ -27,9 +27,7 @@

- -

- Don't have an account? Sign up! + diff --git a/templates/migrate.html b/templates/migrate.html index 46836ba..8355cf4 100644 --- a/templates/migrate.html +++ b/templates/migrate.html @@ -121,6 +121,7 @@ .then((response) => { async function doStuff2() { if (response.status == 200) { +document.cookie = 'legacy_migrate=; Max-Age=0; path=/;" window.location.replace("/") } else { document.getElementById("text").innerText = "Failed: " + key["error"] diff --git a/templates/oauth.html b/templates/oauth.html index 661d1a7..206a30e 100644 --- a/templates/oauth.html +++ b/templates/oauth.html @@ -118,7 +118,7 @@ console.log("User:", userinfoData.name) console.log("Sub:", userinfoData.sub); let preferreduser = userinfoData.name - if (getCookie("prefuser") != "") { + if (getCookie("prefuser") != null) { preferreduser = getCookie("prefuser") } document.getElementById("text").innerText = "Authenticating, " + userinfoData.name;