Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Salamander - API
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Herman Andersen Dyrkorn
Salamander - API
Merge requests
!28
Resolve "change password"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve "change password"
25-change-password
into
master
Overview
0
Commits
1
Pipelines
0
Changes
1
Merged
Herman Andersen Dyrkorn
requested to merge
25-change-password
into
master
4 years ago
Overview
0
Commits
1
Pipelines
0
Changes
1
Expand
Closes
#25 (closed)
Edited
4 years ago
by
Herman Andersen Dyrkorn
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
bc31834e
1 commit,
4 years ago
1 file
+
10
−
3
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
api/endpoints/user.py
+
10
−
3
Options
@@ -17,7 +17,7 @@ class UserEndpoint(Resource):
user
=
db
.
session
.
query
(
User
).
filter_by
(
email
=
data
[
'
email
'
].
lower
()).
first
()
if
not
user
and
re
.
search
(
EMAIL_REGEX
,
data
[
'
email
'
].
lower
()):
password_hash
=
bcrypt
.
generate_password_hash
(
data
[
'
password
'
])
new_user
=
User
(
name
=
data
[
'
name
'
]
.
lower
()
,
email
=
data
[
'
email
'
].
lower
(),
pwd
=
password_hash
)
new_user
=
User
(
name
=
data
[
'
name
'
],
email
=
data
[
'
email
'
].
lower
(),
pwd
=
password_hash
)
db
.
session
.
add
(
new_user
)
db
.
session
.
commit
()
return
jsonify
({
"
message
"
:
"
new user created
"
,
'
status
'
:
200
})
@@ -26,7 +26,7 @@ class UserEndpoint(Resource):
else
:
return
jsonify
({
"
message
"
:
"
password does not match
"
,
'
status
'
:
400
})
else
:
return
jsonify
({
"
message
"
:
"
wrong data posted
"
,
'
status
'
:
2
00
})
return
jsonify
({
"
message
"
:
"
wrong data posted
"
,
'
status
'
:
4
00
})
@staticmethod
@jwt_required
@@ -62,7 +62,14 @@ class UserEndpoint(Resource):
db
.
session
.
commit
()
return
jsonify
({
"
message
"
:
"
email was updated
"
,
"
status
"
:
200
})
if
'
newPassword
'
in
data
and
'
confirmNewPassword
'
in
data
:
if
data
[
'
newPassword
'
]
==
data
[
'
confirmNewPassword
'
]:
password_hash
=
bcrypt
.
generate_password_hash
(
data
[
'
newPassword
'
])
user
.
pwd
=
password_hash
db
.
session
.
commit
()
return
jsonify
({
"
message
"
:
"
email was updated
"
,
"
status
"
:
200
})
else
:
return
jsonify
({
"
message
"
:
"
this user does not exist
"
,
"
status
"
:
2
00
})
return
jsonify
({
"
message
"
:
"
this user does not exist
"
,
"
status
"
:
4
00
})
Loading