Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
TDDD27_2019_codabify
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jennifer Lindgren
TDDD27_2019_codabify
Commits
33f68873
Commit
33f68873
authored
6 years ago
by
Jennifer Lindgren
Browse files
Options
Downloads
Patches
Plain Diff
Backend: Change password functionality
parent
1d9f1ee9
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
backend/app.py
+29
-28
29 additions, 28 deletions
backend/app.py
backend/database.py
+7
-2
7 additions, 2 deletions
backend/database.py
backend/db.sqlite
+0
-0
0 additions, 0 deletions
backend/db.sqlite
with
36 additions
and
30 deletions
backend/app.py
+
29
−
28
View file @
33f68873
...
@@ -133,6 +133,35 @@ def sign_in():
...
@@ -133,6 +133,35 @@ def sign_in():
'
message
'
:
message
'
message
'
:
message
}),
status
)
}),
status
)
@app.route
(
'
/api/change_password
'
,
methods
=
[
'
POST
'
,
'
PUT
'
])
@jwt_required
def
change_password
():
username
=
request
.
json
[
'
username
'
]
user
=
db
.
get_user_from_username
(
username
)
oldPassword
=
request
.
json
[
'
oldPassword
'
]
newPassword
=
request
.
json
[
'
newPassword
'
]
if
(
not
user
):
return
generate_response
(
jsonify
({
'
success
'
:
False
,
'
message
'
:
'
No user with that username
'
}),
BAD_REQUEST_STATUS_CODE
)
elif
not
is_valid_credentials
(
username
,
oldPassword
):
return
generate_response
(
jsonify
({
'
success
'
:
False
,
'
message
'
:
'
Old password was incorrect
'
}),
UNAUTHORIZED_STATUS_CODE
)
elif
(
not
is_valid_password
(
newPassword
)):
return
generate_response
(
jsonify
({
'
success
'
:
False
,
'
message
'
:
'
New password does not fulfill requirements
'
}),
BAD_REQUEST_STATUS_CODE
)
else
:
updated_user
=
db
.
change_password
(
username
,
flask_bcrypt
.
generate_password_hash
(
newPassword
).
decode
(
'
utf-8
'
)
)
return
generate_response
(
db
.
user_schema
.
jsonify
(
updated_user
),
OK_STATUS_CODE
)
@app.route
(
'
/api/user
'
,
methods
=
[
'
GET
'
])
@app.route
(
'
/api/user
'
,
methods
=
[
'
GET
'
])
@jwt_required
@jwt_required
def
get_users_request
():
def
get_users_request
():
...
@@ -145,34 +174,6 @@ def get_user_request(id):
...
@@ -145,34 +174,6 @@ def get_user_request(id):
return
generate_response
(
db
.
user_schema
.
jsonify
(
db
.
get_user
(
id
)),
return
generate_response
(
db
.
user_schema
.
jsonify
(
db
.
get_user
(
id
)),
OK_STATUS_CODE
)
OK_STATUS_CODE
)
@app.route
(
'
/api/user/<id>
'
,
methods
=
[
'
PUT
'
])
@jwt_required
def
update_user_request
(
id
):
email
=
request
.
json
[
'
email
'
]
username
=
request
.
json
[
'
username
'
]
password
=
request
.
json
[
'
password
'
]
if
(
email
!=
db
.
getEmailById
(
id
)
and
not
db
.
is_unregistered_email
(
email
)):
return
generate_response
(
jsonify
({
'
success
'
:
False
,
'
message
'
:
'
User with that email already exists
'
}),
CONFLICT_STATUS_CODE
)
elif
(
username
!=
db
.
get_username_by_id
(
id
)
and
not
db
.
is_unregistered_username
(
username
)):
return
generate_response
(
jsonify
({
'
success
'
:
False
,
'
message
'
:
'
User with that username already exists
'
}),
CONFLICT_STATUS_CODE
)
elif
(
not
is_valid_password
(
password
)):
return
generate_response
(
jsonify
({
'
success
'
:
False
,
'
message
'
:
'
Password does not fulfill requirements
'
}),
BAD_REQUEST_STATUS_CODE
)
else
:
updated_user
=
db
.
User
(
email
,
username
,
password
)
return
generate_response
(
db
.
user_schema
.
jsonify
(
db
.
update_user
(
id
,
updated_user
)),
OK_STATUS_CODE
)
@app.route
(
'
/api/user/<id>
'
,
methods
=
[
'
DELETE
'
])
@app.route
(
'
/api/user/<id>
'
,
methods
=
[
'
DELETE
'
])
@jwt_required
@jwt_required
def
delete_user_request
(
id
):
def
delete_user_request
(
id
):
...
...
This diff is collapsed.
Click to expand it.
backend/database.py
+
7
−
2
View file @
33f68873
...
@@ -76,8 +76,7 @@ def get_user_from_username(username):
...
@@ -76,8 +76,7 @@ def get_user_from_username(username):
return
User
.
query
.
filter_by
(
username
=
username
).
first
()
return
User
.
query
.
filter_by
(
username
=
username
).
first
()
def
get_username_from_email
(
email
):
def
get_username_from_email
(
email
):
user
=
User
.
query
.
filter_by
(
email
=
email
).
first
()
return
get_user_from_email
(
email
).
username
return
user
.
username
def
is_valid_email_password
(
email
,
password
):
def
is_valid_email_password
(
email
,
password
):
user
=
get_user_from_email
(
email
)
user
=
get_user_from_email
(
email
)
...
@@ -88,3 +87,9 @@ def is_valid_username_password(username, password):
...
@@ -88,3 +87,9 @@ def is_valid_username_password(username, password):
user
=
get_user_from_username
(
username
)
user
=
get_user_from_username
(
username
)
valid_password
=
user
.
password
if
user
else
None
valid_password
=
user
.
password
if
user
else
None
return
password
!=
None
and
password
==
valid_password
return
password
!=
None
and
password
==
valid_password
def
change_password
(
username
,
newPassword
):
user
=
get_user_from_username
(
username
)
user
.
password
=
newPassword
db
.
session
.
commit
()
return
user
This diff is collapsed.
Click to expand it.
backend/db.sqlite
+
0
−
0
View file @
33f68873
No preview for this file type
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment