diff --git a/mo/web/acct.py b/mo/web/acct.py index 01f001ccf312095c8a03110a726d19ad2782e9e3..af3f33d3f0688d7ba4d8266217c49c2dad321b23 100644 --- a/mo/web/acct.py +++ b/mo/web/acct.py @@ -523,9 +523,7 @@ class Reg2: mo.users.set_password(user, passwd) mo.users.login(user) - rr.used_at = mo.now - - sess.commit() + self.spend_request_and_commit() self.user = user return True @@ -551,8 +549,7 @@ class Reg2: }, ) - self.rr.used_at = mo.now - sess.commit() + self.spend_request_and_commit() return True def change_passwd(self, new_passwd: str): @@ -562,11 +559,9 @@ class Reg2: app.logger.info(f'Reg2: Uživatel #{user.user_id} si resetoval heslo') mo.users.set_password(user, new_passwd, reset=True) mo.users.login(user) + self.spend_request_and_commit() - self.rr.used_at = mo.now - sess.commit() - - def spend_request(self): + def spend_request_and_commit(self): self.rr.used_at = mo.now db.get_session().commit() @@ -585,7 +580,7 @@ class Reg2Form(FlaskForm): submit = wtforms.SubmitField('Vytvořit účet') -# URL je explicitně uvedeno v mo.email.activate_url +# URL je explicitně uvedeno v mo.email.confirm_url @app.route('/acct/confirm/r', methods=('GET', 'POST')) def confirm_reg(): token = request.args.get('token') @@ -617,7 +612,7 @@ class ConfirmEmailForm(FlaskForm): cancel = wtforms.SubmitField('Zrušit požadavek') -# URL je explicitně uvedeno v mo.email.activate_url +# URL je explicitně uvedeno v mo.email.confirm_url @app.route('/acct/confirm/e', methods=('GET', 'POST')) def confirm_email(): reg2 = Reg2(request.args.get('token'), db.RegReqType.change_email) @@ -632,7 +627,7 @@ def confirm_email(): flash('E-mail změněn.', 'success') return redirect(url_for('user_settings')) elif form.cancel.data: - reg2.spend_request() + reg2.spend_request_and_commit() flash('Požadavek na změnu e-mailu zrušen.', 'success') return redirect(url_for('user_settings')) @@ -647,7 +642,7 @@ class CancelResetForm(FlaskForm): cancel = wtforms.SubmitField('Zrušit obnovu hesla') -# URL je explicitně uvedeno v mo.email.activate_url +# URL je explicitně uvedeno v mo.email.confirm_url @app.route('/acct/confirm/p', methods=('GET', 'POST')) def confirm_reset(): reg2 = Reg2(request.args.get('token'), db.RegReqType.reset_passwd) @@ -662,7 +657,7 @@ def confirm_reset(): cform = CancelResetForm() if cform.validate_on_submit() and cform.cancel.data: - reg2.spend_request() + reg2.spend_request_and_commit() flash('Požadavek na změnu hesla zrušen.', 'success') return redirect(url_for('user_settings'))