From fa23dc9590678f201c454e5ced5894797d3fc34e Mon Sep 17 00:00:00 2001
From: Dinosaur <78600651+Darya-Tolmeneva@users.noreply.github.com>
Date: Wed, 6 Apr 2022 17:27:39 +0500
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D1=8C=20=D1=81=D0=BC=D0=B5=D0=BD=D1=8B=20=D0=BF?=
 =?UTF-8?q?=D0=B0=D1=80=D0=BE=D0=BB=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/moona_data.db        | Bin 12288 -> 12288 bytes
 forms/recovery.py       |  20 +++++++++++++
 main.py                 |  49 ++++++++++++++++++++++++++++++-
 templates/recovery.html |  63 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 131 insertions(+), 1 deletion(-)
 create mode 100644 forms/recovery.py
 create mode 100644 templates/recovery.html

diff --git a/db/moona_data.db b/db/moona_data.db
index 3b531a2339ed8353c810f99966b31dc23603cee3..8c2094f8a096c268f9d1e4b015ac1ca6961fb833 100644
GIT binary patch
delta 697
zcmbV}yKWOf6hL<qQDDjIxQHo&Fp;bjNU>+<wX>-pm;iPlNI^gvoI5jj94EHdvDb)H
zPI`obXd?dw@<;Fk{6reQfi>dUfZ$GZbv4B~I;Z=m`{yfu>D~3a#gbQTp65N!TL`9J
z@Hv>yic7bG*)%xxbADmXE3D-&@)sYD-{dF$Tkl$V)%WtPv%S@2uMWc#c$##3*vD5;
z@AQ)qjE9}0rBMoL$J9E#c5OVuVQX-Zq)F}PhgLUfC)Gi}J<vzi(T&joP$4&{B-vE%
zr|Iyd|75H2dUNw}v$0h{a1H_Ei6*E)fRiX0CtNTd#x&y2^4K71L5L<1Xa(7-k)w!=
z0z)Y!l&%xLPUIXXQ~mf~9+Q6*d8T)FxNW`|-=p2gJ-Ab`F+&w<$}x0;ItaO9gfI>g
zVi7SE0z;{_vx0|8#ashegOPRIWG1Yxeiu1=?gw8**x!Pr-y;$6{$;s5`H||+CA#sW
z<3YHGyW5RJ`EYxu5<;x35lUHLnq_DdnL?utb!cKPGY?{zkvg)5S!1P8Av#nXH4%>M
tZ~V(yjCqM%mclPwdWFmRn-y<<D%{8|X2&ZFrA2o27wX$R=ya>Y@fR<|)0Y4M

delta 265
zcmZojXh@hK%_uNY##vB+LC?R2mw|zSiEkDI-#flpn*|lL_%_et%VK0>5MW^7mjeoj
z^V>dRP}P)XH0O<Mj8qh5xG>?u-V0kUHeA?xVdsS@7n?6^y0GEGt_wRZ>~$$EOU%y9
z6G+TUDN4;uf$%0r%geJtnJeYwGEKsbvQtBxLdqQ-y^H<Qid75@OiWTtOij#8l9G}P
zj14ReO)N~z%`H>X43Z5~EYi{p%!~{yjLZ{Llai86Qj$z9j4Xf(j8ZI<Q<9Pmjg1V9
ojC2i5fT*-MwTKJo9kAP<1Koa+e_{Z?m?VmO9C8ygbM%Tz0ef&&<NyEw

diff --git a/forms/recovery.py b/forms/recovery.py
new file mode 100644
index 0000000..f8d0482
--- /dev/null
+++ b/forms/recovery.py
@@ -0,0 +1,20 @@
+from flask_wtf import FlaskForm
+from flask_wtf.file import FileAllowed
+from wtforms import EmailField, StringField, PasswordField, SubmitField, FileField, IntegerField, TextAreaField
+from wtforms.validators import DataRequired
+
+
+class RecoveryForm(FlaskForm):
+    email = EmailField('Почта', validators=[DataRequired()])
+    submit = SubmitField('Восстановить')
+
+
+class Conf(FlaskForm):
+    code_key = StringField('Код подтверждения', validators=[DataRequired()])
+    submit = SubmitField('Подтвердить')
+
+
+class Finish(FlaskForm):
+    password = PasswordField('Пароль', validators=[DataRequired()])
+    password2 = PasswordField('Повторите пароль', validators=[DataRequired()])
+    submit = SubmitField('Восстановление')
diff --git a/main.py b/main.py
index d7627ab..d4d8f55 100644
--- a/main.py
+++ b/main.py
@@ -8,16 +8,18 @@ from data import db_session
 from data.users import User
 from forms.login import LoginForm
 from forms.register import RegisterForm, Confirmation
+from forms.recovery import RecoveryForm, Conf, Finish
 from post import mail
 
 app = Flask(__name__)
 app.config['SECRET_KEY'] = 'moona_secret_key'
 login_manager = LoginManager()
 login_manager.init_app(app)
-help_arg = None
+help_arg = False
 send_msg = False
 secret_code = None
 photo = None
+user_email = ""
 
 
 def save_photo(photo, login):
@@ -78,6 +80,7 @@ def confirmation():
         send_msg = True
     if conf.validate_on_submit():
         if str(conf.code_key.data).strip() == str(secret_code).strip():
+            print(secret_code)
             if form.photo.data:
                 user = User(
                     name=form.name.data,
@@ -132,6 +135,50 @@ def register():
     return render_template('register.html', title='Регистрация', form=form, message='')
 
 
+@app.route('/recovery', methods=['GET', 'POST'])
+def recovery():
+    global send_msg
+    global secret_code
+    global help_arg
+    global user_email
+    form = RecoveryForm()
+    conf = Conf()
+    finish = Finish()
+    session = db_session.create_session()
+    if form.validate_on_submit() and form.email.data:
+        user_email = form.email.data
+        if not send_msg:
+            secret_code = secret_key()
+            mail(f'Ваш секретный код: {secret_code}', form.email.data, 'Moona Код')
+            send_msg = True
+            print(secret_code)
+            return render_template('recovery.html', title='Восстановление пароля', form=conf, message='', s='2')
+    if conf.validate_on_submit():
+        if str(conf.code_key.data).strip() == str(secret_code).strip():
+            help_arg = True
+            return render_template('recovery.html', title='Восстановление пароля', form=finish, message='', s='3')
+    if help_arg:
+        if finish.validate_on_submit():
+            db_sess = db_session.create_session()
+            user = db_sess.query(User).filter(User.email == user_email).first()
+            # user2 = User(
+            #     name=user.name,
+            #     surname=user.surname,
+            #     login=user.login,
+            #     age=user.age,
+            #     about=user.about,
+            #     email=user_email,
+            #     photo=user.photo,
+            #     role='user')
+            user.set_password(finish.password.data)
+            user2 = session.merge(user)
+            session.add(user2)
+            session.commit()
+            send_msg = False
+            return redirect('/login')
+    return render_template('recovery.html', title='Восстановление пароля', form=form, message='', s='1')
+
+
 def main():
     db_session.global_init("db/moona_data.db")
     app.run()
diff --git a/templates/recovery.html b/templates/recovery.html
new file mode 100644
index 0000000..2e1e928
--- /dev/null
+++ b/templates/recovery.html
@@ -0,0 +1,63 @@
+<meta charset="UTF-8">
+<link rel="stylesheet" href="../static/css/register.css">
+{% extends "base.html" %}
+{% block content %}
+<div class="divlog">
+    <h1 class="title">Восстановление пароля</h1>
+    <form action="" method="post">
+        {{ form.hidden_tag() }}
+        {{ form.csrf_token }}
+        {% if s == '1' %}
+            <h3>Для восстановления пароля введите свою почту</h3>
+            <p>
+                {{ form.email.label }}<br>
+                {{ form.email(class="form-control") }}<br>
+                {% for error in form.email.errors %}
+            <div class="alert alert-danger" role="alert">
+                {{ error }}
+            </div>
+            {% endfor %}
+            </p>
+            <p>{{ form.submit(type="submit", class="btn btn-primary") }}</p>
+        {% endif %}
+        {% if s == '2' %}
+            <h3>Введите код</h3>
+            <p>
+                {{ form.code_key.label }}<br>
+                {{ form.code_key(class="form-control") }}<br>
+                {% for error in form.code_key.errors %}
+            <div class="alert alert-danger" role="alert">
+                {{ error }}
+            </div>
+            {% endfor %}
+            </p>
+            <p>{{ form.submit(type="submit", class="btn btn-primary") }}</p>
+        {% endif %}
+        {% if s == '3' %}
+        <h3>Введите новый пароль и подтвердите его</h3>
+        <p>
+            {{ form.password.label }}<br>
+            {{ form.password(class="form-control") }}<br>
+            {% for error in form.password.errors %}
+        <div class="alert alert-danger" role="alert">
+            {{ error }}
+        </div>
+        {% endfor %}
+        </p>
+        <p>
+            {{ form.password2.label }}<br>
+            {{ form.password2(class="form-control") }}<br>
+            {% for error in form.password2.errors %}
+        <div class="alert alert-danger" role="alert">
+            {{ error }}
+        </div>
+        {% endfor %}
+        </p>
+        <p>{{ form.submit(type="submit", class="btn btn-primary") }}</p>
+        {% endif %}
+        {% if message != '' %}
+        <div class="alert alert-danger" role="alert">{{ message }}</div>
+        {% endif %}
+    </form>
+</div>
+{% endblock %}
\ No newline at end of file