cosmetics and reorganized imports more efficiently

uffd/__init__.py

@@ -42,14 +42,17 @@ def create_app(test_config=None): # pylint: disable=too-many-locals
 		pass
 
 	db.init_app(app)
+
+	if app.config['LDAP_SERVICE_BIND_DN']:
 		# pylint: disable=C0415
 		from uffd import user, selfservice, role, mail, session, csrf, mfa, oauth2, services, signup, invite
 		# pylint: enable=C0415
-
-	if app.config['LDAP_SERVICE_BIND_DN']:
 		for i in user.bp + selfservice.bp + role.bp + mail.bp + session.bp + csrf.bp + mfa.bp + oauth2.bp + services.bp + signup.bp + invite.bp:
 			app.register_blueprint(i)
 	else:
+		# pylint: disable=C0415
+		from uffd import user, selfservice, role, mail, session, csrf, mfa, oauth2, services
+		# pylint: enable=C0415
 		app.config['ENABLE_PASSWORDRESET'] = False
 		for i in user.bp + selfservice.bp + role.bp + mail.bp + session.bp + csrf.bp + mfa.bp + oauth2.bp + services.bp:
 			app.register_blueprint(i)

uffd/session/views.py

@@ -38,6 +38,7 @@ def logout():
 	return resp
 
 def set_session(user, password='', skip_mfa=False):
+	session.clear()
 	session['user_dn'] = user.dn
 	# only save the password if we use a user connection
 	if password and not current_app.config['LDAP_SERVICE_BIND_DN']: