RAPLA-POC, LOGIN-Flow

app.py

@@ -5,12 +5,13 @@ from flask_login import login_user, login_required, current_user, LoginManager,
 from flask_sqlalchemy import SQLAlchemy
 from werkzeug.security import generate_password_hash, check_password_hash
 import hashlib
+import time
 
 import dualisauth
 import requesthelpers
 from fetchRAPLA import *
 from get_mysql import get_mysql
-import time
+from parseICAL import getWeek
 
 
 def create():
@@ -55,23 +56,42 @@ class Dualis(db.Model):
 
 @app.route("/")
 def index():
-    return render_template('index.html', headermessage='Header', message='DualHub')
+    return redirect(url_for("login"))
 
 
 @app.route("/welcome")
 @login_required
 def welcome():
-    d = Dualis.query.filter_by(uid=current_user.id).first()
-    if not current_user.kurs:
-        kurs = dualisauth.getKurs(d.token, d.cookie)
-        current_user.kurs = kurs
-        db.session.commit()
-    else:
-        kurs = current_user.kurs
+    kurs = current_user.kurs
     name = current_user.name
     return render_template('index.html', headermessage='DualHub', message="Hallo, "
                                                                           + name + " (" + kurs + ")")
 
+
+@app.route("/backendpoc/set-up")
+@login_required
+def getKurs():
+    d = Dualis.query.filter_by(uid=current_user.id).first()
+    if d:
+        e = False
+        if not current_user.kurs:
+            kurs = dualisauth.getKurs(d.token, d.cookie)
+            if kurs != 0:
+                current_user.kurs = kurs
+                db.session.commit()
+            else:
+                e = True
+        else:
+            kurs = current_user.kurs
+            current_user.kurs = kurs
+            db.session.commit()
+    else:
+        e = True
+        kurs = ""
+    return render_template('kurs.html', detected=(kurs, e))
+
+
+
 @app.route("/backendpoc/error<int:ecode>")
 def error(ecode):
     if ecode == 900:
@@ -91,7 +111,7 @@ def chooseRaplas():
 
 
 @login_required
-@app.route("/backendpoc/plan", methods=["POST"])
+@app.route("/backendpoc/rapla", methods=["POST"])
 def getRapla():
     file = str(request.form.get("file"))
     url = str(request.form.get("url"))
@@ -100,16 +120,25 @@ def getRapla():
     if file != "None":
         User.query.filter_by(id=current_user.id).first().kurs = file[5:-5]
         db.session.commit()
-        return send_file("calendars/" + file)
+        #return send_file("calendars/" + file)
     elif url != "None":
         file = getNewRapla(url)
         if type(file) is not int:
             User.query.filter_by(id=current_user.id).first().kurs = file[5:-5]
             db.session.commit()
-            return send_file("calendars/" + file)
+            #return send_file("calendars/" + file)
         else:
             return redirect(url_for("error", ecode=file + 900))
-    return render_template("index.html")
+    return redirect(url_for("welcome"))
+
+@login_required
+@app.route("/backendpoc/plan", methods=["GET"])
+def displayRapla():
+    samstag = request.args.get("samstag")
+    if not samstag:
+        samstag = False
+    events = getWeek("today", "rapla"+current_user.kurs+".ical", samstag)
+    return render_template("plan.html", events=events[0], eventdays=events[1])
 
 
 @app.route("/backendpoc/log-in")
@@ -127,21 +156,19 @@ def login_post():
     if n:
         success = redirect(n)
     else:
-        success = redirect(url_for("welcome"))
+        success = redirect(url_for("getKurs"))
 
     user = User.query.filter_by(email=email).first()
 
     if user:
         dualis = Dualis.query.filter_by(uid=user.id).first()
         if check_password_hash(user.password, password):
-            if not dualisauth.checkLifetime(dualis.token_created):
+            if not dualis.token or not dualisauth.checkLifetime(dualis.token_created):
                 new_token = dualisauth.checkUser(email, password)
                 dualis.token = new_token[0]
                 dualis.cookie = requesthelpers.getCookie(new_token[1].cookies)
                 dualis.token_created = time.time()
                 db.session.commit()
-            login_user(user)
-            return success
         else:
             t = dualisauth.checkUser(email, password)
             if t[0] == -2:
@@ -152,8 +179,10 @@ def login_post():
                 dualis.cookie = requesthelpers.getCookie(t[1].cookies)
                 dualis.token_created = time.time()
                 db.session.commit()
-                login_user(user)
-                return success
+        login_user(user)
+        if user.kurs:
+            success = redirect(url_for("welcome"))
+        return success
 
     t = dualisauth.checkUser(email, password)
     if t[0] == -2:
@@ -180,6 +209,11 @@ def login_post():
 
 @app.route("/backendpoc/log-out")
 def logout():
+    dualis = Dualis.query.filter_by(uid=current_user.id).first()
+    dualisauth.logOut(dualis.token, dualis.cookie)
+    dualis.cookie = None
+    dualis.token = None
+    db.session.commit()
     logout_user()
     return redirect(url_for("login", code=1))