From d3620cc9da7375c288f18741931fefc297987bc4 Mon Sep 17 00:00:00 2001
From: white <122345776@umail.ucc.ie>
Date: Sun, 19 Jan 2025 20:13:45 +0000
Subject: [PATCH] Added Flask Blueprints to enforce modularity

---
 .flaskenv                                     |   2 +-
 core/__pycache__/app.cpython-310.pyc          | Bin 3956 -> 551 bytes
 core/blueprints/__init__.py                   |  21 ++++++
 .../__pycache__/__init__.cpython-310.pyc      | Bin 0 -> 887 bytes
 .../__pycache__/app.cpython-310.pyc           | Bin 0 -> 562 bytes
 .../authentication.cpython-310.pyc            | Bin 0 -> 2594 bytes
 .../__pycache__/main.cpython-310.pyc          | Bin 0 -> 564 bytes
 .../__pycache__/utils.cpython-310.pyc         | Bin 0 -> 1293 bytes
 core/{app.py => blueprints/authentication.py} |  60 ++++--------------
 core/blueprints/main.py                       |  14 ++++
 core/blueprints/utils.py                      |  24 +++++++
 database/__pycache__/database.cpython-310.pyc | Bin 1236 -> 1236 bytes
 database/app.db                               | Bin 28672 -> 28672 bytes
 .../841e29f4900cf96cfb8ec55c0c598d2c          | Bin 37 -> 0 bytes
 .../bd9d4040a2dcd9c9d4ed85d3dc2d6ba7          | Bin 0 -> 37 bytes
 15 files changed, 71 insertions(+), 50 deletions(-)
 create mode 100644 core/blueprints/__init__.py
 create mode 100644 core/blueprints/__pycache__/__init__.cpython-310.pyc
 create mode 100644 core/blueprints/__pycache__/app.cpython-310.pyc
 create mode 100644 core/blueprints/__pycache__/authentication.cpython-310.pyc
 create mode 100644 core/blueprints/__pycache__/main.cpython-310.pyc
 create mode 100644 core/blueprints/__pycache__/utils.cpython-310.pyc
 rename core/{app.py => blueprints/authentication.py} (66%)
 create mode 100644 core/blueprints/main.py
 create mode 100644 core/blueprints/utils.py
 delete mode 100644 flask_session/841e29f4900cf96cfb8ec55c0c598d2c
 create mode 100644 flask_session/bd9d4040a2dcd9c9d4ed85d3dc2d6ba7

diff --git a/.flaskenv b/.flaskenv
index 705204a..d85c341 100644
--- a/.flaskenv
+++ b/.flaskenv
@@ -1,2 +1,2 @@
-FLASK_APP=core.app
+FLASK_APP=core.blueprints.__init__
 FLASK_DEBUG=True
\ No newline at end of file
diff --git a/core/__pycache__/app.cpython-310.pyc b/core/__pycache__/app.cpython-310.pyc
index 95e8a461bf95014d1d42e0ad764dbb22d10f253f..86068f3f46ff2128c2fdfc37b5ae6ec5db53b25d 100644
GIT binary patch
delta 284
zcmYjMu};J=40Vzw?VVKM3)s7{A|ZreXSo3>OH>qdI$hF6X)D+mj+N<t04BtrAU+{0
z6FVP(Q!!x4ezN`Ell^o2Ry_7~y#$K>=6QX^0KRhbKLj-wl*0)X3zj+XOf%0lXMo&t
z6g#d9EMBA)ugn%!KEaM@Wz`Cr@|#r9@N^ilvlz{YKDc(ow77H=hDF?TV-jr$`&0E%
zb0WV(R0L7&Kl$ojZb<f!2SZ*~WvmFUn=;8e*ACm5r!gOyDr36VqcK{MpScZ5#(o-c
eR{VKp^6XyDiZkEa$>BLY4nsCRf+erS0s94wn>}6t

literal 3956
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
Qa0^9N!FCPiADBS-Kl6aP5C8xG

diff --git a/core/blueprints/__init__.py b/core/blueprints/__init__.py
new file mode 100644
index 0000000..87a3b69
--- /dev/null
+++ b/core/blueprints/__init__.py
@@ -0,0 +1,21 @@
+from flask import Flask
+from flask_session import Session
+from core.blueprints.utils import logged_in_user
+
+def create_app():
+    app = Flask(__name__, template_folder="../../ui/templates/")
+    app.config["SECRET_KEY"] = ""
+    app.config["SESSION_PERMANENT"] = False
+    app.config["SESSION_TYPE"] = "filesystem"
+
+    Session(app)
+    app.before_request(logged_in_user)
+
+    with app.app_context():
+        from core.blueprints.authentication import auth_bp
+        from core.blueprints.main import main_bp
+
+        app.register_blueprint(auth_bp)
+        app.register_blueprint(main_bp)
+
+    return app
\ No newline at end of file
diff --git a/core/blueprints/__pycache__/__init__.cpython-310.pyc b/core/blueprints/__pycache__/__init__.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..8285129192c1d76f50db7c3e65ddd8f84bc0956d
GIT binary patch
literal 887
zcmZ8f&2Q5%6nDOwHtohX;97R=r2}z86#{jcgb<}#icmw4mBntC&H0$^s0_8Iah<qv
zW=H;|TsiS402iJ;I!&|lUVgTp-^cH{*x2w8jP8fa`I(8(Pqnx`U=O_j5syI;L=1*9
zBQy+!O=f0RXlZOQJ99z@uuYsVC~S~MfO_sPxP^K~?HsUJoC0tIDnwf305@4NpHqU<
z99M$!M47IK1)vEs1QFjrNhA$o5cASpA!04jiAn4MB92B4K(0p30g`Zf0SPYAcUwAF
z*QjxYzCMEFTEt^+)?BFqTBOZdnYS{vZF_0_w{0&?h2BGnHp~ksaESu+1d06x?5jBi
zQG314==1%4e-FMY-IFvcSuCm8gX-?BS9n%1LV1m9FYt$l{sh1Frw8G7;0M90w<A3E
z58u2T`J+kb%~D3ixqzEtXMH@Gj(u(b1B$%3lE?U{R4|KyH-H_kT2wbN&f|<?TsM*;
zpQUrID6BV+=&axrb9z=$A-SzK+i_W9u#)tX47&-O_m5abOP=OZ^i>R+%QT54^ogr3
zgb(f-sp!0=ob7NrPa$QFZ+!Hu+JX@Jsy6z8_!ijy`8a$Qy@OVZXmOlM8tqeYDvL52
z7Fk(=i`^heX`ayNDJQ#A8uKV9W^xg8x;y5@2~A|A5{Ygii3r2<NhQYp^1SvEPJw<5
zu^k8}x}Z9Sr)SfIzu7Th4chx_yIa3)m+yedsOQ$sOubJ{Ww@a+7S|6|^B6w7OF$)4
gCN!Pehpz9I+6KRMbC4CJV)VIcpHM`0ARn0KKLQ)&9RL6T

literal 0
HcmV?d00001

diff --git a/core/blueprints/__pycache__/app.cpython-310.pyc b/core/blueprints/__pycache__/app.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..5f5b09511e0aa6b4b5691b79fc47a8517cc013a0
GIT binary patch
literal 562
zcmYjP!EO^V5VgJ8Bt$Ck3BKl%B5^|qA(jItgcMb3BTFlHJxP|@YisPKwAXN?{{X%5
zOMB(SFZ9HCTSP~iu}7Xa?|E#0bhKb(w`VuIiZk{*Cy%Y5<Slu8LBTM?EpvRso!AJ@
zKo|kVL2M>4`B9qUCpQyQeq#r|nVRXEEoXlS#g<}thR_+nI)MvTCm5c*vpocCyEGI!
zggbuR<kH6`D5=QfoI)b%1E-ea`ujqXeee!s&^wTRE7P9#)OYLAji+O%e3x|FMX9B2
zW6FgwqaFY;A!ru~tdrCTvgwgzCVNHYUqI^4jE$WqZ1ADC8f8P`cOF}atC8b+(bC1f
zuJ*~<CC9A!7sDwnW4Jr5Ua6A^7}e#zO`zUGyhuK%%Dd1fK)G&O=o(Nj(a1B<sMda)
zF0-6Z=s!b~RO1oU`M+^RMdMn9tDzi;GgHj0^BLwjeO%6la%*+G7`0%2zhPe2opw;y
o!<4}Fc^FFcnLQ)^i@o2?M#O99O>f~1{fYYrc+M7LUOeT00p1;y`2YX_

literal 0
HcmV?d00001

diff --git a/core/blueprints/__pycache__/authentication.cpython-310.pyc b/core/blueprints/__pycache__/authentication.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..cca19bf245db16a300853e58840e93ffc3810848
GIT binary patch
literal 2594
zcmbVOTW{1x6!zF&+j~i}n+ungf?GgkQM#$%tx%wZP>>)XHuPexv~oO?T_?V5XU1Gs
z=AlYo`45{%-un~!E9SLNmHG?%LeH6HA*n#B@Mg{&pE*7=bLKnWB%hnB8Sq^0y&RmH
zH;g~=<?v&}%MEDacM#N|Br#GFkkky!)C#QB4(zlNR8l8!Qa5l3`k0BAR)cC<3u^k^
zO6qANXryz&oPM{H`E(&z(0V0lrmdhw3`VHK7Wd6yi7o9eQ<r+QIxuPNrAh0w@td(v
zf)zb7cW7juF6fbCY-zGgn+JroXp1hQ4g8POrLNIl{tH%av|UxbnG|fq<4mdr&N9k)
zU$S(Rgpw&&Fd^bRQ!Zz}6ii6v7Ch<i<Xm~2(U`MHDl%xB>ezr~jKeqmQ7FXIoYVd=
z6hpNX4Oz5z)ClgiZam0}(e0e4s(LRU#2Kn>qP$z747WqUK%Y-=ppR3-OjOxnA%|mk
zP3Uix_5H?{vL8O^Zh^0xGC9nth;Uc4rwR(Tb!g&m5YpH;UKph@AqNH@mBy~QYrP=Q
z+t8cPSD?3`cc8bW3*MEoGVu<K7f$I+s+5%G4mmI<HL$qaVwU8s#VcKE6og;Z5$lr%
zwGId|vad@|+wXwg+(o;s?dM9XwD&B&rDsNaMcYs4$WBS*TxspYoN(@N@;lCfNeo!e
z{DDCXxgeXgiYMAdTT9y(X{|J9{iO*f+}Ir7>2BQHSl{w5`nMlFxbGK&aZ&UC$MfTz
zjYk_kOT#$vzxA(Q8Q=fdNWMRfg>z?N%BJC#H+1MQ;Vh)jeHrettTR6Tc;@t<ft81E
zKqdUN5YkUW84Ww*U+->qHy&;IcQ>~lOgHCWn9Z~5&w#i(-N&k*6)8YBN%E(VhE+cn
z4?`{ywv4X&+i~9hP-=eo?%v~#u7BbBs(<9KeT5T1)%f(*Fcx|NKFyi%vt0Va@Coxn
z|7M(b#x(?PN27UMpQ5)jlxgycC>v@iZ7=aU#8Hb+!X&0xM0wU1#daD?<;^yvY#0eu
zMIVatX1i0>nRbcKVUSh?IfW2Wo@G#;x_a3&78Ov>-VTGr<rz~B<2>g=IpJsoMbEKJ
zf_jvvFlQep;x1UYgAtoil8eIuxdrBSl`o^qF%&0IoJ8>n2xZc3<wOM+IS;C|81?m{
zg9fUz{k$^xS@8WQTK}ep=Pr6rhp}Y6TTJZ9eAHXd(-Ewh``svJS;TsmIrV>LA@6nb
z9r-lm%zw!9UD#qT$~o(8&uC2aFx@PZaTMbAJEP~ynPwe#DXxKVOpkcj;OAJ_Y+}B~
z=9n|hvzjnEZH~D}?AM;zAfDYY`FRL2cGmQXMxeiaFll%<tV0ujfH=Z9Jzf7(#zE#W
zr40;YmDZ#Jd}5dO!~uqx@`(!;;2!an{>B6DF_9a<7q|yFWlh%03bjrerMYj48z1mG
zB^#4D^am~h*12lP`Q3#{6L|(1O>D^)b@owz6IU*l@ZL4#5_N$|Jk2E4&GFrjtN-`a
z{+YWO92j05x@0sd<os>9cBVK&SSdSW&*ZoY812MxGd&yEbjo${@FnnQFY^X;d<BI@
z;&Ifl5csDkPNDb=#c330Q1~eDe&={psuCrDDqca|4*5VRYrv$2{<H`*+TBBF*FgUq
z1AGA@s3WBN>{%?N2&%YbxbFr`!+R>u>3Q_p*FY7QK+GU`6n?ffPikadOV9R5!?FRM
z_ygEogwNpqgE)C1kKhgl3|ywh9hRlkcO2XjrnD&B5qPF;b5m7x9^1CwI{y+p-xd0y
z1)s$My=rGV+fQH+m@dz15WWh^X8VMy>?EPs<0g9J^wX%A$wTS$;5BFg=kASJG3W@O
zA|A`<nsW3p1T`$+4l<$8M5xa+Xdw;ZzXF|^G9|bb?ftIYJB5rB!QtODLwWr^;;G+P
zE|Nfhd!#BHlErk%>ICY=zjv$N)ikF?!mc5y3na30MiU620l%8rG;5@JzDB$YCfNQ3
DQCp5z

literal 0
HcmV?d00001

diff --git a/core/blueprints/__pycache__/main.cpython-310.pyc b/core/blueprints/__pycache__/main.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..a8a124751c8190423ec887f9468cffa95579b0c8
GIT binary patch
literal 564
zcmYjP!EO^V5VgJ8Y=~4qe1WgIq)5G02q6LzrwS?J&|qoht|!S-du@%ql=d2q@DFh0
zm-fnuU+9VP7SxX9u}7Xa@6Fi$=xEN!o_+kjd&?R7or8x~Q1FUYd``|V!!2`s!=2a&
z&OjIe#X)Q)F!@oM;wLu~Q+{O!zL}conk}k7gklRZJVEFTV4c7Ps}l^5UfUi5wp|(u
z9l|X?ZgT2F6BMjy#TmIo)CW!_#m%?5Bzxx_$e?#1{Z^(uovH5DqZ@BWxAI-mZ5O4M
zwv8z##*F$0hzUWvNMN0$MvzU9Bs1A-O8*Q}cV;Z?JYj<mz11ii62J4<LR^j<H}jSn
z`?B08XBQl^=3fk_w2kiee08cmM8K%7_H6?72I6J%L9M(CeFBv0riHEnb%I8ogGROX
z+jN!Xyhr~Dnxq<!pf3K8D=J4lEyMLtj?9@VX4+YWc~EDIYACl>$IDR+<_8>Rb=_$P
pbv;xWU0;NuM4$OH<X-OGsTv_KoHxCNm-H*{p5Q5)i&^oQ{{{S%l{WwY

literal 0
HcmV?d00001

diff --git a/core/blueprints/__pycache__/utils.cpython-310.pyc b/core/blueprints/__pycache__/utils.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..7d1d51668e0e00b81bf170e8ca1e58e0b4082aff
GIT binary patch
literal 1293
zcmb_by-yTD6rY*hy;}}A6*ch#bqkuaps_QAs8AYWLMYs9a#?rgj^*~_d^77Q!3q*-
z@Ndw>hJR^VD{DF{-<tyhM5&x)-h8}yU%%g*dVapca2#zN4PSeV{iMUiA@J}5r(Q=P
zndAj4dCW@@i_(j|(vSTzhyzYKQMAf-+{V2p{R0+<GLS7?XJlK3xOU{sChK*6p(oZ0
zYzRu`pfY3I4HW%B4Ym#HeWSFod}!NRX`R>AF}J}4(y`9S?&9$Au!d7dC=C0?C70~G
zFrx2WI{A`eT(M!pMk}b&QuP98p^f#1%0NInpHwzTWtmsU4Ce99iQn<s^JEKkI+<+e
zMkVV?k4!yI*6MQH7zNR0ma8gL$up4ATa`kxSr5!41r@!4dI!r(vKmzKu4vR4^2+F>
zF?pev$DeGssE0!(`+3!;@Klc`(d7#qZr~>4D9#2^L0Y7Vo!moV*dg2JU)X>O7YE@!
z|IGI|mg?=kOr?xc6KRuziRwWFH72X0$+p78D432arDSC4=$(qDc|>_d=QPU@`AcY1
zXoBepPW{w{-a)Jz23;eJC%N%=0x6EfK88PJdn{*r{0IN)lG(5U`bSu~^(*z!^jZ#b
zm_<K8o`EWI)mslc;aFHdg`u{s5yCjsWcMLglPM`(d~4^ZA;yRt-BSaf5S<;dz`J~R
z$wli^D`9)d<&~n&(n7B;Uo?U?8XOC_j|)5?;V36q!G$1hke4$rAu3#umgsWdhevq+
zCp&NxwaCJ&Ygur;_8(~ABkz<3;b`#wN`t=vb5z_d5(|{yDGl!SG7WHt9^ED30CCU|
zDh{dJw0VePcgdA-j?pzp!y*}7h4`|$%j_||qc+><&Dvm4q<VCvN2bl=zVFPSsWMa7
pg$ClseHq7$^Dqr}{*$M)hAU+)n?kM9&(hR7i)@aEBJ}5G{s2I`C-(pV

literal 0
HcmV?d00001

diff --git a/core/app.py b/core/blueprints/authentication.py
similarity index 66%
rename from core/app.py
rename to core/blueprints/authentication.py
index 87bdfe3..fc2677f 100644
--- a/core/app.py
+++ b/core/blueprints/authentication.py
@@ -1,52 +1,12 @@
-from flask import Flask, render_template, session, request, url_for, redirect, g
-from flask_session import Session
+from flask import Blueprint, render_template, session, request, url_for, redirect, g
 from werkzeug.security import generate_password_hash, check_password_hash
-from functools import wraps
-
 from core.forms import SignupForm, LoginForm
 from database.database import Database
+from core.blueprints.utils import login_required
 
-app = Flask(__name__, template_folder="../ui/templates/")
-app.config["SECRET_KEY"] = ""
-app.config["SESSION_PERMANENT"] = False
-app.config["SESSION_TYPE"] = "filesystem"
+auth_bp = Blueprint("auth", __name__)
 
-Session(app)
-
-@app.before_request
-def logged_in_user():
-    g.user = session.get("username", None)
-    g.admin = session.get("username", None)
-
-def login_required(view):
-    """add at start of routes where users need to be logged in to access"""
-    @wraps(view)
-    def wrapped_view(*args, **kwargs):
-        if g.user is None:
-            return redirect(url_for("login", next=request.url))
-        return view(*args, **kwargs)
-    return wrapped_view
-
-def admin_required(view):
-    """add at start of routes where admins need to be logged in to access"""
-    @wraps(view)
-    def wrapped_view(*args, **kwargs):
-        if g.admin != "admin":
-            return redirect(url_for("login", next=request.url))
-        return view(*args, **kwargs)
-    return wrapped_view
-
-@app.route('/')
-def index():
-    """
-    Home page of the platform
-    
-    Contains a list of some of the streams that are currently live and the most popular categories.
-    """
-
-    return render_template('index.html')
-
-@app.route("/signup", methods=["GET", "POST"])
+@auth_bp.route("/signup", methods=["GET", "POST"])
 def signup():
     form = SignupForm()
     if form.validate_on_submit():
@@ -76,7 +36,7 @@ def signup():
             cursor.execute("""INSERT INTO users (username, password, email, num_followers, isPartenered, bio)
                        VALUES (?, ?, ?, ?, ?, ?);""", (username, generate_password_hash(password), email, 0, 0, "This user does not have a Bio."))
             db.commit_data()
-            return redirect(url_for("login"))
+            return redirect(url_for("auth.login"))
 
 
         # Close connection to prevent data leaks
@@ -84,7 +44,7 @@ def signup():
 
     return render_template("signup.html", form=form)
 
-@app.route("/login", methods=["GET", "POST"])
+@auth_bp.route("/login", methods=["GET", "POST"])
 def login():
     form = LoginForm()
     if form.validate_on_submit():
@@ -99,14 +59,15 @@ def login():
         # Check if user exists so only users who have signed up can login
         user_exists = cursor.execute("""SELECT * FROM users
                                   WHERE username = ?;""", (username,)).fetchone()
-        db.close_connection()
 
         if not user_exists:
             form.username.errors.append("Incorrect username or password.")
+            db.close_connection()
 
         # Check is hashed passwords match to verify the user logging in
         elif not check_password_hash(user_exists["password"], password):
             form.username.errors.append("Incorrect username or password.")
+            db.close_connection()
 
         else:
             # Create a new session to prevent users from exploiting horizontal access control
@@ -118,12 +79,13 @@ def login():
 
             # Otherwise return home
             if not next_page:
-                next_page = url_for("index")
+                next_page = url_for("app.index")
+            db.close_connection()
             return redirect(next_page)
         
     return render_template("login.html", form=form)
     
-@app.route("/logout")
+@auth_bp.route("/logout")
 @login_required
 def logout():
     session.clear()
diff --git a/core/blueprints/main.py b/core/blueprints/main.py
new file mode 100644
index 0000000..34472ac
--- /dev/null
+++ b/core/blueprints/main.py
@@ -0,0 +1,14 @@
+from flask import render_template, Blueprint
+
+main_bp = Blueprint("app", __name__)
+
+
+@main_bp.route('/')
+def index():
+    """
+    Home page of the platform
+    
+    Contains a list of some of the streams that are currently live and the most popular categories.
+    """
+    return render_template('index.html')
+
diff --git a/core/blueprints/utils.py b/core/blueprints/utils.py
new file mode 100644
index 0000000..2ccf32c
--- /dev/null
+++ b/core/blueprints/utils.py
@@ -0,0 +1,24 @@
+from flask import redirect, url_for, request, g, session
+from functools import wraps
+
+def logged_in_user():
+    g.user = session.get("username", None)
+    g.admin = session.get("username", None)
+
+def login_required(view):
+    """add at start of routes where users need to be logged in to access"""
+    @wraps(view)
+    def wrapped_view(*args, **kwargs):
+        if g.user is None:
+            return redirect(url_for("login", next=request.url))
+        return view(*args, **kwargs)
+    return wrapped_view
+
+def admin_required(view):
+    """add at start of routes where admins need to be logged in to access"""
+    @wraps(view)
+    def wrapped_view(*args, **kwargs):
+        if g.admin != "admin":
+            return redirect(url_for("login", next=request.url))
+        return view(*args, **kwargs)
+    return wrapped_view
\ No newline at end of file
diff --git a/database/__pycache__/database.cpython-310.pyc b/database/__pycache__/database.cpython-310.pyc
index dcfaff9f001f142ea9d560a117776d9c82815896..18301511219fc48c2049afc8aafb76e7caea8440 100644
GIT binary patch
delta 18
Ycmcb@d4-cRpO=@50SI1f<UGv+04@sz$N&HU

delta 18
Ycmcb@d4-cRpO=@50SMM?<UGv+04(1Gi~s-t

diff --git a/database/app.db b/database/app.db
index 37d5a5197e4e62ca427fb381b1ab91410f6cbe63..1e82968d6811ad99e4a97362b1205fdc4726d5f8 100644
GIT binary patch
delta 144
zcmZp8z}WDBae}m<FarYvI}pPF|3n>QNnr*(od90`9}H~V8yR?c_|EX3<&ERs$a8nI
zpnxSebCV|j<}KV>jEn-4@AEV=@@-D!&1GcdnS7q_KO^tt^ZcfpSpwJvn3?#WY!+0w
k#xKIjEY4VxT3lkx3}YEGZT_JzY{1C2S<v7;|HJ@R06x|ulK=n!

delta 305
zcmXw#u};E30EX`bv9Xkc7zg9hfdyl**K&6)i-y5O;z(j#Os>7FJ+!T{6-U7*(C{Rr
zK8A)TF!BU$CT!ZpFZs8B`2K&og3}dz*>6<=09$4Lsk|OKdsWcA7#e5|YWe~+-qD9~
zWz_XW{j+E_J-zbW*(~1l0|;yLulfvD3U0&@!uhiC3peIVL~0O?02-C;A$pp1ptd`^
zJl3?cTxR*5e<MP>pGDjzv~N?Zq@9y2Q87NX`1sr+gP`qjDgxJ`!gG3rV$Nv5Fmbty
zdzMFiCVYZzY%`w=A{q6uXEPoKJ|nIbN-unjR4&J9lnBNrN;oIiF;}<UAdN?n%FKsM
o-kTzonVF=y8S#lUxj9g2cf0%nmc!Ayl>bJ>`e?^0^yUxx14m3%F8}}l

diff --git a/flask_session/841e29f4900cf96cfb8ec55c0c598d2c b/flask_session/841e29f4900cf96cfb8ec55c0c598d2c
deleted file mode 100644
index bc2b5121ae26f6308bad9f9e1f7cffe466348f04..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 37
ocmXrX+MM3NI#rAT0&1u9aFiCO7Ud=8rcUW$DM>9ZnNq9=0L@(t2LJ#7

diff --git a/flask_session/bd9d4040a2dcd9c9d4ed85d3dc2d6ba7 b/flask_session/bd9d4040a2dcd9c9d4ed85d3dc2d6ba7
new file mode 100644
index 0000000000000000000000000000000000000000..dc3f711f597900a08d6043ded3c6bf971e323acb
GIT binary patch
literal 37
ocmd<H-j?3LI#rAT0&1u9aFiCO7Ud=8rcUW$DM>9ZnNq9=0Ku#awEzGB

literal 0
HcmV?d00001