pw requirements now loaded with jinja over js

Originally i loaded the requirements through calling the web api in
javascript, but decided to switch it to jinja as i only recently found
out its capable of stuff more complicated than replacing strings.
This commit is contained in:
2020-05-12 20:29:50 +01:00
parent 8497cd4927
commit 331dbc3d28
5 changed files with 24 additions and 52 deletions

View File

@@ -3,6 +3,7 @@ from pathlib import Path
from flask import Flask, send_from_directory, render_template
from __main__ import config, app, g
from __main__ import web_log as log
from jellyfin_accounts.web_api import checkInvite, validator
@app.errorhandler(404)
@@ -25,7 +26,6 @@ def static_proxy(path):
return render_template('404.html',
contactMessage=config['ui']['contact_message']), 404
from jellyfin_accounts.web_api import checkInvite
@app.route('/invite/<path:path>')
@@ -48,6 +48,9 @@ def inviteProxy(path):
helpMessage=config['ui']['help_message'],
successMessage=config['ui']['success_message'],
jfLink=config['jellyfin']['server'],
validate=config.getboolean('password_validation',
'enabled'),
requirements=validator.getCriteria(),
email=email)
elif 'admin.html' not in path and 'admin.html' not in path:
return app.send_static_file(path)

View File

@@ -112,14 +112,6 @@ else:
validator = PasswordValidator(0, 0, 0, 0, 0)
@app.route('/getRequirements', methods=['GET', 'POST'])
def getRequirements():
data = request.get_json()
log.debug('Password Requirements requested')
if checkInvite(data['code']):
return jsonify(validator.getCriteria())
@app.route('/newUser', methods=['GET', 'POST'])
def newUser():
data = request.get_json()