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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Herman Andersen Dyrkorn
Salamander - API
Merge requests
!5
Resolve "user login and authentication"
Code
Review changes
Check out branch
Open in Workspace
Download
Patches
Plain diff
Expand sidebar
Merged
Resolve "user login and authentication"
4-user-login-and-authentication
into
master
Overview
0
Commits
3
Pipelines
0
Changes
1
Merged
Resolve "user login and authentication"
Herman Andersen Dyrkorn
requested to merge
4-user-login-and-authentication
into
master
Feb 10, 2021
Overview
0
Commits
3
Pipelines
0
Changes
1
Closes
#4 (closed)
Edited
Feb 10, 2021
by
Herman Andersen Dyrkorn
0
0
Merge request reports
Compare
master
version 2
1ab50668
Feb 10, 2021
version 1
3086e0b6
Feb 10, 2021
master (base)
and
version 1
latest version
cb7bc826
3 commits,
Feb 10, 2021
version 2
1ab50668
2 commits,
Feb 10, 2021
version 1
3086e0b6
1 commit,
Feb 10, 2021
1 file
+
20
−
12
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
src/main.py
+
20
−
12
View file @ 3086e0b6
Edit in single-file editor
Open in Web IDE
Show full file
@@ -2,19 +2,23 @@ from flask import Flask, request
from
flask_restful
import
Api
,
Resource
import
os.path
from
datetime
import
datetime
import
re
from
flask_bcrypt
import
Bcrypt
from
flask_sqlalchemy
import
SQLAlchemy
app
=
Flask
(
__name__
)
app
.
config
[
'
SQLALCHEMY_DATABASE_URI
'
]
=
'
sqlite:///database.db
'
db
=
SQLAlchemy
(
app
)
bcrypt
=
Bcrypt
(
app
)
api
=
Api
(
app
)
class
User
(
db
.
Model
):
id
=
db
.
Column
(
db
.
Integer
,
primary_key
=
True
,
autoincrement
=
True
)
name
=
db
.
Column
(
db
.
String
(
255
),
nullable
=
False
)
email
=
db
.
Column
(
db
.
String
(
255
),
nullable
=
False
)
email
=
db
.
Column
(
db
.
String
(
255
),
nullable
=
False
,
unique
=
True
)
pwd
=
db
.
Column
(
db
.
String
(
255
),
nullable
=
False
)
admin
=
db
.
Column
(
db
.
Boolean
,
nullable
=
False
,
default
=
False
)
accepted
=
db
.
Column
(
db
.
Boolean
,
nullable
=
False
,
default
=
False
)
@@ -91,19 +95,23 @@ class FindSalamanderInfo(Resource):
class
RegisterUser
(
Resource
):
@staticmethod
def
post
():
output
=
{
"
message
"
:
"
something went wrong
"
}
data
=
request
.
form
if
not
data
[
'
name
'
]
or
not
data
[
'
email
'
]
or
not
data
[
'
password
'
]
or
not
data
[
'
confirmPassword
'
]:
output
=
{
"
message
"
:
"
data is incorrect
"
}
else
:
if
data
[
'
name
'
]
or
data
[
'
email
'
]
or
data
[
'
password
'
]
or
data
[
'
confirmPassword
'
]:
if
data
[
'
password
'
]
==
data
[
'
confirmPassword
'
]:
user
=
User
(
name
=
data
[
'
name
'
],
email
=
data
[
'
email
'
],
pwd
=
data
[
'
password
'
])
db
.
session
.
add
(
user
)
db
.
session
.
commit
()
output
=
{
"
message
"
:
"
user added
"
}
email_regex
=
"
^[a-z0-9]+[\._]?[a-z0-9]+[@]\w+[.]\w{2,3}$
"
user
=
db
.
session
.
query
(
User
).
filter_by
(
email
=
data
[
'
email
'
]).
first
()
if
user
is
None
and
re
.
search
(
email_regex
,
data
[
'
email
'
]):
password_hash
=
bcrypt
.
generate_password_hash
(
data
[
'
password
'
])
new_user
=
User
(
name
=
data
[
'
name
'
],
email
=
data
[
'
email
'
],
pwd
=
password_hash
)
db
.
session
.
add
(
new_user
)
db
.
session
.
commit
()
output
=
{
"
message
"
:
"
new user created
"
}
else
:
output
=
{
"
message
"
:
"
invalid email
"
}
else
:
output
=
{
"
message
"
:
"
password does not match
"
}
else
:
output
=
{
"
message
"
:
"
wrong data posted
"
}
return
output
Loading