Fixed a bug with singup due to changing the way the User class works.
This commit is contained in:
parent
a83507bcf9
commit
4f4b87e6ca
3 changed files with 5 additions and 40 deletions
|
@ -1,8 +1,7 @@
|
||||||
from flask import Flask, Response
|
from flask import Flask
|
||||||
from flask_login import LoginManager, login_required
|
|
||||||
from os import urandom
|
from os import urandom
|
||||||
|
|
||||||
app = Flask(__name__)
|
app = Flask(__name__)
|
||||||
app.secret_key = urandom(12).hex()
|
app.secret_key = urandom(12).hex()
|
||||||
|
|
||||||
from . import views
|
from . import uwume
|
||||||
|
|
|
@ -1,34 +0,0 @@
|
||||||
from flask import Response
|
|
||||||
from flask_login import LoginManager, login_required
|
|
||||||
try:
|
|
||||||
from .lib.classUser import User
|
|
||||||
except:
|
|
||||||
from lib.classUser import User
|
|
||||||
|
|
||||||
|
|
||||||
@login_manager.request_loader
|
|
||||||
def load_user(request):
|
|
||||||
token = request.headers.get('Authorization')
|
|
||||||
if(token is None):
|
|
||||||
token = request.args.get('token')
|
|
||||||
|
|
||||||
if(token is not None):
|
|
||||||
username, password = token.split(':') # naive token
|
|
||||||
user_entry = User.get(username)
|
|
||||||
if(user_entry is not None):
|
|
||||||
user = User(user_entry[0], user_entry[1])
|
|
||||||
if(user.password == password):
|
|
||||||
return user
|
|
||||||
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
@app.route("/", methods=["GET"])
|
|
||||||
def index():
|
|
||||||
return Response(response="Hello World!", status=200)
|
|
||||||
|
|
||||||
|
|
||||||
@app.route("/protected/", methods=["GET"])
|
|
||||||
@login_required
|
|
||||||
def protected():
|
|
||||||
return Response(response="Hello Protected World!", status=200)
|
|
|
@ -1,9 +1,11 @@
|
||||||
try:
|
try:
|
||||||
from .lib.helpers import get_static_paths, get_content_text
|
from .lib.helpers import get_static_paths, get_content_text
|
||||||
from .lib.classUser import User
|
from .lib.classUser import User
|
||||||
|
from .lib.classUwuCounter import UwuCounter
|
||||||
except:
|
except:
|
||||||
from lib.classUser import User
|
from lib.classUser import User
|
||||||
from lib.helpers import get_static_paths, get_content_text
|
from lib.helpers import get_static_paths, get_content_text
|
||||||
|
from lib.classUwuCounter import UwuCounter
|
||||||
from . import app
|
from . import app
|
||||||
from flask import Flask, render_template, redirect, url_for, request, flash
|
from flask import Flask, render_template, redirect, url_for, request, flash
|
||||||
from flask_login import LoginManager, UserMixin, login_required, login_user, current_user, logout_user
|
from flask_login import LoginManager, UserMixin, login_required, login_user, current_user, logout_user
|
||||||
|
@ -90,9 +92,7 @@ def signup():
|
||||||
username = request.form['username']
|
username = request.form['username']
|
||||||
password = request.form['password']
|
password = request.form['password']
|
||||||
if(not username in User.user_database.keys()):
|
if(not username in User.user_database.keys()):
|
||||||
|
User.user_database[username] = (username, password, UwuCounter(0))
|
||||||
userClass = User(username, password)
|
|
||||||
User.user_database[username] = (username, password)
|
|
||||||
return redirect('/')
|
return redirect('/')
|
||||||
else:
|
else:
|
||||||
flash('It looks like a user already exists with that name.')
|
flash('It looks like a user already exists with that name.')
|
Reference in a new issue