diff --git a/controllers/user.py b/controllers/user.py index 9144a3c4..0e388f49 100644 --- a/controllers/user.py +++ b/controllers/user.py @@ -53,43 +53,43 @@ def handle_db_disconnect(f): # User authentication @routes_user.route("/login", methods=['POST', 'OPTIONS']) def login(): - Helper_App.console_log('login') - Helper_App.console_log(f'method={request.method}') - """ - if request.method == 'OPTIONS': - # Handle preflight request - response = current_app.make_default_options_response() - response.headers['Access-Control-Allow-Headers'] = f'Content-Type, {Model_View_Base.FLAG_CSRF_TOKEN}' - response.headers['Access-Control-Allow-Methods'] = 'POST, OPTIONS' - return response - """ try: - data = request.json + Helper_App.console_log('login') + Helper_App.console_log(f'method={request.method}') + """ + if request.method == 'OPTIONS': + # Handle preflight request + response = current_app.make_default_options_response() + response.headers['Access-Control-Allow-Headers'] = f'Content-Type, {Model_View_Base.FLAG_CSRF_TOKEN}' + response.headers['Access-Control-Allow-Methods'] = 'POST, OPTIONS' + return response + """ try: - data = request.get_json() + data = request.json + try: + data = request.get_json() + except: + data = {} except: data = {} - except: - data = {} - Helper_App.console_log(f'data={data}') - hash_callback = data.get(Model_View_Base.FLAG_CALLBACK, Model_View_Base.HASH_PAGE_HOME) - Helper_App.console_log(f'hash_callback: {hash_callback}') + Helper_App.console_log(f'data={data}') + hash_callback = data.get(Model_View_Base.FLAG_CALLBACK, Model_View_Base.HASH_PAGE_HOME) + Helper_App.console_log(f'hash_callback: {hash_callback}') - """ - # Verify CSRF token manually - Helper_App.console_log(f'request headers={request.headers}') - token = request.headers.get(Model_View_Base.FLAG_CSRF_TOKEN) - Helper_App.console_log(f'token={token}') - Helper_App.console_log(f'session={session}') - Helper_App.console_log(f'session token={session.get('csrf_token')}') - if not token or token != session.get('csrf_token'): - token = data.get(Model_View_Base.FLAG_CSRF_TOKEN, None) + """ + # Verify CSRF token manually + Helper_App.console_log(f'request headers={request.headers}') + token = request.headers.get(Model_View_Base.FLAG_CSRF_TOKEN) Helper_App.console_log(f'token={token}') + Helper_App.console_log(f'session={session}') + Helper_App.console_log(f'session token={session.get('csrf_token')}') if not token or token != session.get('csrf_token'): - raise BadRequest('Invalid or missing CSRF token') - """ - # OAuth login - try: + token = data.get(Model_View_Base.FLAG_CSRF_TOKEN, None) + Helper_App.console_log(f'token={token}') + if not token or token != session.get('csrf_token'): + raise BadRequest('Invalid or missing CSRF token') + """ + # OAuth login # callback_login = F'{Model_View_Base.HASH_CALLBACK_LOGIN}{data.get(Model_View_Base.FLAG_CALLBACK, Model_View_Base.HASH_PAGE_HOME)}' # encoded_path = quote(data.get(Model_View_Base.FLAG_CALLBACK, Model_View_Base.HASH_PAGE_HOME)) diff --git a/helpers/helper_app.py b/helpers/helper_app.py index ca78e365..793812c9 100644 --- a/helpers/helper_app.py +++ b/helpers/helper_app.py @@ -39,4 +39,5 @@ class Helper_App(BaseModel): if current_app.app_config.is_development: print(message) elif current_app.app_config.is_production: - current_app.logger.info(message) \ No newline at end of file + pass + current_app.logger.info(message) \ No newline at end of file diff --git a/static/MySQL/9000_populate.sql b/static/MySQL/9000_populate.sql index fcba86bb..ca962db8 100644 --- a/static/MySQL/9000_populate.sql +++ b/static/MySQL/9000_populate.sql @@ -873,12 +873,42 @@ INSERT INTO Shop_User ( , firstname , surname , email - # email_verified , is_super_user + , active + , created_by + , created_on ) VALUES - ('auth0|6582b95c895d09a70ba10fef', 'Teddy', 'Middleton-Smith', 'edward.middletonsmith@gmail.com', 1), - ('parts_guest', 'Guest', '', '', 0) + ( + 'auth0|6582b95c895d09a70ba10fef' -- id_user_auth0 + , 'Teddy' -- firstname + , 'Middleton-Smith' -- surname + , 'edward.middletonsmith@gmail.com' -- email + , 1 -- is_super_user + , 1 -- active + , 1 -- created_by + , current_timestamp() -- created_on + ), + ( + 'parts_guest' -- id_user_auth0 + , 'Guest' -- firstname + , '' -- surname + , '' -- email + , 0 -- is_super_user + , 1 -- active + , 1 -- created_by + , current_timestamp() -- created_on + ), + ( + 'auth0|672659014296b7f94a9bab45' -- id_user_auth0 + , 'Tierney' -- firstname + , 'Gullen' -- surname + , 'tierneybailey13@gmail.com' -- email + , 1 -- is_super_user + , 1 -- active + , 1 -- created_by + , current_timestamp() -- created_on +) ; # User Role link