Created login functinality
This commit is contained in:
@ -1,4 +1,5 @@
|
||||
from abc import ABC, abstractmethod
|
||||
from typing import Mapping, Any
|
||||
import sqlite3
|
||||
|
||||
class DatabaseController(ABC):
|
||||
@ -14,6 +15,12 @@ class DatabaseController(ABC):
|
||||
self._conn.close()
|
||||
print(e)
|
||||
|
||||
def new_instance(self, of: type, with_fields: Mapping[str, Any]):
|
||||
obj = of.__new__(of)
|
||||
for attr, value in with_fields.items():
|
||||
setattr(obj, attr, value)
|
||||
return obj
|
||||
|
||||
@abstractmethod
|
||||
def create(self):
|
||||
pass
|
||||
|
@ -1,30 +1,48 @@
|
||||
from .database import DatabaseController
|
||||
from models.users.user import User
|
||||
from models.users.customer import Customer
|
||||
|
||||
class UserController(DatabaseController):
|
||||
FIELDS = ['id', 'username', 'password', 'firstName', 'lastName', 'email', 'phone', 'role']
|
||||
|
||||
def __init__(self):
|
||||
super().__init__()
|
||||
|
||||
def create(self, user: User):
|
||||
params = [
|
||||
user.username,
|
||||
user.password,
|
||||
user.firstName,
|
||||
user.lastName,
|
||||
user.email,
|
||||
user.phone,
|
||||
user.password,
|
||||
user.role
|
||||
]
|
||||
|
||||
self._conn.execute(
|
||||
"INSERT INTO Users (first_name, last_name, email, phone, password, role) VALUES (?, ?, ?, ?, ?, ?)",
|
||||
"INSERT INTO Users (username, password, first_name, last_name, email, phone, role) VALUES (?, ?, ?, ?, ?, ?, ?)",
|
||||
params
|
||||
)
|
||||
self._conn.commit()
|
||||
user.login()
|
||||
|
||||
def read(self):
|
||||
print("Doing work")
|
||||
def read(self, username: str) -> User | None:
|
||||
params = [
|
||||
username
|
||||
]
|
||||
|
||||
cursor = self._conn.execute(
|
||||
"SELECT * FROM Users WHERE Username = ?",
|
||||
params
|
||||
)
|
||||
row = cursor.fetchone()
|
||||
|
||||
if row != None:
|
||||
params = dict(zip(self.FIELDS, row))
|
||||
obj = self.new_instance(Customer, params)
|
||||
print(obj.__dict__)
|
||||
return obj
|
||||
|
||||
return None
|
||||
|
||||
def update(self):
|
||||
print("Doing work")
|
||||
|
@ -1,5 +1,5 @@
|
||||
from . import blueprint
|
||||
from flask import render_template, redirect, request
|
||||
from flask import render_template, redirect, request, session
|
||||
from controllers.database.user import UserController
|
||||
from models.users.customer import Customer
|
||||
from hashlib import sha512
|
||||
@ -8,7 +8,7 @@ from hashlib import sha512
|
||||
# Function responsible for displaying the main landing page of the site
|
||||
@blueprint.route('/')
|
||||
def welcome_page():
|
||||
return render_template('index.html', content="content.html")
|
||||
return render_template('index.html', content="content.html", user = session.get('user'))
|
||||
|
||||
|
||||
|
||||
@ -16,12 +16,23 @@ def welcome_page():
|
||||
# Function responsible for delivering the Login page for the site
|
||||
@blueprint.route('/login')
|
||||
def display_login():
|
||||
return render_template('index.html', content="login.html")
|
||||
return render_template('index.html', content="login.html", user = session.get('user'))
|
||||
|
||||
# Function responsible for handling logins to the site
|
||||
@blueprint.post('/login')
|
||||
def login():
|
||||
print("Tryin to login as " + request.form['username'])
|
||||
database = UserController()
|
||||
user = database.read(request.form['username'])
|
||||
|
||||
# No user found
|
||||
if user == None:
|
||||
return redirect("/login")
|
||||
|
||||
# Incorrect Password
|
||||
if sha512(request.form['password'].encode()).hexdigest() != user.password:
|
||||
return redirect("/login")
|
||||
|
||||
session['user'] = user.username
|
||||
return redirect("/")
|
||||
|
||||
|
||||
@ -29,7 +40,7 @@ def login():
|
||||
# Function responsible for delivering the Signup page for the site
|
||||
@blueprint.route('/signup')
|
||||
def display_signup():
|
||||
return render_template('index.html', content="signup.html")
|
||||
return render_template('index.html', content="signup.html", user = session.get('user'))
|
||||
|
||||
# Function responsible for handling signups to the site
|
||||
@blueprint.post('/signup')
|
||||
@ -38,12 +49,20 @@ def signup():
|
||||
database.create(Customer(
|
||||
0,
|
||||
request.form['username'],
|
||||
request.form['email'],
|
||||
sha512(request.form['password'].encode()).hexdigest(), # Hashed as soon as it is recieved on the backend
|
||||
request.form['firstname'],
|
||||
request.form['lastname'],
|
||||
request.form['email'],
|
||||
"123",
|
||||
sha512(request.form['password'].encode()).hexdigest(), # Hashed as soon as it is recieved on the backend
|
||||
"Customer"
|
||||
))
|
||||
|
||||
return redirect("/")
|
||||
# Code 307 Preserves the original request (POST)
|
||||
return redirect("/login", code=307)
|
||||
|
||||
|
||||
# Function responsible for handling logouts from the site
|
||||
@blueprint.route('/logout')
|
||||
def logout():
|
||||
session.pop('user')
|
||||
return redirect("/")
|
Reference in New Issue
Block a user