Skip to content
Snippets Groups Projects
Commit 01fc0451 authored by Marco De Donno's avatar Marco De Donno
Browse files

Add an error message for the user if the account is not activated

parent a36eb3fc
No related branches found
No related tags found
No related merge requests found
...@@ -80,13 +80,22 @@ def do_login(): ...@@ -80,13 +80,22 @@ def do_login():
} ) } )
if pbkdf2( request.form.get( "password" ), user[ 'password' ] ): if pbkdf2( request.form.get( "password" ), user[ 'password' ] ):
session[ 'logged' ] = True if not user[ 'active' ]:
session[ 'session_id' ] = str( uuid4() ) session.clear()
session[ 'username' ] = user[ 'username' ] return jsonify( {
return jsonify( { 'error': False,
'error': False, 'logged': False,
'logged': True, 'message': 'Your account is not activated. Please contact an administrator.'
} ) } )
else:
session[ 'logged' ] = True
session[ 'session_id' ] = str( uuid4() )
session[ 'username' ] = user[ 'username' ]
return jsonify( {
'error': False,
'logged': True,
} )
else: else:
session.clear() session.clear()
......
...@@ -64,12 +64,16 @@ ...@@ -64,12 +64,16 @@
{ {
if( ! data.error ) if( ! data.error )
{ {
if( data.logged ) if( data.logged )
{ {
location.href = "{{ url_for( 'home' ) }}"; location.href = "{{ url_for( 'home' ) }}";
} else { } else {
$( '#icnml_login_error' ).text( 'Invalid username/password' ); if( typeof data.message !== 'undefined' )
var message = data.message;
else
var message = 'Invalid username/password';
$( '#icnml_login_error' ).text( message );
$( '#login_button > span' ).text( "Login" ); $( '#login_button > span' ).text( "Login" );
} }
} }
......
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