fix wrong password auth error and check pin on edit

bergpb · May 20, 2020 · 7fee893 · 7fee893
1 parent a867637
commit 7fee893
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 8 deletions.
diff --git a/lisapi/auth/views.py b/lisapi/auth/views.py
@@ -8,18 +8,21 @@
 
 @auth.route('/login', methods=['GET', 'POST'])
 def login():
+    if current_user.is_authenticated:
+        return redirect(url_for('main.dashboard'))
+
     form_login = Login()
+
     if form_login.validate_on_submit():
         user = User.query.filter_by(username=form_login.username.data).first()
-        password = form_login.password.data
 
-        if user.check_password(password):
-            login_user(user, remember=form_login.remember_me.data)
-            flash('Logged in.', 'success')
-            return redirect(url_for('main.dashboard'))
+        if not user or not user.check_password(form_login.password.data):
+            flash('Invalid credentials!', 'error')
+            return render_template('auth/login.html', form=form_login)
 
-        flash('Invalid login!', 'error')
-        return render_template('auth/login.html', form=form_login)
+        login_user(user, remember=form_login.remember_me.data)
+        flash('Logged in.', 'success')
+        return redirect(url_for('main.dashboard'))
 
     if len(form_login.errors) > 0:
         flash('Check form data!', 'error')

diff --git a/lisapi/pin/views.py b/lisapi/pin/views.py
@@ -16,7 +16,7 @@ def create_pin():
         pin_number = int(form_new_pin.pin.data)
         pin_color = form_new_pin.color.data
         pin_icon = form_new_pin.icon.data
-        check_pin = helpers.checkPin(pin_number)    
+        check_pin = helpers.checkPin(pin_number)
         pin_exists = Pin.query.filter_by(pin=pin_number).first()
         if not check_pin:
             flash('Pin {} dont exists!'.format(pin_number), 'error')
@@ -63,6 +63,17 @@ def edit_pin(pin_id):
     form_editpin = EditPin()
     if request.method == 'POST':
         if form_editpin.validate_on_submit():
+            pin_number = int(form_editpin.pin.data)
+            check_pin = helpers.checkPin(pin_number)
+            pin_exists = Pin.query.filter_by(pin=pin_number).first()
+
+            if not check_pin:
+                flash('Pin {} dont exists!'.format(pin_number), 'error')
+                return render_template('pin/new.html', form=form_editpin)
+            elif pin_exists:
+                flash('Pin {} not disponible!'.format(pin_number), 'error')
+                return render_template('pin/new.html', form=form_editpin)
+
             pin = Pin.query.get(pin_id)
             pin.name = form_editpin.name.data
             pin.pin = form_editpin.pin.data