Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ describe('.getConversionActionId', () => {
}
}
nock(`https://googleads.googleapis.com`)
.post(`/v19/customers/${settings.customerId}/googleAds:searchStream`)
.post(`/v21/customers/${settings.customerId}/googleAds:searchStream`)
.reply(401, errorResponse)

const payload = {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -780,7 +780,7 @@ describe('GoogleEnhancedConversions', () => {
code: 400,
details: [
{
'@type': 'type.googleapis.com/google.ads.googleads.v19.errors.GoogleAdsFailure',
'@type': 'type.googleapis.com/google.ads.googleads.v21.errors.GoogleAdsFailure',
errors: [
{
errorCode: {
Expand Down Expand Up @@ -884,7 +884,7 @@ describe('GoogleEnhancedConversions', () => {
code: 400,
details: [
{
'@type': 'type.googleapis.com/google.ads.googleads.v19.errors.GoogleAdsFailure',
'@type': 'type.googleapis.com/google.ads.googleads.v21.errors.GoogleAdsFailure',
errors: [
{
errorCode: {
Expand Down Expand Up @@ -1008,7 +1008,7 @@ describe('GoogleEnhancedConversions', () => {
code: 400,
details: [
{
'@type': 'type.googleapis.com/google.ads.googleads.v19.errors.GoogleAdsFailure',
'@type': 'type.googleapis.com/google.ads.googleads.v21.errors.GoogleAdsFailure',
errors: [
{
errorCode: {
Expand Down Expand Up @@ -1242,7 +1242,7 @@ describe('GoogleEnhancedConversions', () => {
message: 'Mocking Partial Failure Error',
details: [
{
'@type': 'type.googleapis.com/google.ads.googleads.v19.errors.GoogleAdsFailure',
'@type': 'type.googleapis.com/google.ads.googleads.v21.errors.GoogleAdsFailure',
errors: [
{
errorCode: {
Expand Down Expand Up @@ -1658,7 +1658,7 @@ describe('GoogleEnhancedConversions', () => {
code: 400,
details: [
{
'@type': 'type.googleapis.com/google.ads.googleads.v19.errors.GoogleAdsFailure',
'@type': 'type.googleapis.com/google.ads.googleads.v21.errors.GoogleAdsFailure',
errors: [
{
errorCode: {
Expand Down Expand Up @@ -1761,7 +1761,7 @@ describe('GoogleEnhancedConversions', () => {
code: 400,
details: [
{
'@type': 'type.googleapis.com/google.ads.googleads.v19.errors.GoogleAdsFailure',
'@type': 'type.googleapis.com/google.ads.googleads.v21.errors.GoogleAdsFailure',
errors: [
{
errorCode: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import { RefreshTokenResponse } from '.'
import { STATUS_CODE_MAPPING } from './constants'
import { processHashing } from '../../lib/hashing-utils'
export const API_VERSION = 'v19'
export const CANARY_API_VERSION = 'v19'
export const CANARY_API_VERSION = 'v21'
export const FLAGON_NAME = 'google-enhanced-canary-version'
export const FLAGON_NAME_PHONE_VALIDATION_CHECK = 'google-enhanced-phone-validation-check'
import { PhoneNumberUtil, PhoneNumberFormat } from 'google-libphonenumber'
Expand Down Expand Up @@ -597,7 +597,7 @@ const handleGoogleAdsError = (error: any) => {
const errors = (error as GoogleAdsError)?.response?.data?.error?.details ?? []
for (const errorDetails of errors) {
for (const errorItem of errorDetails.errors) {
// https://developers.google.com/google-ads/api/reference/rpc/v19/DatabaseErrorEnum.DatabaseError
// https://developers.google.com/google-ads/api/reference/rpc/v21/DatabaseErrorEnum.DatabaseError
if (errorItem?.errorCode?.databaseError === 'CONCURRENT_MODIFICATION') {
throw new RetryableError(
errorItem?.message ??
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ const action: ActionDefinition<Settings, Payload> = {
ad_user_data_consent_state: {
label: 'Ad User Data Consent State',
description:
'This represents consent for ad user data. For more information on consent, refer to [Google Ads API Consent](https://developers.google.com/google-ads/api/rest/reference/rest/v19/Consent).',
'This represents consent for ad user data. For more information on consent, refer to [Google Ads API Consent](https://developers.google.com/google-ads/api/rest/reference/rest/v21/Consent).',
type: 'string',
choices: [
{ label: 'GRANTED', value: 'GRANTED' },
Expand All @@ -88,7 +88,7 @@ const action: ActionDefinition<Settings, Payload> = {
label: 'Ad Personalization Consent State',
type: 'string',
description:
'This represents consent for ad personalization. This can only be set for OfflineUserDataJobService and UserDataService.For more information on consent, refer to [Google Ads API Consent](https://developers.google.com/google-ads/api/rest/reference/rest/v19/Consent).',
'This represents consent for ad personalization. This can only be set for OfflineUserDataJobService and UserDataService.For more information on consent, refer to [Google Ads API Consent](https://developers.google.com/google-ads/api/rest/reference/rest/v21/Consent).',
choices: [
{ label: 'GRANTED', value: 'GRANTED' },
{ label: 'DENIED', value: 'DENIED' },
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ const action: ActionDefinition<Settings, Payload> = {
ad_user_data_consent_state: {
label: 'Ad User Data Consent State',
description:
'This represents consent for ad user data. For more information on consent, refer to [Google Ads API Consent](https://developers.google.com/google-ads/api/rest/reference/rest/v19/Consent).',
'This represents consent for ad user data. For more information on consent, refer to [Google Ads API Consent](https://developers.google.com/google-ads/api/rest/reference/rest/v21/Consent).',
type: 'string',
choices: [
{ label: 'GRANTED', value: 'GRANTED' },
Expand All @@ -100,7 +100,7 @@ const action: ActionDefinition<Settings, Payload> = {
label: 'Ad Personalization Consent State',
type: 'string',
description:
'This represents consent for ad personalization. This can only be set for OfflineUserDataJobService and UserDataService.For more information on consent, refer to [Google Ads API Consent](https://developers.google.com/google-ads/api/rest/reference/rest/v19/Consent).',
'This represents consent for ad personalization. This can only be set for OfflineUserDataJobService and UserDataService.For more information on consent, refer to [Google Ads API Consent](https://developers.google.com/google-ads/api/rest/reference/rest/v21/Consent).',
choices: [
{ label: 'GRANTED', value: 'GRANTED' },
{ label: 'DENIED', value: 'DENIED' },
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ const action: ActionDefinition<Settings, Payload> = {
ad_user_data_consent_state: {
label: 'Ad User Data Consent State',
description:
'This represents consent for ad user data.For more information on consent, refer to [Google Ads API Consent](https://developers.google.com/google-ads/api/rest/reference/rest/v19/Consent).',
'This represents consent for ad user data.For more information on consent, refer to [Google Ads API Consent](https://developers.google.com/google-ads/api/rest/reference/rest/v21/Consent).',
type: 'string',
choices: [
{ label: 'GRANTED', value: 'GRANTED' },
Expand All @@ -226,7 +226,7 @@ const action: ActionDefinition<Settings, Payload> = {
label: 'Ad Personalization Consent State',
type: 'string',
description:
'This represents consent for ad personalization. This can only be set for OfflineUserDataJobService and UserDataService.For more information on consent, refer to [Google Ads API Consent](https://developers.google.com/google-ads/api/rest/reference/rest/v19/Consent).',
'This represents consent for ad personalization. This can only be set for OfflineUserDataJobService and UserDataService.For more information on consent, refer to [Google Ads API Consent](https://developers.google.com/google-ads/api/rest/reference/rest/v21/Consent).',
choices: [
{ label: 'GRANTED', value: 'GRANTED' },
{ label: 'DENIED', value: 'DENIED' },
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ const action: ActionDefinition<Settings, Payload> = {
ad_user_data_consent_state: {
label: 'Ad User Data Consent State',
description:
'This represents consent for ad user data.For more information on consent, refer to [Google Ads API Consent](https://developers.google.com/google-ads/api/rest/reference/rest/v19/Consent).',
'This represents consent for ad user data.For more information on consent, refer to [Google Ads API Consent](https://developers.google.com/google-ads/api/rest/reference/rest/v21/Consent).',
type: 'string',
choices: [
{ label: 'GRANTED', value: 'GRANTED' },
Expand All @@ -233,7 +233,7 @@ const action: ActionDefinition<Settings, Payload> = {
label: 'Ad Personalization Consent State',
type: 'string',
description:
'This represents consent for ad personalization. This can only be set for OfflineUserDataJobService and UserDataService.For more information on consent, refer to [Google Ads API Consent](https://developers.google.com/google-ads/api/rest/reference/rest/v19/Consent).',
'This represents consent for ad personalization. This can only be set for OfflineUserDataJobService and UserDataService.For more information on consent, refer to [Google Ads API Consent](https://developers.google.com/google-ads/api/rest/reference/rest/v21/Consent).',
choices: [
{ label: 'GRANTED', value: 'GRANTED' },
{ label: 'DENIED', value: 'DENIED' },
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ const action: ActionDefinition<Settings, Payload> = {
ad_user_data_consent_state: {
label: 'Ad User Data Consent State',
description:
'This represents consent for ad user data.For more information on consent, refer to [Google Ads API Consent](https://developers.google.com/google-ads/api/rest/reference/rest/v19/Consent).',
'This represents consent for ad user data.For more information on consent, refer to [Google Ads API Consent](https://developers.google.com/google-ads/api/rest/reference/rest/v21/Consent).',
type: 'string',
choices: [
{ label: 'GRANTED', value: 'GRANTED' },
Expand All @@ -123,7 +123,7 @@ const action: ActionDefinition<Settings, Payload> = {
label: 'Ad Personalization Consent State',
type: 'string',
description:
'This represents consent for ad personalization. This can only be set for OfflineUserDataJobService and UserDataService.For more information on consent, refer to [Google Ads API Consent](https://developers.google.com/google-ads/api/rest/reference/rest/v19/Consent).',
'This represents consent for ad personalization. This can only be set for OfflineUserDataJobService and UserDataService.For more information on consent, refer to [Google Ads API Consent](https://developers.google.com/google-ads/api/rest/reference/rest/v21/Consent).',
choices: [
{ label: 'GRANTED', value: 'GRANTED' },
{ label: 'DENIED', value: 'DENIED' },
Expand Down
Loading