Skip to content
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

Bump fideslib to 3.0.1 and remove patch code #931

Merged
merged 4 commits into from
Jul 21, 2022
Merged

Bump fideslib to 3.0.1 and remove patch code #931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
44a8964
Bump fideslib to 3.0.1 and remove patch code
Jul 21, 2022
ebf21ac
Update CHANGELOG
Jul 21, 2022
5c8a395
Remove unused import
Jul 21, 2022
30057c4
Remove unused import
Jul 21, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ The types of changes are:
* Added a nested accordion component for displaying taxonomy data [#910](https://github.com/ethyca/fides/pull/910)
* Add lru cache to get_config [927](https://github.com/ethyca/fides/pull/927)
* Add user auth routes [929](https://github.com/ethyca/fides/pull/929)
* Bump fideslib to 3.0.1 and remove patch code[931](https://github.com/ethyca/fides/pull/931)

### Changed

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ deepdiff==5.8.0
fastapi==0.77.1
fastapi-pagination[sqlalchemy]==0.9.3
fideslang==1.1.0
fideslib==3.0.0
fideslib==3.0.1
fideslog==1.1.5
GitPython==3.1
loguru>=0.5,<0.6
Expand Down
5 changes: 1 addition & 4 deletions src/fidesctl/api/deps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from fideslib.exceptions import AuthenticationError, AuthorizationError
from fideslib.oauth.oauth_util import extract_payload, is_token_expired
from fideslib.oauth.schemas.oauth import OAuth2ClientCredentialsBearer
from fideslib.oauth.scopes import SCOPES, USER_PASSWORD_RESET
from fideslib.oauth.scopes import SCOPES
from sqlalchemy.orm import Session

from fidesctl.api.database.session import sync_session
Expand Down Expand Up @@ -74,9 +74,6 @@ async def verify_oauth_client( # pylint: disable=invalid-name
raise AuthorizationError(detail="Not Authorized for this action")

# scopes param is only used if client is root client, otherwise we use the client's associated scopes

# Temporary fix until https://github.com/ethyca/fideslib/issues/54 is resolved
SCOPES.append(USER_PASSWORD_RESET)
client = ClientDetail.get(db, object_id=client_id, config=config, scopes=SCOPES)

if not client:
Expand Down
8 changes: 1 addition & 7 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
)
from fideslib.models.client import ClientDetail
from fideslib.oauth.jwt import generate_jwe
from fideslib.oauth.scopes import PRIVACY_REQUEST_READ, SCOPES, USER_PASSWORD_RESET
from fideslib.oauth.scopes import PRIVACY_REQUEST_READ, SCOPES
from sqlalchemy.orm import Session
from sqlalchemy.orm.exc import ObjectDeletedError
from starlette.testclient import TestClient
Expand Down Expand Up @@ -285,9 +285,6 @@ def db() -> Generator:
def oauth_client(db: Session) -> Generator:
"""Return a client for authentication purposes."""

# Temporary fix until https://github.com/ethyca/fideslib/issues/54 is resolved
SCOPES.append(USER_PASSWORD_RESET)

client = ClientDetail(
hashed_secret="thisisatest",
salt="thisisstillatest",
Expand Down Expand Up @@ -339,9 +336,6 @@ def user(db: Session) -> Generator:
},
)

# Temporary fix until https://github.com/ethyca/fideslib/issues/54 is resolved
SCOPES.append(USER_PASSWORD_RESET)

client = ClientDetail(
hashed_secret="thisisatest",
salt="thisisstillatest",
Expand Down