SoftwareEngineering/DualHub
4
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Timeout-Check + MERGE-Prep

Browse Source
This commit is contained in:
Paul Martin
2023-12-11 14:37:23 +01:00
parent 081cb4aaa7
commit 6c143b5817
12 changed files with 249 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
routing.py
View File

@ -18,12 +18,20 @@ from init import *
@app.route("/")
def index():
"""
Leitet den normalen Website-Aufruf zum Login weiter.
:return HTML:
"""
return redirect(url_for("login"))
@app.route("/welcome")
@login_required
def welcome():
"""
Interim Homepage
:return HTML:
"""
kurs = current_user.kurs
name = current_user.name
return render_template('index.html', headermessage='DualHub', message="Hallo, "
@ -33,17 +41,29 @@ def welcome():
@app.route("/backendpoc/noten")
@login_required
def displayNoten():
"""
Zeigt die Noten aus Dualis an. Hierfür ist ein aktives Token nötig.
:return HTML:
"""
d = Dualis.query.filter_by(uid=current_user.id).first()
t = d.token
sem = d.result_list
c = request.cookies.get("cnsc")
timeout = fetchDUALIS.timeOut(d, c, "displayNoten")
if timeout:
return timeout
res = fetchDUALIS.getResults(t, c, sem)
return render_template("noten.html", noten=res, semester=fetchDUALIS.getSem(t, c))
return render_template("noten.html", noten=res, semester=fetchDUALIS.getSem(t, c), sel=sem)
@app.route("/backendpoc/plan", methods=["GET"])
@login_required
def displayRapla():
"""
Zeigt den Stundenplan für eingeloggte User an. \n
TODO: Persönliche Filter, Notizen, Essensvorlieben etc. berücksichtigen.
:return HTML:
"""
week = request.args.get("week")
if week:
week = datetime.datetime.strptime(week, "%Y-%m-%d")
@ -58,6 +78,12 @@ def displayRapla():
@app.route("/backendpoc/plan/<string:kurs>")
def displayPlan(kurs):
"""
Zeigt den Stundenplan ohne Login an. \n
Präferenzen werden nicht berücksichtigt.
:param kurs:
:return HTML:
"""
week = request.args.get("week")
if week:
week = datetime.datetime.strptime(week, "%Y-%m-%d")
@ -81,17 +107,29 @@ def displayPlan(kurs):
@app.route("/backendpoc/set-up")
def redKurs():
"""
Setup beginnt mit Kurs.
:return HTML:
"""
return redirect(url_for("getKurs"))
@app.route("/backendpoc/set-up/kurs")
@login_required
def getKurs():
"""
Automatische Kurs-Auswahl. \n
Aktives Dualis-Token benötigt.
:return HTML:
"""
d = Dualis.query.filter_by(uid=current_user.id).first()
if d:
cookie = request.cookies.get("cnsc")
timeout = fetchDUALIS.timeOut(d, cookie, "getKurs")
if timeout:
return timeout
e = False
if not current_user.kurs:
cookie = request.cookies.get("cnsc")
kurs = fetchDUALIS.getKurs(d.token, cookie)
if kurs != 0:
current_user.kurs = kurs
@ -111,6 +149,10 @@ def getKurs():
@app.route("/backendpoc/set-up/semester")
@login_required
def getSemester():
"""
Manuelle Semester-Auswahl.
:return HTML:
"""
t = Dualis.query.filter_by(uid=current_user.id).first().token
c = request.cookies.get("cnsc")
@ -120,6 +162,10 @@ def getSemester():
@app.route("/backendpoc/set-up/semester", methods=["POST"])
@login_required
def setSemester():
"""
Speichern der Semester-Auswahl.
:return HTML:
"""
n = request.args.get("next")
if not n:
n = url_for("welcome")
@ -132,13 +178,21 @@ def setSemester():
@app.route("/backendpoc/set-up/rapla")
@login_required
def chooseRaplas():
"""
Manuelle Rapla-Auswahl.
:return HTML:
"""
r = getRaplas()
return render_template("rapla.html", raplas=r)
@login_required
@app.route("/backendpoc/set-up/rapla", methods=["POST"])
@login_required
def getRapla():
"""
Verarbeitet die Eingabe von chooseRaplas().
:return HTML:
"""
file = str(request.form.get("file"))
url = str(request.form.get("url"))
if file == url == "None":
@ -157,14 +211,22 @@ def getRapla():
@app.route("/backendpoc/log-in")
def login(code: int = None):
if code:
print(code)
def login():
"""
Login-Maske.
:return HTML:
"""
return render_template("login.html")
@app.route("/backendpoc/log-in", methods=["POST"])
def login_post():
"""
Verarbeitet die Eingabe von login(). \n
Falls der User schon angelegt ist, wird das Passwort verglichen. \n
Falls nicht, wird ein neuer angelegt.
:return HTML:
"""
email = request.form.get("email")
password = request.form.get("password")
n = request.args.get("next")
@ -178,7 +240,8 @@ def login_post():
if user:
dualis = Dualis.query.filter_by(uid=user.id).first()
if check_password_hash(user.password, password):
if not dualis.token or not fetchDUALIS.checkLifetime(dualis.token_created):
cookie = request.cookies.get("cnsc")
if not dualis.token or not fetchDUALIS.checkLifetime(dualis.token_created) or not cookie:
new_token = fetchDUALIS.checkUser(email, password)
dualis.token = new_token[0]
newcookie = requesthelpers.getCookie(new_token[1].cookies)
@ -227,13 +290,17 @@ def login_post():
@app.route("/backendpoc/log-out")
@login_required
def logout():
"""
Loggt den User aus.
:return Empty Token:
"""
cookie = request.cookies.get("cnsc")
dualis = Dualis.query.filter_by(uid=current_user.id).first()
fetchDUALIS.logOut(dualis.token, cookie)
dualis.token = None
db.session.commit()
logout_user()
red = make_response(redirect(url_for("login", code=1)))
red = make_response(redirect(url_for("login", code=1, next=url_for("welcome"))))
red.set_cookie("cnsc", value="Logged out! Your temporary token "
"on our server and the cookie on your device have been deleted.", httponly=True,
secure=True)
@ -242,6 +309,12 @@ def logout():
@app.route("/backendpoc/error<int:ecode>")
def error(ecode):
"""
Error Page für custom-Errors. \n
TODO: Funktion depreciaten. Ersetzen durch Errors auf den entsprechenden Seiten.
:param ecode:
:return:
"""
if ecode == 900:
msg = "Ungültige RAPLA-URL! Sicher, dass der Link zum DHBW-Rapla führt?"
elif ecode == 899:
@ -253,6 +326,9 @@ def error(ecode):
@app.errorhandler(HTTPException)
def handle(e):
""""
HTTP-Exception-Handler
"""
return render_template('index.html', message=e, headermessage="DualHub")