Skip to content

Commit 58a3e7e

Browse files
authored
Merge pull request #82 from LUS24/master
leospairani/cou-288-update-web-dev-course-code
2 parents 97004de + aae9573 commit 58a3e7e

File tree

6 files changed

+21
-17
lines changed

6 files changed

+21
-17
lines changed

curriculum/section13/lectures/03_logging_in_users/end/app/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,5 @@ def signup():
6060

6161

6262
@app.errorhandler(401)
63-
def auth_error():
63+
def auth_error(error):
6464
return "Not authorized"

curriculum/section13/lectures/04_encrypt_passwords_passlib/README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,10 @@ Instead, we need to use `pbkdf2_sha256.verify`:
9393
password = request.form.get("password")
9494

9595
- if users.get(email) == password:
96-
+ if pbkdf2_sha256.verify(password, users.get(email)):
97-
session["email"] = email
98-
return redirect(url_for("protected"))
96+
+ if email in users.keys():
97+
+ if pbkdf2_sha256.verify(password, users.get(email)):
98+
session["email"] = email
99+
return redirect(url_for("protected"))
99100
else:
100101
abort(401)
101102
return render_template("login.html")

curriculum/section13/lectures/04_encrypt_passwords_passlib/end/app/__init__.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,10 @@ def login():
3636
email = request.form.get("email")
3737
password = request.form.get("password")
3838

39-
if pbkdf2_sha256.verify(password, users.get(email)):
40-
session["email"] = email
41-
return redirect(url_for("protected"))
39+
if email in users.keys():
40+
if pbkdf2_sha256.verify(password, users.get(email)):
41+
session["email"] = email
42+
return redirect(url_for("protected"))
4243
else:
4344
abort(401)
4445
return render_template("login.html")
@@ -61,5 +62,5 @@ def signup():
6162

6263

6364
@app.errorhandler(401)
64-
def auth_error():
65+
def auth_error(error):
6566
return "Not authorized"

curriculum/section13/lectures/04_encrypt_passwords_passlib/start/app/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,5 @@ def signup():
6060

6161

6262
@app.errorhandler(401)
63-
def auth_error():
63+
def auth_error(error):
6464
return "Not authorized"

curriculum/section13/lectures/05_login_required_decorator/end/app/__init__.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,10 @@ def login():
4747
email = request.form.get("email")
4848
password = request.form.get("password")
4949

50-
if pbkdf2_sha256.verify(password, users.get(email)):
51-
session["email"] = email
52-
return redirect(url_for("protected"))
50+
if email in users.keys():
51+
if pbkdf2_sha256.verify(password, users.get(email)):
52+
session["email"] = email
53+
return redirect(url_for("protected"))
5354
else:
5455
abort(401)
5556
return render_template("login.html")
@@ -72,5 +73,5 @@ def signup():
7273

7374

7475
@app.errorhandler(401)
75-
def auth_error():
76+
def auth_error(error):
7677
return "Not authorized"

curriculum/section13/lectures/05_login_required_decorator/start/app/__init__.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,10 @@ def login():
3636
email = request.form.get("email")
3737
password = request.form.get("password")
3838

39-
if pbkdf2_sha256.verify(password, users.get(email)):
40-
session["email"] = email
41-
return redirect(url_for("protected"))
39+
if email in users.keys():
40+
if pbkdf2_sha256.verify(password, users.get(email)):
41+
session["email"] = email
42+
return redirect(url_for("protected"))
4243
else:
4344
abort(401)
4445
return render_template("login.html")
@@ -61,5 +62,5 @@ def signup():
6162

6263

6364
@app.errorhandler(401)
64-
def auth_error():
65+
def auth_error(error):
6566
return "Not authorized"

0 commit comments

Comments
 (0)