mirror of
https://github.com/Lynnesbian/FediBooks/
synced 2024-11-26 00:58:59 +00:00
Compare commits
No commits in common. "200897c5d73dc408b78ae2c94228d3bd8d1a68b2" and "42f965f19fda81f838e1c0146c4332f2b849d22c" have entirely different histories.
200897c5d7
...
42f965f19f
5 changed files with 7 additions and 103 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -2,4 +2,3 @@ __pycache__
|
||||||
config.json
|
config.json
|
||||||
planning.txt
|
planning.txt
|
||||||
*.pyc
|
*.pyc
|
||||||
/debug
|
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,5 @@
|
||||||
"pl.765racing.com",
|
"pl.765racing.com",
|
||||||
"yorishiro.space",
|
"yorishiro.space",
|
||||||
"pl.smuglo.li",
|
"pl.smuglo.li",
|
||||||
"albin.social",
|
"albin.social"
|
||||||
"social.sunshinegardens.org"
|
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -1,36 +0,0 @@
|
||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<title>FediBooks</title>
|
|
||||||
{% include 'imports.html' %}
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
<div class="container centred">
|
|
||||||
<h1 class="thin centred">Close your FediBooks account</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% include 'error.html' %}
|
|
||||||
|
|
||||||
<div class="container centred">
|
|
||||||
<form method='POST'>
|
|
||||||
<h2>
|
|
||||||
<i class="fas fa-user-slash" style="font-size:3em;"></i>
|
|
||||||
</h2>
|
|
||||||
<div class="container centred">
|
|
||||||
<p>Are you sure you want to <strong>permanently</strong> delete your account?</p>
|
|
||||||
<p>All of your FediBooks bots will stop working, but their accounts will remain open. You can delete them manually or repurpose them for something else.</p>
|
|
||||||
<p>If you're sure you want to delete your account, enter your password below and click "Close my account".</p>
|
|
||||||
<p>
|
|
||||||
<input type="password" name="password" placeholder="Password">
|
|
||||||
</p>
|
|
||||||
<a class="button btn-secondary" href="/"><i class="fas fa-times"></i> Cancel</a>
|
|
||||||
<button class="button btn-dangerous"><i class="fas fa-trash"></i> Close my account</button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% include 'footer.html' %}
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
@ -18,7 +18,7 @@
|
||||||
<form method="POST" class="full-width">
|
<form method="POST" class="full-width">
|
||||||
<div class="container light">
|
<div class="container light">
|
||||||
<h2 class="thin centred">Login settings</h2>
|
<h2 class="thin centred">Login settings</h2>
|
||||||
<p class="centred">Update your email and password here, or close your account.</p>
|
<p class="centred">Update your email and password here.</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|
@ -29,10 +29,6 @@
|
||||||
<label for="password" class="large">Password</label>
|
<label for="password" class="large">Password</label>
|
||||||
<input type="password" name="password"pattern=".{8,}" placeholder="Unchanged">
|
<input type="password" name="password"pattern=".{8,}" placeholder="Unchanged">
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
|
||||||
<label for="delete" class="large">Delete account</label>
|
|
||||||
<a name="delete" class="button btn-dangerous" href="/delete"><i class="fas fa-trash"></i> Close account</a>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="container light">
|
<div class="container light">
|
||||||
<h2 class="thin centred">Contact settings</h2>
|
<h2 class="thin centred">Contact settings</h2>
|
||||||
|
|
@ -77,10 +73,10 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="container centred">
|
<div class="container centred">
|
||||||
<button class="button btn-primary"><i class="fas fa-save"></i> Save</button>
|
<button class="button btn-primary"><i class="fas fa-save"></i> Save</button>
|
||||||
<a href="/" class="button btn-secondary"><i class="fas fa-times"></i> Cancel</a>
|
<a href="/" class="button btn-secondary"><i class="fas fa-times"></i> Cancel</a>
|
||||||
<a href="/help/settings" target="_blank" class="button btn-secondary"><i class="fas fa-question"></i> Help</a>
|
<a href="/help/settings" target="_blank" class="button btn-secondary"><i class="fas fa-question"></i> Help</a>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
||||||
56
app/webui.py
56
app/webui.py
|
|
@ -61,59 +61,6 @@ def show_signup_page():
|
||||||
def render_settings():
|
def render_settings():
|
||||||
return settings(mysql)
|
return settings(mysql)
|
||||||
|
|
||||||
@app.route("/delete", methods=['GET', 'POST'])
|
|
||||||
def render_delete():
|
|
||||||
if request.method == 'GET':
|
|
||||||
return render_template("close_account.html", error = session.pop('error', None))
|
|
||||||
else:
|
|
||||||
# deletion logic
|
|
||||||
pw_hashed = hashlib.sha256(request.form['password'].encode('utf-8')).digest().replace(b"\0", b"\1")
|
|
||||||
c = mysql.connection.cursor(MySQLdb.cursors.DictCursor)
|
|
||||||
c.execute("SELECT * FROM users WHERE id = %s", (session['user_id'],))
|
|
||||||
data = c.fetchone()
|
|
||||||
c.close()
|
|
||||||
if data == None:
|
|
||||||
# should never happen ;)
|
|
||||||
session['error'] = "An unknown error occurred."
|
|
||||||
return redirect(url_for("render_delete"), 303)
|
|
||||||
|
|
||||||
if bcrypt.checkpw(pw_hashed, data['password']):
|
|
||||||
# passwords match, delete the account
|
|
||||||
session['error'] = "succ ess"
|
|
||||||
c = mysql.connection.cursor()
|
|
||||||
c.execute("SELECT credentials_id FROM bots WHERE user_id = %s", (session['user_id'],))
|
|
||||||
credentials_list = c.fetchall()
|
|
||||||
for credentials_id in credentials_list:
|
|
||||||
c.execute("SELECT client_id, client_secret, secret FROM credentials WHERE id = %s", (credentials_id,))
|
|
||||||
# TODO: maybe schedule the push deletions on a cron job or something, if the user has a lot of accounts (or they're on slow instances) this could take a while or even time out
|
|
||||||
credentials = c.fetchone()
|
|
||||||
try:
|
|
||||||
client = Mastodon(
|
|
||||||
credentials[0],
|
|
||||||
credentials[1],
|
|
||||||
credentials[2],
|
|
||||||
"https://{}".format(id.split("@")[2])
|
|
||||||
)
|
|
||||||
client.push_subscription_delete()
|
|
||||||
except:
|
|
||||||
# if it fails, don't prevent the user from deleting their account
|
|
||||||
# TODO: maybe notify that some accounts failed to unregister push
|
|
||||||
pass
|
|
||||||
c.execute("DELETE FROM `credentials` WHERE `id` = %s", (credentials_id,))
|
|
||||||
|
|
||||||
# the big boy step
|
|
||||||
c.execute("DELETE FROM users WHERE id = %s", (session['user_id'],))
|
|
||||||
|
|
||||||
c.close()
|
|
||||||
mysql.connection.commit()
|
|
||||||
|
|
||||||
# TODO: show a "deletion successful" message or something
|
|
||||||
return redirect(url_for("do_signout"), 303)
|
|
||||||
|
|
||||||
else:
|
|
||||||
session['error'] = "Password incorrect."
|
|
||||||
return redirect(url_for("render_delete"), 303)
|
|
||||||
|
|
||||||
@app.route("/bot/edit/<id>", methods = ['GET', 'POST'])
|
@app.route("/bot/edit/<id>", methods = ['GET', 'POST'])
|
||||||
def render_bot_edit(id):
|
def render_bot_edit(id):
|
||||||
return bot_edit(id, mysql)
|
return bot_edit(id, mysql)
|
||||||
|
|
@ -340,8 +287,7 @@ def do_login():
|
||||||
|
|
||||||
@app.route("/issue/bug")
|
@app.route("/issue/bug")
|
||||||
def report_bug():
|
def report_bug():
|
||||||
# return render_template("report_bug.html")
|
return render_template("report_bug.html")
|
||||||
return render_template("coming_soon.html")
|
|
||||||
|
|
||||||
@app.route("/help/settings")
|
@app.route("/help/settings")
|
||||||
def help_settings():
|
def help_settings():
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue