Skip to content

A few updates #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LUS24 wants to merge 12 commits into
base: master
Choose a base branch
from
Open

A few updates #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fd71017
Updated python version to 3.9.10
LUS24 Feb 8, 2022
580022e
Added correct uri for Heroku when using latest SQLAlchemy versions
LUS24 Feb 8, 2022
aeb8e8c
Testing on python 3.10
LUS24 Apr 10, 2022
cdb9d32
Rollback to python 3.9
LUS24 Apr 10, 2022
0f26509
Update runtime.txt
LUS24 Apr 10, 2022
47228e0
Updated to hmac compare_digest
LUS24 Apr 10, 2022
0b54ab0
Testing python 3.10
LUS24 Apr 10, 2022
dbe22ea
Rollback to python 3.9
LUS24 Apr 10, 2022
4d50db4
Removed unnecesary code
LUS24 Apr 10, 2022
541b65c
Merge branch 'master' of https://github.com/LUS24/stores-rest-api
LUS24 Apr 10, 2022
2652b7f
Added db uri
LUS24 Apr 10, 2022
3cbdda1
Added code to solve sqlalchemy.exc.NoSuchModuleError
LUS24 Apr 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@

app.config['DEBUG'] = True

app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('DATABASE_URL', 'sqlite:///data.db')
uri = os.environ.get('DATABASE_URL', 'sqlite:///data.db')
if uri.startswith("postgres://"):
uri = uri.replace("postgres://", "postgresql://", 1)

app.config['SQLALCHEMY_DATABASE_URI'] = uri
app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
app.secret_key = 'jose'
api = Api(app)
Expand Down
2 changes: 1 addition & 1 deletion runtime.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
python-3.7.5
python-3.9.12
4 changes: 2 additions & 2 deletions security.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from werkzeug.security import safe_str_cmp
from hmac import compare_digest
from models.user import UserModel

def authenticate(username, password):
user = UserModel.find_by_username(username)
if user and safe_str_cmp(user.password, password):
if user and compare_digest(user.password, password):
return user

def identity(payload):
Expand Down