Skip to content

Commit

Permalink
Merge branch 'dev' into fix-measurement
Browse files Browse the repository at this point in the history
  • Loading branch information
Seburan authored Dec 5, 2023
2 parents 24cc361 + 4e23445 commit 6ca81a4
Show file tree
Hide file tree
Showing 22 changed files with 6,539 additions and 3,868 deletions.
14 changes: 9 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
# Changelog

## v1.x.x (2023/xx/xx)
## v1.2 (2023/11/16)

#### Enhancements

- Home Site : upgrade CMS to [Docusaurus v3](https://docusaurus.io/blog/releases/3.0)
- DSP Site : serve attestation file version2 on privacy-sandbox-demos-dsp.dev
- SSP Site : serve attestation file version2 on privacy-sandbox-demos-ssp.dev
- CI/CD : Cloud Build copies the attestation files from cicd/attestations to dsp/ssp services for the target environment
- Update deployment documentation with instructions related to enrollment and attestation
- Use Case : Single-touch conversion Attribution. Move attribution code from SSP to DSP and update documentation
- Tools : Add [Aggregatable Report Converter](https://github.com/privacysandbox/privacy-sandbox-demos/tree/main/tools/aggregatable_report_converter) to the tooling codebase. This tool helps developers to create debug aggregatable reports that can be used for Local Testing and AWS Aggregation Service testing
- GitHub documentation : Add a changelog.
- Tools : Add [Aggregatable Report Converter](https://github.com/privacysandbox/privacy-sandbox-demos/tree/main/tools/aggregatable_report_converter) to the tooling codebase. This tool helps developers to create debug aggregatable reports that can be used for Local Testing and AWS Aggregation Service testing.
- GitHub documentation : Add a changelog

#### Bug Fixes

Expand All @@ -20,8 +24,8 @@
- Shop site : refactor service using expressJS (from nextJS)
- Shop site : fix issue with Firebase filtering session cookies
- DSP Site : attestation file is served from privacy-sandbox-demos-dsp.dev
- Use Case : remarketing. Move `renderURL` from the SSP codebase to the DSP codebase
- Use Case : VAST Video Protected Audience. Release v1
- Use Case : remarketing. Move `renderURL` from the SSP codebase to the DSP codebase.
- Use Case : VAST Video Protected Audience. Release v1.

#### Bug Fixes

Expand Down
41 changes: 41 additions & 0 deletions cicd/attestations/privacy-sandbox-attestations.json.dsp.dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"privacy_sandbox_api_attestations": [
{
"attestation_parser_version": "2",
"attestation_version": "1",
"privacy_policy": [
"https://policies.google.com/privacy"
],
"ownership_token": "nTnUCtbPyTd5O9ev8OlcTRRGz02BYKf2qXRbZ3baiwZy5Pqsss5wOiu6Fi6lv6nT",
"issued_seconds_since_epoch": 1698941188,
"enrollment_id": "Z7XX7",
"enrollment_site": "https://privacy-sandcastle-dev-dsp.web.app/",
"platform_attestations": [
{
"platform": "chrome",
"attestations": {
"attribution_reporting_api": {
"ServiceNotUsedForIdentifyingUserAcrossSites": true
},
"shared_storage_api": {
"ServiceNotUsedForIdentifyingUserAcrossSites": true
},
"private_aggregation_api": {
"ServiceNotUsedForIdentifyingUserAcrossSites": true
},
"topics_api": {
"ServiceNotUsedForIdentifyingUserAcrossSites": true
},
"protected_audience_api": {
"ServiceNotUsedForIdentifyingUserAcrossSites": true
}
}
},
{
"platform": "android",
"attestations": {}
}
]
}
]
}
78 changes: 78 additions & 0 deletions cicd/attestations/privacy-sandbox-attestations.json.dsp.prod
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
{
"privacy_sandbox_api_attestations": [
{
"attestation_parser_version": "2",
"attestation_version": "2",
"privacy_policy": [
"https://policies.google.com/privacy"
],
"ownership_token": "SGYvJieJb5EaxhMAJUh9qmrfZNSQewLYbHWx6NpeRzDLZSF0DwfVfchu5sHCxaFv",
"issued_seconds_since_epoch": 1697505143,
"enrollment_id": "UNRJE",
"enrollment_site": "https://privacy-sandbox-demos-dsp.dev",
"platform_attestations": [
{
"platform": "chrome",
"attestations": {
"attribution_reporting_api": {
"ServiceNotUsedForIdentifyingUserAcrossSites": true
},
"shared_storage_api": {
"ServiceNotUsedForIdentifyingUserAcrossSites": true
},
"private_aggregation_api": {
"ServiceNotUsedForIdentifyingUserAcrossSites": true
},
"topics_api": {
"ServiceNotUsedForIdentifyingUserAcrossSites": true
},
"protected_audience_api": {
"ServiceNotUsedForIdentifyingUserAcrossSites": true
}
}
},
{
"platform": "android",
"attestations": {}
}
]
},
{
"attestation_parser_version": "1",
"attestation_version": "1",
"privacy_policy": [
"https://policies.google.com/privacy"
],
"ownership_token": "yE67UyEyxUmBsz0y0hyeiU44CnbliMjMS93fnBgeb8Jlst1YbwYXAE5ucVige0eX",
"issued_seconds_since_epoch": 1691175921,
"expiry_seconds_since_epoch": 1706731521,
"enrollment_id": "UNRJE",
"platform_attestations": [
{
"platform": "chrome",
"attestations": {
"attribution_reporting_api": {
"ServiceNotUsedForReidentification": true
},
"shared_storage_api": {
"ServiceNotUsedForReidentification": true
},
"private_aggregation_api": {
"ServiceNotUsedForReidentification": true
},
"topics_api": {
"ServiceNotUsedForReidentification": true
},
"protected_audience_api": {
"ServiceNotUsedForReidentification": true
}
}
},
{
"platform": "android",
"attestations": {}
}
]
}
]
}
41 changes: 41 additions & 0 deletions cicd/attestations/privacy-sandbox-attestations.json.ssp.dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"privacy_sandbox_api_attestations": [
{
"attestation_parser_version": "2",
"attestation_version": "1",
"privacy_policy": [
"https://policies.google.com/privacy"
],
"ownership_token": "uNqxzzSkFmSw0tFTnaV2FDl4Ltd0SpOLxI3UMbDhklwBGFQJ8AsQ3XqFqzj8j3ev",
"issued_seconds_since_epoch": 1698941002,
"enrollment_id": "VV8GR",
"enrollment_site": "https://privacy-sandcastle-dev-ssp.web.app/",
"platform_attestations": [
{
"platform": "chrome",
"attestations": {
"attribution_reporting_api": {
"ServiceNotUsedForIdentifyingUserAcrossSites": true
},
"shared_storage_api": {
"ServiceNotUsedForIdentifyingUserAcrossSites": true
},
"private_aggregation_api": {
"ServiceNotUsedForIdentifyingUserAcrossSites": true
},
"topics_api": {
"ServiceNotUsedForIdentifyingUserAcrossSites": true
},
"protected_audience_api": {
"ServiceNotUsedForIdentifyingUserAcrossSites": true
}
}
},
{
"platform": "android",
"attestations": {}
}
]
}
]
}
41 changes: 41 additions & 0 deletions cicd/attestations/privacy-sandbox-attestations.json.ssp.prod
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"privacy_sandbox_api_attestations": [
{
"attestation_parser_version": "2",
"attestation_version": "1",
"privacy_policy": [
"https://policies.google.com/privacy"
],
"ownership_token": "Dxf5IH5uGemQA0fyXTsOyiC0lWWtJXpSgA4S0KeUwtpWreWb9vbzeLx6LTuwCNzh",
"issued_seconds_since_epoch": 1698941376,
"enrollment_id": "EQPDM",
"enrollment_site": "https://privacy-sandbox-demos-ssp.dev/",
"platform_attestations": [
{
"platform": "chrome",
"attestations": {
"attribution_reporting_api": {
"ServiceNotUsedForIdentifyingUserAcrossSites": true
},
"shared_storage_api": {
"ServiceNotUsedForIdentifyingUserAcrossSites": true
},
"private_aggregation_api": {
"ServiceNotUsedForIdentifyingUserAcrossSites": true
},
"topics_api": {
"ServiceNotUsedForIdentifyingUserAcrossSites": true
},
"protected_audience_api": {
"ServiceNotUsedForIdentifyingUserAcrossSites": true
}
}
},
{
"platform": "android",
"attestations": {}
}
]
}
]
}
Loading

0 comments on commit 6ca81a4

Please sign in to comment.