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.

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

[Backend] Add Cookies and Surface with Privacy Notices #3572

Merged
merged 28 commits into from
Jun 21, 2023
Merged
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
22cd8aa
Initial commit - add a Cookies table with FK's to PrivacyDeclaration …
pattisdr Jun 14, 2023
bb4282d
Add optional path and domain to Cookies and allow upsert_cookies to u…
pattisdr Jun 15, 2023
29e2a2d
Surface relevant cookies on privacy notices by data use.
pattisdr Jun 15, 2023
f4a6936
Update fideslang version which removes cookies from System request, a…
pattisdr Jun 15, 2023
f5cca57
Remove the index from path and domain.
pattisdr Jun 15, 2023
1e8247c
Merge branch 'main' into fides_3478_system_cookies
pattisdr Jun 15, 2023
c510d1d
Merge main:
pattisdr Jun 16, 2023
561290e
Try to make tests more predictable.
pattisdr Jun 16, 2023
df5a462
Update changelog.
pattisdr Jun 16, 2023
a5b9125
Merge branch 'main' into fides_3478_system_cookies
pattisdr Jun 19, 2023
04ce44a
Add missing fixture.
pattisdr Jun 19, 2023
399ec19
Merge main, conflicts:
pattisdr Jun 20, 2023
9911bf2
Bump fides lang commit to see if organization relationship key findin…
pattisdr Jun 20, 2023
ba64204
Make history tests more reliable - there's no guarantee that these ar…
pattisdr Jun 20, 2023
47010a9
Bump fideslang commit
pattisdr Jun 20, 2023
3ee9f3a
fix: bump fideslang version for testing
ThomasLaPiana Jun 21, 2023
e134836
Merge branch 'main' into fides_3478_system_cookies
ThomasLaPiana Jun 21, 2023
805393e
fix: pin pydantic to a new version supported by fideslang
ThomasLaPiana Jun 21, 2023
02ac533
Merge main, conflicts:
pattisdr Jun 21, 2023
f597094
Try sorting declarations for repeatability in tests.
pattisdr Jun 21, 2023
c8493db
Data use cookie field (#3571)
allisonking Jun 21, 2023
2720914
`fides-js` and privacy center cookie enforcement (#3569)
allisonking Jun 21, 2023
a879831
More attempts to improve reliability of cookie tests
pattisdr Jun 21, 2023
16d9355
Fix new mypy errors.
pattisdr Jun 21, 2023
9e0bb35
Bump fideslang to 1.4.2.
pattisdr Jun 21, 2023
d9988ef
Merge branch 'main' into fides_3478_system_cookies
pattisdr Jun 21, 2023
478a951
Merge branch 'main' into fides_3478_system_cookies
pattisdr Jun 21, 2023
d283aab
Classmethod placement was preventing validator from running.
pattisdr Jun 21, 2023
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
Prev Previous commit
Next Next commit
Merge main, conflicts:
src/fides/api/api/v1/endpoints/dataset_endpoints.py
src/fides/api/models/datasetconfig.py
src/fides/api/util/data_category.py
  • Loading branch information
pattisdr committed Jun 20, 2023
commit 399ec194e7cc7e01a13f2ee53bbdd451b22d2d00
4 changes: 1 addition & 3 deletions src/fides/api/api/v1/endpoints/dataset_endpoints.py
Original file line number Diff line number Diff line change
@@ -52,9 +52,7 @@
convert_dataset_to_graph,
to_graph_field,
)
from fides.api.models.sql_models import (
Dataset as CtlDataset, # type: ignore[attr-defined]
)
from fides.api.models.sql_models import Dataset as CtlDataset # type: ignore[attr-defined]
from fides.api.oauth.utils import verify_oauth_client
from fides.api.schemas.api import BulkUpdateFailed
from fides.api.schemas.dataset import (
5 changes: 2 additions & 3 deletions src/fides/api/models/datasetconfig.py
Original file line number Diff line number Diff line change
@@ -19,9 +19,8 @@
)
from fides.api.graph.data_type import parse_data_type_string
from fides.api.models.connectionconfig import ConnectionConfig, ConnectionType
from fides.api.models.sql_models import (
Dataset as CtlDataset, # type: ignore[attr-defined]
)
from fides.api.models.sql_models import Dataset as CtlDataset # type: ignore[attr-defined]

from fides.api.util.saas_util import merge_datasets


4 changes: 1 addition & 3 deletions src/fides/api/util/data_category.py
Original file line number Diff line number Diff line change
@@ -6,9 +6,7 @@
from sqlalchemy.orm import Session

from fides.api import common_exceptions
from fides.api.models.sql_models import (
DataCategory as DataCategoryDbModel, # type: ignore[attr-defined]
)
from fides.api.models.sql_models import DataCategory as DataCategoryDbModel # type: ignore[attr-defined]


def generate_fides_data_categories() -> Type[EnumType]:
You are viewing a condensed version of this merge commit. You can view the full changes here.