Working tests, hopefully all code changes done.

app/main/views/two_factor.py

@@ -5,19 +5,23 @@ from flask import (
 from flask_login import login_user
 
 from app.main import main
-from app.main.dao import users_dao, verify_codes_dao
+from app.main.dao import users_dao
 from app.main.forms import TwoFactorForm
 
 
 @main.route('/two-factor', methods=['GET', 'POST'])
 def two_factor():
     # TODO handle user_email not in session
-    user = users_dao.get_user_by_email(session['user_email'])
-    codes = verify_codes_dao.get_codes(user.id)
-    form = TwoFactorForm(codes)
+    user_id = session['user_details']['id']
+
+    def _check_code(code):
+        return users_dao.check_verify_code(user_id, code, "sms")
+
+    form = TwoFactorForm(_check_code)
 
     if form.validate_on_submit():
-        verify_codes_dao.use_code_for_user_and_type(user_id=user.id, code_type='sms')
+        del session['user_details']
+        user = users_dao.get_user_by_id(user_id)
         login_user(user)
         return redirect(url_for('.choose_service'))