Skip to content
Snippets Groups Projects
Commit fadb4415 authored by Krish Moodbidri's avatar Krish Moodbidri
Browse files

implemented logic to route user to correct page based on account state

parent bd546112
No related branches found
No related tags found
2 merge requests!21Feat certify account,!18WIP: Feat-account-renewal
...@@ -14,6 +14,9 @@ import os ...@@ -14,6 +14,9 @@ import os
import json import json
import sys import sys
sys.path.append(vars.rabbitmq_agents_loc)
import rc_util
def create_app(config_name): def create_app(config_name):
app = Flask(__name__, static_folder='static') # initialization of the flask app app = Flask(__name__, static_folder='static') # initialization of the flask app
cors = CORS(app, resources={r"/*": {"origins": vars.cors_allowed_origins}}) cors = CORS(app, resources={r"/*": {"origins": vars.cors_allowed_origins}})
...@@ -38,7 +41,6 @@ def create_app(config_name): ...@@ -38,7 +41,6 @@ def create_app(config_name):
def index(): def index():
invalid_eppa = ["staff"] invalid_eppa = ["staff"]
invalid_state = ["blocked", "certification"]
if 'uid' not in session: if 'uid' not in session:
session['uid']=str(uuid.uuid4()) session['uid']=str(uuid.uuid4())
...@@ -49,11 +51,14 @@ def create_app(config_name): ...@@ -49,11 +51,14 @@ def create_app(config_name):
session['return_url'] = request.args.get('redir', vars.default_referrer) session['return_url'] = request.args.get('redir', vars.default_referrer)
if session['user'].get('eppa') not in invalid_eppa: # if session['user'].get('eppa') not in invalid_eppa:
return render_template('errors/blocked.html', title='shibboleth error') # 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: elif rc_util.check_state(session['user'].get('username')) == "certification":
# return render_template('errors/error.html', title='account state error') return render_template('errors/certification.html')
else: else:
return render_template('auth/SignUp.html', room_id=session['uid'], return render_template('auth/SignUp.html', room_id=session['uid'],
...@@ -65,13 +70,12 @@ def create_app(config_name): ...@@ -65,13 +70,12 @@ def create_app(config_name):
error_msg=messages.error_message) error_msg=messages.error_message)
@app.route('/blocked_account') @app.route('/blocked_account')
def error_account_create(): def account_block():
return render_template('errors/blocked.html') return render_template('errors/blocked.html')
@app.route('/certify_account') @app.route('/certify_account')
def error_account_create(): def error_certify():
return render_template('errors/certification.html') return render_template('errors/certification.html')
# misc page error catching # misc page error catching
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment