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

Release dev to main #157

Merged
merged 97 commits into from
Oct 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
b8ab5c2
[dsp] cleanup dsp
JackJey Jul 1, 2023
4806000
[ssp] cleanup ssp
JackJey Jul 1, 2023
28771db
Merge pull request #49 from privacysandbox/progressive
Seburan Jul 14, 2023
9b5dd66
add topics services
cucuandreea Jul 20, 2023
faa277c
Merge pull request #62 from privacysandbox/main
Seburan Jul 21, 2023
e552e97
Merge pull request #61 from cucuandreea/use-case-topics-2
Seburan Jul 21, 2023
a509b5c
.env file for dev environment
Seburan Jul 21, 2023
6a02ee4
Merge pull request #63 from Seburan/dev
Seburan Jul 21, 2023
e407f2b
Update topics service - add TOPICS_SERVER_HOST via param
cucuandreea Jul 21, 2023
5110168
Merge pull request #64 from cucuandreea/use-case-topics-2
cucuandreea Jul 21, 2023
7bcd774
Update topics-server repsponse headers; Update topics page;
cucuandreea Jul 24, 2023
8e4a2b3
remove '.env copy' file; Ran npm run fmt
cucuandreea Jul 25, 2023
8a20175
Merge branch 'dev' into use-case-topics-2
cucuandreea Jul 25, 2023
61f2d21
Fix: address PR comments
cucuandreea Jul 26, 2023
0f81dcd
Update topic services
cucuandreea Jul 26, 2023
5f18745
Fix topics service
cucuandreea Jul 26, 2023
f481dbf
npm run fmt
cucuandreea Jul 26, 2023
59f8113
Format script code
cucuandreea Jul 27, 2023
4741f05
Merge pull request #75 from cucuandreea/use-case-topics-2
JackJey Jul 27, 2023
64090d0
[.env] restore correct OT for ssp and dsp
Seburan Aug 2, 2023
e5246f4
Merge pull request #84 from Seburan/usecase-topics
Seburan Aug 2, 2023
4f3469d
[CI/CD] setup Cloud Build
Seburan Aug 4, 2023
d993b00
[CI/CD] move cloudbuild.yaml to cicd folder
Seburan Aug 4, 2023
009e23a
Merge pull request #85 from Seburan/cloud-build-deploy
Seburan Aug 4, 2023
a2a0ba1
[CI/CD] build html files with Cloud Build
Seburan Aug 4, 2023
4674b2e
Merge pull request #86 from Seburan/cloud-build-deploy
Seburan Aug 4, 2023
1b6b9cb
Proof-of-concept video ad demo
sidsahoo-google Aug 11, 2023
4493c19
temp
siddharth-sahoo Aug 13, 2023
47757e9
Clean up and add comments.
siddharth-sahoo Aug 12, 2023
33e9b1e
Merge branch 'video-ad-clean' into video-ad
siddharth-sahoo Aug 13, 2023
3021121
Move adType flag to server side
siddharth-sahoo Aug 13, 2023
ebb393d
Fix gitignore and tsconfig ignore.
siddharth-sahoo Aug 13, 2023
36b17d4
[shop] cleanup
JackJey Jul 24, 2023
a4b1cc2
[shop] revert
JackJey Aug 22, 2023
8f5d923
[shop] ncu -u
JackJey Aug 22, 2023
bb3a721
[shop] update docker
JackJey Aug 22, 2023
87ba951
Merge pull request #114 from privacysandbox/fix-shop
Seburan Aug 23, 2023
ad727de
[shop] fix ts error
JackJey Aug 23, 2023
b5629c9
Merge pull request #115 from privacysandbox/fix-shop2
Seburan Aug 24, 2023
f137dd7
Merge pull request #98 from siddharth-sahoo/video-ad
Seburan Aug 25, 2023
0d87585
[shop] replace to express
JackJey Sep 4, 2023
d75f3ec
[npm] force removing all docker volumes
JackJey Sep 4, 2023
d145044
Merge pull request #132 from privacysandbox/shop-express
JackJey Sep 4, 2023
9b040b3
[shop] recommit js
JackJey Sep 5, 2023
8a443a9
[shop] replace tag host
JackJey Sep 5, 2023
674269a
[shop] remove fixed url
JackJey Sep 5, 2023
4c4b0a9
[shop] replace session store by file store
Seburan Sep 5, 2023
1e06cfd
[shop] replace session store by file store
Seburan Sep 5, 2023
be2fe5c
[shop] session management for firebase/cloudrun
Seburan Sep 6, 2023
b64de28
[shop] set session affinity on CloudRun
Seburan Sep 6, 2023
4fd14d4
[shop] run fmt on modified files
Seburan Sep 6, 2023
419875b
Merge pull request #133 from Seburan/shop-fix-sessions-for-cloudrun
Seburan Sep 6, 2023
3ef29a9
[cicd] fix node version for build pipeline
Seburan Sep 8, 2023
eea6460
Merge pull request #134 from Seburan/fix-cloudbuild-nodejs
Seburan Sep 8, 2023
dc4f469
[cicd] fix node version for build pipeline
Seburan Sep 14, 2023
22a0f49
Merge pull request #136 from Seburan/dev
Seburan Sep 14, 2023
939dd49
Merge pull request #135 from privacysandbox/video-ad
Seburan Sep 14, 2023
acbed5b
[home] fix use case demo documentation
Seburan Sep 14, 2023
fa6d294
[shop] fix route to "/ads" to fetch creative
Seburan Sep 15, 2023
6b61ae7
[home] fix use case demo doc for remarketing
Seburan Sep 28, 2023
596dd80
[ssp] update ARA register source
Seburan Sep 29, 2023
8704324
run fmt
Seburan Sep 29, 2023
6073598
[ssp] fix registering attribution sources
Seburan Sep 29, 2023
b479aa6
fix npm run clean
Seburan Sep 29, 2023
2a8b64f
[ssp] fix typo in the ads rendering template
Seburan Oct 3, 2023
af8b7eb
[home] Fix documentation for use case
Seburan Oct 3, 2023
cd28aba
Merge pull request #138 from Seburan/fix-shop-ads
Seburan Oct 3, 2023
5fa52db
[dsp] add attestation file
Seburan Oct 4, 2023
8593187
[home] remove work-in-progress topics demo
Seburan Oct 4, 2023
17aef65
[home] update permalinks on use case doc
Seburan Oct 4, 2023
bec6f54
Add Private Aggregation Reporting for News Site
maybellineboon Oct 4, 2023
b5170c0
[github] update dependabot config file
Seburan Oct 4, 2023
9b6656b
Merge pull request #156 from Seburan/enrollment
Seburan Oct 4, 2023
b33e6f3
Merge branch 'main' into dev
Seburan Oct 5, 2023
06cd30d
[ssp] fix security alert on external links
Seburan Oct 5, 2023
e332615
[ssp][dsp] moved renderUrl from SSP to DSP
Seburan Oct 5, 2023
aa76e86
update hard coded url and port
maybellineboon Oct 7, 2023
87c8140
add DSP_HOST to render site
maybellineboon Oct 7, 2023
e89aa13
update index.ejs with variables for DSP and port
maybellineboon Oct 10, 2023
a6cd489
Merge pull request #155 from privacysandbox/use-case-private-aggregation
Seburan Oct 10, 2023
8d50101
[home] add video ad use case doc
Seburan Oct 10, 2023
b5bfbfc
Merge pull request #162 from Seburan/videoad
Seburan Oct 10, 2023
b618eb4
Update index.md
nberg79 Oct 10, 2023
ffb21ef
Fix category name intro.md
nberg79 Oct 10, 2023
309ae70
Update vast-video-protected-audience.md
nberg79 Oct 10, 2023
f0c3f87
Merge pull request #163 from nberg79/patch-1
Seburan Oct 11, 2023
bd1272d
[home] fix vast video doc
Seburan Oct 11, 2023
db1a586
Update vast-video-protected-audience.md
nberg79 Oct 11, 2023
03620e6
Update vast-video-protected-audience.md
nberg79 Oct 11, 2023
05c4984
Merge pull request #164 from Seburan/fix-videoad
Seburan Oct 12, 2023
d13da79
Merge branch 'dev' into patch-2
Seburan Oct 12, 2023
d381f3c
Merge pull request #166 from nberg79/patch-2
Seburan Oct 12, 2023
350a1a1
Merge pull request #158 from Seburan/fix-codeql
Seburan Oct 13, 2023
2da9f8c
[github] update readme and deployment guide
Seburan Oct 13, 2023
d913e37
Merge pull request #167 from Seburan/fix-github-readme
Seburan Oct 13, 2023
b7d6bca
[home] fix docs links to dev environments
Seburan Oct 13, 2023
9f83e18
Merge pull request #168 from Seburan/fix-doc
Seburan Oct 13, 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
13 changes: 12 additions & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ EXTERNAL_PORT=443
PORT=8080

# list of service names
SERVICES=("home" "news" "shop" "travel" "dsp" "ssp" "idp")
SERVICES=("home" "news" "shop" "travel" "dsp" "ssp" "idp" "topics" "topics-server")

# home
HOME_HOST=privacy-sandbox-demos-home.dev
Expand Down Expand Up @@ -52,3 +52,14 @@ COLLECTOR_DETAIL="Collect, transform and batch Aggregatable Reports produced by
IDP_HOST=privacy-sandbox-demos-idp.dev
IDP_TOKEN=""
IDP_DETAIL="Identity Provider for relying parties. Also Issuing Private State Token"

## Topics related
## site to observe topics
TOPICS_MOTO_HOST=motorcycles.privacy-sandbox-demos-news.dev
TOPICS_SOCCER_HOST=soccer.privacy-sandbox-demos-news.dev
TOPICS_GARDENING_HOST=gardening.privacy-sandbox-demos-news.dev
TOPICS_DETAIL="Topics page"

## server to request topics with headers
TOPICS_SERVER_HOST=topics-server.privacy-sandbox-demos-news.dev
TOPICS_SERVER_DETAIL="Topics server"
3 changes: 2 additions & 1 deletion .gcloudignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ services/home/.docusaurus
services/shop/.next

# include services/home/build/* files into `gcloud builds submit` command
!services/home/build
# DEPRECATED as we now build html files with ci/cd
# !services/home/build
24 changes: 13 additions & 11 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

title: ""
labels: ""
assignees: ""
---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
Expand All @@ -24,15 +24,17 @@ A clear and concise description of what you expected to happen.
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
7 changes: 3 additions & 4 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

title: ""
labels: ""
assignees: ""
---

**Is your feature request related to a problem? Please describe.**
Expand Down
3 changes: 0 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,10 @@

Please describe a summary of the changes.



## Related Issue

- Fixes #xxx


## Affected services

- [ ] Home
Expand Down
62 changes: 31 additions & 31 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,134 +8,134 @@ updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"
interval: "monthly"
rebase-strategy: disabled
commit-message:
prefix: "[github-actions] "
include: "scope"
prefix: "[github-actions] "
include: "scope"
- package-ecosystem: docker
directory: "/services/home"
schedule:
interval: "monthly"
rebase-strategy: disabled
commit-message:
prefix: "[home] "
include: "scope"
prefix: "[home] "
include: "scope"
open-pull-requests-limit: 3
- package-ecosystem: docker
directory: "/services/dsp"
schedule:
interval: "monthly"
rebase-strategy: disabled
commit-message:
prefix: "[dsp] "
include: "scope"
prefix: "[dsp] "
include: "scope"
open-pull-requests-limit: 3
- package-ecosystem: docker
directory: "/services/ssp"
schedule:
interval: "monthly"
rebase-strategy: disabled
commit-message:
prefix: "[ssp] "
include: "scope"
prefix: "[ssp] "
include: "scope"
open-pull-requests-limit: 3
- package-ecosystem: docker
directory: "/services/news"
schedule:
interval: "monthly"
rebase-strategy: disabled
commit-message:
prefix: "[news] "
include: "scope"
prefix: "[news] "
include: "scope"
open-pull-requests-limit: 3
- package-ecosystem: docker
directory: "/services/shop"
schedule:
interval: "monthly"
rebase-strategy: disabled
commit-message:
prefix: "[shop] "
include: "scope"
prefix: "[shop] "
include: "scope"
open-pull-requests-limit: 3
- package-ecosystem: docker
directory: "/services/travel"
schedule:
interval: "monthly"
rebase-strategy: disabled
commit-message:
prefix: "[travel] "
include: "scope"
prefix: "[travel] "
include: "scope"
open-pull-requests-limit: 3
- package-ecosystem: docker
directory: "/services/collector"
schedule:
interval: "monthly"
rebase-strategy: disabled
commit-message:
prefix: "[collector] "
include: "scope"
prefix: "[collector] "
include: "scope"
open-pull-requests-limit: 3
- package-ecosystem: npm
directory: "/services/home"
schedule:
interval: "monthly"
rebase-strategy: disabled
commit-message:
prefix: "[home] "
include: "scope"
prefix: "[home] "
include: "scope"
open-pull-requests-limit: 3
- package-ecosystem: npm
directory: "/services/dsp"
schedule:
interval: "monthly"
rebase-strategy: disabled
commit-message:
prefix: "[dsp] "
include: "scope"
prefix: "[dsp] "
include: "scope"
open-pull-requests-limit: 3
- package-ecosystem: npm
directory: "/services/ssp"
schedule:
interval: "monthly"
rebase-strategy: disabled
commit-message:
prefix: "[ssp] "
include: "scope"
prefix: "[ssp] "
include: "scope"
open-pull-requests-limit: 3
- package-ecosystem: npm
directory: "/services/news"
schedule:
interval: "monthly"
rebase-strategy: disabled
commit-message:
prefix: "[news] "
include: "scope"
prefix: "[news] "
include: "scope"
open-pull-requests-limit: 3
- package-ecosystem: npm
directory: "/services/shop"
schedule:
interval: "monthly"
rebase-strategy: disabled
commit-message:
prefix: "[shop] "
include: "scope"
prefix: "[shop] "
include: "scope"
open-pull-requests-limit: 3
- package-ecosystem: npm
directory: "/services/travel"
schedule:
interval: "monthly"
rebase-strategy: disabled
commit-message:
prefix: "[travel] "
include: "scope"
prefix: "[travel] "
include: "scope"
open-pull-requests-limit: 3
- package-ecosystem: gomod
directory: "/services/collector/src"
schedule:
interval: "monthly"
rebase-strategy: disabled
commit-message:
prefix: "[collector] "
include: "scope"
prefix: "[collector] "
include: "scope"
open-pull-requests-limit: 3
4 changes: 2 additions & 2 deletions .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ on:
# To guarantee Maintained check is occasionally updated. See
# https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
schedule:
- cron: '19 9 * * 4'
- cron: "19 9 * * 4"
push:
branches: [ "main" ]
branches: ["main"]

# Declare default permissions as read only.
permissions: read-all
Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@ If you are a developer we recommend you follow the [deployment instructions](doc

The current release supports the following use cases:

| **Use Case** | **Description** | **APIs** |
| ----------------------------------- | --------------------------------------------------------------------------------------------------- | ------------------------------------ |
| Remarking | Show relevant ads to a user who has researched a brand or product online. | Protected Audience <br> Fenced Frame |
| Single-touch conversion Attribution | Measure conversion after seeing ads on a news site and buying a project on an online shopping site. | Attribution Reporting API |
| **Category** | **Use Case** | **Privacy Sandbox APIs** | **Relevant for** |
| :---------------------------: | :------------------------------------------------------------------------: | :--------------------------------------------: | :-----------------------------: |
| Show Relevant Video Ads | [VAST Video Protected Audience](vast-video-protected-audience) | Protected Audience API | Publisher, SSP, Advertiser, DSP |
| Show Relevant Content and Ads | [Retargeting / Remarketing](retargeting-remarketing) | Protected Audience API | Publisher, SSP, Advertiser, DSP |
| Measure Digital Ads | [Single-touch conversion Attribution](single-touch-conversion-attribution) | Attribution Reporting API, Aggregation Service | Publisher, SSP, Advertiser, DSP |

These use cases are based on a set of demo apps and services that we have developed to simulate the actors in the ad tech ecosystem :

Expand Down
66 changes: 66 additions & 0 deletions cicd/.env.dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
# External Port (bind by Nginx)
EXTERNAL_PORT=443

# Bind by each Application Server (fixed value)
PORT=8080

# list of service names
SERVICES=("home" "news" "shop" "travel" "dsp" "ssp" "idp" "topics" "topics-server")

# home
HOME_HOST=privacy-sandcastle-dev-home.web.app
HOME_TOKEN=""
HOME_DETAIL="Home page of Privacy Sandbox Demos"

# Publisher
## news
NEWS_HOST=privacy-sandcastle-dev-news.web.app
NEWS_TOKEN=""
NEWS_DETAIL="Publisher: News media site"


# Advertizer
## shop
SHOP_HOST=privacy-sandcastle-dev-shop.web.app
SHOP_TOKEN=""
SHOP_DETAIL="Advertiser: EC shopping site"

## travel
TRAVEL_HOST=privacy-sandcastle-dev-travel.web.app
TRAVEL_TOKEN=""
TRAVEL_DETAIL="Advertiser: EC travel site"


# Adtech
## dsp
DSP_HOST=privacy-sandcastle-dev-dsp.web.app
DSP_TOKEN="A0nDunxZWFAhYvrWCRTblhlyK3D9m0czMNY/m9t2+pG3i1JHkMDasm8m66CwZS54qMeOepb+d9DYjawtBDbDrQgAAACYeyJvcmlnaW4iOiJodHRwczovL3ByaXZhY3ktc2FuZGNhc3RsZS1kZXYtZHNwLndlYi5hcHA6NDQzIiwiZmVhdHVyZSI6IlByaXZhY3lTYW5kYm94QWRzQVBJcyIsImV4cGlyeSI6MTY5NTE2Nzk5OSwiaXNTdWJkb21haW4iOnRydWUsImlzVGhpcmRQYXJ0eSI6dHJ1ZX0="
DSP_DETAIL="Ad-Platform: DSP for advertiser"

## ssp
SSP_HOST=privacy-sandcastle-dev-ssp.web.app
SSP_TOKEN="A3Jo3gcicBIWHTI+QzCeb2h+B4TJX/y8PSngoHtoHeCpnRi2Ny/TFjJ/QtSQhBeS+2x43Jtd5GfksanOOglcVgIAAACYeyJvcmlnaW4iOiJodHRwczovL3ByaXZhY3ktc2FuZGNhc3RsZS1kZXYtc3NwLndlYi5hcHA6NDQzIiwiZmVhdHVyZSI6IlByaXZhY3lTYW5kYm94QWRzQVBJcyIsImV4cGlyeSI6MTY5NTE2Nzk5OSwiaXNTdWJkb21haW4iOnRydWUsImlzVGhpcmRQYXJ0eSI6dHJ1ZX0="
SSP_DETAIL="Ad-Platform: SSP for publisher"

## Collector for Aggregation Service
COLLECTOR_HOST=privacy-sandcastle-dev-collector.web.app
COLLECTOR_TOKEN=""
COLLECTOR_DETAIL="Collect, transform and batch Aggregatable Reports produced by the Attribution Reporting API and Private Aggregation API."


# IDP
IDP_HOST=privacy-sandcastle-dev-idp.web.app
IDP_TOKEN=""
IDP_DETAIL="Identity Provider for relying parties. Also Issuing Private State Token"

## Topics related
## site to observe topics
TOPICS_MOTO_HOST=privacy-sandcastle-dev-motorcycles.web.app
TOPICS_SOCCER_HOST=privacy-sandcastle-dev-soccer-foot.web.app
TOPICS_GARDENING_HOST=privacy-sandcastle-dev-gardening-potager.web.app
TOPICS_DETAIL="Topics page"

## server to request topics with headers
TOPICS_SERVER_HOST=privacy-sandcastle-dev-topics-server.web.app
TOPICS_SERVER_DETAIL="Topics server"

Loading
Loading