Account blocked
+{{ welcome_msg |safe }}
+diff --git a/app/__init__.py b/app/__init__.py index 7995fe2ba022f8fd76b2d3761dc5fb697b688394..6880ec6ce9eaa5d489ae73a987749d6494eadb85 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -12,6 +12,10 @@ from flask_bootstrap import Bootstrap import random 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 @@ -22,11 +26,13 @@ def create_app(config_name): username_key = list(filter(lambda key: (request.headers.get(key) is not None), vars.username_key)) fullname_key = list(filter(lambda key: (request.headers.get(key) is not None), vars.fullname_key)) email_key = list(filter(lambda key: (request.headers.get(key) is not None), vars.email_key)) + eppa_key = list(filter(lambda key: (request.headers.get(key) is not None), vars.eppa_key)) user = { "username": (request.headers.get(username_key[0]) if len(username_key) > 0 else None), "fullname": (request.headers.get(fullname_key[0]) if len(fullname_key) > 0 else None), "email": (request.headers.get(email_key[0]) if len(email_key) > 0 else None), + "eppa": (request.headers.get(eppa_key[0]) if len(eppa_key) > 0 else None), } return user @@ -42,7 +48,22 @@ def create_app(config_name): session['return_url'] = request.args.get('redir', vars.default_referrer) - return render_template('auth/SignUp.html', room_id=session['uid'], +# if (not any(item in session['user'].get('eppa') for item in valid_eppa)): +# return render_template('errors/shibboleth.html') + + if rc_util.check_state(session['user'].get('username')) == "blocked": + return render_template('errors/blocked.html') + + elif rc_util.check_state(session['user'].get('username')) == "certification": + return render_template('errors/certify.html', room_id=session['uid'], + username=session['user'].get('username'), + fullname=session['user'].get('fullname'), email=session['user'].get('email'), + referrer=session['return_url'], cancel_url=vars.default_referrer, + welcome_msg=messages.welcome_message, + cancel_msg=messages.cancel_message, + error_msg=messages.error_message) + else: + return render_template('auth/SignUp.html', room_id=session['uid'], username=session['user'].get('username'), fullname=session['user'].get('fullname'), email=session['user'].get('email'), referrer=session['return_url'], cancel_url=vars.default_referrer, @@ -50,10 +71,13 @@ def create_app(config_name): cancel_msg=messages.cancel_message, error_msg=messages.error_message) - @app.route('/error_account') - def error_account_create(): - return render_template('errors/error.html', title='account creation failed') + @app.route('/blocked_account') + def account_block(): + return render_template('errors/blocked.html') + @app.route('/certify_account') + def error_certify(): + return render_template('errors/certify.html') # misc page error catching @app.errorhandler(403) diff --git a/app/static/scripts/function.js b/app/static/scripts/function.js index 77bd28ad114e8de33d54c031b80018c76b7f3580..486006b1e028e25f37ee330bd3602358d12b70c0 100644 --- a/app/static/scripts/function.js +++ b/app/static/scripts/function.js @@ -23,6 +23,14 @@ function request_account() { }) } +function certify_account() { + socket.emit('request certification', { + fullname: document.getElementById("fullname").value, + email: document.getElementById("email").value, + username: document.getElementById("username").value + }) +} + function renderDom(title, message, error_msg) { document.getElementById("form-wrapper").innerHTML = "
" + message + "