From fadb4415f14c068cb6ace614a9c0ebb2298a15e8 Mon Sep 17 00:00:00 2001
From: Krish M <krish94@uab.edu>
Date: Thu, 7 Apr 2022 22:21:56 -0500
Subject: [PATCH] implemented logic to route user to correct page based on
account state
---
app/__init__.py | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/app/__init__.py b/app/__init__.py
index 288b971..7a3e061 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -14,6 +14,9 @@ import os
import json
import sys
+sys.path.append(vars.rabbitmq_agents_loc)
+import rc_util
+
def create_app(config_name):
app = Flask(__name__, static_folder='static') # initialization of the flask app
cors = CORS(app, resources={r"/*": {"origins": vars.cors_allowed_origins}})
@@ -38,7 +41,6 @@ def create_app(config_name):
def index():
invalid_eppa = ["staff"]
- invalid_state = ["blocked", "certification"]
if 'uid' not in session:
session['uid']=str(uuid.uuid4())
@@ -49,11 +51,14 @@ def create_app(config_name):
session['return_url'] = request.args.get('redir', vars.default_referrer)
- if session['user'].get('eppa') not in invalid_eppa:
- return render_template('errors/blocked.html', title='shibboleth error')
+# if session['user'].get('eppa') not in invalid_eppa:
+# return render_template('errors/blocked.html', title='shibboleth error')
+
+ if rc_util.check_state(session['user'].get('username')) == "blocked":
+ return render_template('errors/blocked.html')
-# if rc_util.check_state(session['user'].get('username')) in invalid_state:
-# return render_template('errors/error.html', title='account state error')
+ elif rc_util.check_state(session['user'].get('username')) == "certification":
+ return render_template('errors/certification.html')
else:
return render_template('auth/SignUp.html', room_id=session['uid'],
@@ -65,13 +70,12 @@ def create_app(config_name):
error_msg=messages.error_message)
-
@app.route('/blocked_account')
- def error_account_create():
+ def account_block():
return render_template('errors/blocked.html')
@app.route('/certify_account')
- def error_account_create():
+ def error_certify():
return render_template('errors/certification.html')
# misc page error catching
--
GitLab