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

feat: add generic consent management fields in initially onboarded destinations config #1058

Merged
merged 37 commits into from
Feb 1, 2024
Merged

feat: add generic consent management fields in initially onboarded destinations config #1058

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
d2c682d
chore: partial poc
bardisg Nov 7, 2023
db610e5
Merge branch 'develop' into feature/sdk-660-update-consent-settings-i…
bardisg Nov 7, 2023
b95dc53
Merge branch 'develop' into feature/sdk-660-update-consent-settings-i…
bardisg Nov 7, 2023
f2a550e
feat: add GCM destination configurations
bardisg Nov 7, 2023
85673ab
fix: revert configuration that was done for local testing only
bardisg Nov 7, 2023
3c02b93
Merge branch 'develop' into feature/sdk-660-update-consent-settings-i…
bardisg Nov 10, 2023
d7b3ffa
feat: add GCM fields in Mixpanel destination configs
bardisg Nov 13, 2023
b78b881
Merge branch 'develop' into feature/sdk-660-update-consent-settings-i…
bardisg Nov 13, 2023
6c72f16
chore: revert formatting changes
bardisg Nov 13, 2023
0550122
chore: revert formatting changes
bardisg Nov 13, 2023
6cc67da
chore: revert auto generated changes in MixPanel schema
bardisg Nov 13, 2023
2be42d6
chore: revert formatting changes
bardisg Nov 13, 2023
9ae16c7
Merge branch 'develop' into feature/sdk-660-update-consent-settings-i…
bardisg Nov 21, 2023
5062969
feat: new generic consent management fields in GA4
bardisg Nov 21, 2023
d9a2db5
fix: make consentManagement field to be source specific
bardisg Nov 21, 2023
c60f8c1
fix: make consentManagement field to be source specific in db-config
bardisg Nov 21, 2023
a7002f8
Merge branch 'develop' into feature/sdk-660-update-consent-settings-i…
bardisg Nov 23, 2023
6de4548
chore: revert formatting changes
bardisg Nov 23, 2023
f0c8f1e
fix: add dynamic custom form field preRequisites in validator and sch…
bardisg Nov 27, 2023
9ffa453
fix: add labels
bardisg Nov 27, 2023
df5a41e
fix: correct level in schema.json for nested prerequsites
bardisg Nov 27, 2023
7f020de
fix: generated pattern value for schema.json and add tests
bardisg Nov 28, 2023
67d0ec1
Merge branch 'develop' into feature/sdk-660-update-consent-settings-i…
bardisg Jan 11, 2024
f98c6e3
feat: new designs for consent management fields
bardisg Jan 17, 2024
d3e57c4
Merge branch 'develop' into feature/sdk-660-update-consent-settings-i…
bardisg Jan 17, 2024
41e5fb8
Merge branch 'develop' into feature/sdk-660-update-consent-settings-i…
bardisg Jan 19, 2024
89c5ce4
fix: resolve PR comments
bardisg Jan 19, 2024
427c25e
Merge branch 'develop' into feature/sdk-660-update-consent-settings-i…
bardisg Jan 19, 2024
3e65af9
Merge branch 'feature/sdk-660-update-consent-settings-in-destination-…
bardisg Jan 19, 2024
472e23d
fix: add support for consentSettingsTemplate in schemaGenerator script
bardisg Jan 19, 2024
796629a
fix: revert snowflake schema definitions ref
bardisg Jan 19, 2024
3e975e2
Merge branch 'develop' into feature/sdk-660-update-consent-settings-i…
bardisg Jan 23, 2024
33127d7
fix: remove default resolution strategy values from GCM fields
bardisg Jan 26, 2024
b082045
fix: set as default GCM provider OneTrust
bardisg Jan 26, 2024
70d58c8
Merge branch 'develop' into feature/sdk-660-update-consent-settings-i…
bardisg Jan 26, 2024
4a04292
Merge branch 'develop' into feature/sdk-660-update-consent-settings-i…
bardisg Jan 30, 2024
140ef01
Merge branch 'develop' into feature/sdk-660-update-consent-settings-i…
bardisg Jan 31, 2024
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
Empty file modified scripts/run-schema-validation.sh
100644 → 100755
View file
Open in desktop
Empty file.
4 changes: 3 additions & 1 deletion src/configurations/destinations/customerio/db-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"blacklistedEvents",
"whitelistedEvents",
"oneTrustCookieCategories",
"consentManagement",
"eventFilteringOption",
"sendPageNameInSDK"
],
Expand Down Expand Up @@ -41,7 +42,8 @@
"blacklistedEvents",
"whitelistedEvents",
"eventFilteringOption",
"oneTrustCookieCategories"
"oneTrustCookieCategories",
"consentManagement"
],
"web": ["useNativeSDK", "sendPageNameInSDK"]
},
Expand Down
30 changes: 30 additions & 0 deletions src/configurations/destinations/customerio/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,36 @@
}
}
}
},
"consentManagement": {
"type": "array",
"items": {
"type": "object",
"properties": {
"provider": {
"type": "string",
"enum": ["custom", "ketch", "oneTrust"],
"default": "custom"
},
"resolutionStrategy": {
"type": "string",
"enum": ["and", "or"],
"default": "and"
},
"consents": {
"type": "array",
"items": {
"type": "object",
"properties": {
"consent": {
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
}
}
}
}
}
}
}
}
}
Expand Down
90 changes: 89 additions & 1 deletion src/configurations/destinations/customerio/ui-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,98 @@
"type": "textInput",
"placeholder": "Marketing",
"value": "oneTrustCookieCategory",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$",
"label": "Category Name/ID",
"required": false
}
]
],
"preRequisites": {
krishna2020 marked this conversation as resolved.
Show resolved Hide resolved
"featureFlags": [
{
"configKey": "AMP_enable-gcm",
"value": false
}
]
}
},
{
krishna2020 marked this conversation as resolved.
Show resolved Hide resolved
"type": "dynamicCustomForm",
"value": "consentManagement",
"label": "Consent management settings",
krishna2020 marked this conversation as resolved.
Show resolved Hide resolved
"customFields": [
{
"type": "singleSelect",
"label": "Consent Management Provider",
"value": "provider",
"options": [
{
"name": "Custom",
"value": "custom"
},
{
"name": "Ketch",
"value": "ketch"
},
{
"name": "OneTrust",
"value": "oneTrust"
}
],
"defaultOption": {
"name": "Custom",
"value": "custom"
}
},
{
"type": "singleSelect",
krishna2020 marked this conversation as resolved.
Show resolved Hide resolved
"label": "Required Consents logic",
bardisg marked this conversation as resolved.
Show resolved Hide resolved
"value": "resolutionStrategy",
"options": [
{
"name": "AND",
"value": "and"
},
{
"name": "OR",
"value": "or"
}
],
"defaultOption": {
"name": "AND",
"value": "and"
},
"preRequisites": {
"fields": [
{
"configKey": "provider",
"value": "custom"
}
]
}
},
{
"type": "dynamicCustomForm",
"value": "consents",
"label": "Consent Category Ids",
bardisg marked this conversation as resolved.
Show resolved Hide resolved
"customFields": [
{
"type": "textInput",
"placeholder": "Marketing",
"value": "consent",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$",
"required": false
}
]
}
],
"preRequisites": {
"featureFlags": [
{
"configKey": "AMP_enable-gcm",
"value": true
}
]
}
}
]
}
Expand Down
2 changes: 2 additions & 0 deletions src/configurations/destinations/mp/db-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"blacklistedEvents",
"whitelistedEvents",
"oneTrustCookieCategories",
"consentManagement",
"eventFilteringOption",
"identityMergeApi"
],
Expand Down Expand Up @@ -75,6 +76,7 @@
"serviceAccountSecret",
"projectId",
"oneTrustCookieCategories",
"consentManagement",
"identityMergeApi",
"userDeletionApi",
"gdprApiToken",
Expand Down
30 changes: 30 additions & 0 deletions src/configurations/destinations/mp/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,36 @@
}
}
}
},
"consentManagement": {
"type": "array",
"items": {
"type": "object",
"properties": {
"provider": {
"type": "string",
"enum": ["custom", "ketch", "oneTrust"],
"default": "custom"
},
"resolutionStrategy": {
"type": "string",
"enum": ["and", "or"],
"default": "and"
},
"consents": {
"type": "array",
"items": {
"type": "object",
"properties": {
"consent": {
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
}
}
}
}
}
}
}
},
"anyOf": [
Expand Down
89 changes: 88 additions & 1 deletion src/configurations/destinations/mp/ui-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,94 @@
"label": "Category Name/ID",
"required": false
}
]
],
"preRequisites": {
"featureFlags": [
{
"configKey": "AMP_enable-gcm",
"value": false
}
]
}
},
{
"type": "dynamicCustomForm",
krishna2020 marked this conversation as resolved.
Show resolved Hide resolved
"value": "consentManagement",
"label": "Consent management settings",
"customFields": [
{
"type": "singleSelect",
"label": "Consent Management Provider",
"value": "provider",
"options": [
{
"name": "Custom",
"value": "custom"
},
{
"name": "Ketch",
"value": "ketch"
},
{
"name": "OneTrust",
"value": "oneTrust"
}
],
"defaultOption": {
"name": "Custom",
"value": "custom"
}
},
{
"type": "singleSelect",
"label": "Required Consents logic",
"value": "resolutionStrategy",
"options": [
{
"name": "AND",
"value": "and"
},
{
"name": "OR",
"value": "or"
}
],
"defaultOption": {
"name": "AND",
"value": "and"
},
"preRequisites": {
"fields": [
{
"configKey": "provider",
"value": "custom"
}
]
}
},
{
"type": "dynamicCustomForm",
"value": "consents",
"label": "Consent Category Ids",
"customFields": [
{
"type": "textInput",
"placeholder": "Marketing",
"value": "consent",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$",
"required": false
}
]
}
],
"preRequisites": {
"featureFlags": [
{
"configKey": "AMP_enable-gcm",
"value": true
}
]
}
}
]
}
Expand Down
5 changes: 3 additions & 2 deletions src/configurations/destinations/snowflake/db-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"transformAt": "processor",
"transformAtV1": "processor",
"saveDestinationResponse": true,
"includeKeys": [],
"includeKeys": ["oneTrustCookieCategories", "consentManagement"],
"excludeKeys": [],
"supportedSourceTypes": [
"android",
Expand Down Expand Up @@ -50,7 +50,8 @@
"excludeWindow",
"jsonPaths",
"useRudderStorage",
"oneTrustCookieCategories"
"oneTrustCookieCategories",
"consentManagement"
saikumarrs marked this conversation as resolved.
Show resolved Hide resolved
]
},
"secretKeys": ["password", "accessKeyID", "accessKey", "accountKey", "sasToken"]
Expand Down
30 changes: 30 additions & 0 deletions src/configurations/destinations/snowflake/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,36 @@
}
}
}
},
"consentManagement": {
"type": "array",
"items": {
"type": "object",
"properties": {
"provider": {
"type": "string",
"enum": ["custom", "ketch", "oneTrust"],
"default": "custom"
},
"resolutionStrategy": {
"type": "string",
"enum": ["and", "or"],
"default": "and"
},
"consents": {
"type": "array",
"items": {
"type": "object",
"properties": {
"consent": {
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
}
}
}
}
}
}
}
},
"allOf": [
Expand Down
Loading
Loading