Skip to content

Commit

Permalink
fix: link annual vpn to annual sku (#2686)
Browse files Browse the repository at this point in the history
  • Loading branch information
@pavelbrm
pavelbrm authored Oct 29, 2024
1 parent e2285b0 commit 8a3b0da
Show file tree
Hide file tree
Showing 2 changed files with 138 additions and 23 deletions.
53 changes: 48 additions & 5 deletions services/skus/skus.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,19 +170,22 @@ func skuVntByMobileName(subID string) (string, error) {

// Android VPN Annual.
case "brave.vpn.yearly", "beta.bravevpn.yearly", "nightly.bravevpn.yearly":
// Temporary: use the same sku as for monthly.
return "brave-vpn-premium", nil
return "brave-vpn-premium-year", nil

// iOS VPN Annual.
case "bravevpn.yearly":
// Temporary: use the same sku as for monthly.
return "brave-vpn-premium", nil
return "brave-vpn-premium-year", nil

// Legacy.
// Older iOS clients might still send this as subscription_id along with a receipt.
case "brave-firewall-vpn-premium", "brave-firewall-vpn-premium-year":
case "brave-firewall-vpn-premium":
return "brave-vpn-premium", nil

// Legacy.
// Older iOS clients might still send this as subscription_id along with a receipt.
case "brave-firewall-vpn-premium-year":
return "brave-vpn-premium-year", nil

default:
return "", model.ErrInvalidMobileProduct
}
Expand Down Expand Up @@ -280,6 +283,21 @@ func newOrderItemReqNewMobileSet(env string) map[string]model.OrderItemRequestNe
// StripeMetadata depends on env.
}

vpna := model.OrderItemRequestNew{
Quantity: 1,
SKU: "brave-vpn-premium",
SKUVnt: "brave-vpn-premium-year",
// Location depends on env.
Description: "brave-vpn-premium-year",
CredentialType: "time-limited-v2",
CredentialValidDuration: "P1M",
Price: decimal.RequireFromString("99.99"),
IssuerTokenBuffer: ptrTo(31),
IssuerTokenOverlap: ptrTo(2),
CredentialValidDurationEach: ptrTo("P1D"),
// StripeMetadata depends on env.
}

switch env {
case "prod", "production":
leom.Location = "leo.brave.com"
Expand All @@ -300,6 +318,12 @@ func newOrderItemReqNewMobileSet(env string) map[string]model.OrderItemRequestNe
ItemID: "price_1L0VHmBSm1mtrN9nT5DPmUZb",
}

vpna.Location = "vpn.brave.com"
vpna.StripeMetadata = &model.ItemStripeMetadata{
ProductID: "prod_Lhv8qsPsn6WHrx",
ItemID: "price_1L7lgCBSm1mtrN9nDlAz8WT2",
}

case "sandbox", "staging":
leom.Location = "leo.bravesoftware.com"
leom.StripeMetadata = &model.ItemStripeMetadata{
Expand All @@ -319,6 +343,12 @@ func newOrderItemReqNewMobileSet(env string) map[string]model.OrderItemRequestNe
ItemID: "price_1L0VEhBSm1mtrN9nGB4kZkfh",
}

vpna.Location = "vpn.bravesoftware.com"
vpna.StripeMetadata = &model.ItemStripeMetadata{
ProductID: "prod_Lhv4OM1aAPxflY",
ItemID: "price_1L8O6dBSm1mtrN9nOYyDqe0F",
}

case "dev", "development":
leom.Location = "leo.brave.software"
leom.StripeMetadata = &model.ItemStripeMetadata{
Expand All @@ -338,6 +368,12 @@ func newOrderItemReqNewMobileSet(env string) map[string]model.OrderItemRequestNe
ItemID: "price_1JNYuNHof20bphG6BvgeYEnt",
}

vpna.Location = "vpn.brave.software"
vpna.StripeMetadata = &model.ItemStripeMetadata{
ProductID: "prod_K1c8W3oM4mUsGw",
ItemID: "price_1L7m0CHof20bphG6AYaCd9OU",
}

default:
// "local", "test", etc use the same settings as development.
leom.Location = "leo.brave.software"
Expand All @@ -357,12 +393,19 @@ func newOrderItemReqNewMobileSet(env string) map[string]model.OrderItemRequestNe
ProductID: "prod_K1c8W3oM4mUsGw",
ItemID: "price_1JNYuNHof20bphG6BvgeYEnt",
}

vpna.Location = "vpn.brave.software"
vpna.StripeMetadata = &model.ItemStripeMetadata{
ProductID: "prod_K1c8W3oM4mUsGw",
ItemID: "price_1L7m0CHof20bphG6AYaCd9OU",
}
}

result := map[string]model.OrderItemRequestNew{
leom.SKUVnt: leom,
leoa.SKUVnt: leoa,
vpnm.SKUVnt: vpnm,
vpna.SKUVnt: vpna,
}

return result
Expand Down
108 changes: 90 additions & 18 deletions services/skus/skus_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,25 +122,25 @@ func TestSKUNameByMobileName(t *testing.T) {
{
name: "android_vpn_annual_release",
given: "brave.vpn.yearly",
exp: tcExpected{skuVnt: "brave-vpn-premium"},
exp: tcExpected{skuVnt: "brave-vpn-premium-year"},
},

{
name: "android_vpn_annual_beta",
given: "beta.bravevpn.yearly",
exp: tcExpected{skuVnt: "brave-vpn-premium"},
exp: tcExpected{skuVnt: "brave-vpn-premium-year"},
},

{
name: "android_vpn_annual_nightly",
given: "nightly.bravevpn.yearly",
exp: tcExpected{skuVnt: "brave-vpn-premium"},
exp: tcExpected{skuVnt: "brave-vpn-premium-year"},
},

{
name: "ios_vpn_annual_release",
given: "bravevpn.yearly",
exp: tcExpected{skuVnt: "brave-vpn-premium"},
exp: tcExpected{skuVnt: "brave-vpn-premium-year"},
},

{
Expand All @@ -158,7 +158,7 @@ func TestSKUNameByMobileName(t *testing.T) {
{
name: "ios_vpn_annual_legacy",
given: "brave-firewall-vpn-premium-year",
exp: tcExpected{skuVnt: "brave-vpn-premium"},
exp: tcExpected{skuVnt: "brave-vpn-premium-year"},
},
}

Expand Down Expand Up @@ -390,18 +390,18 @@ func TestNewOrderItemReqForSubID(t *testing.T) {
req: model.OrderItemRequestNew{
Quantity: 1,
SKU: "brave-vpn-premium",
SKUVnt: "brave-vpn-premium",
SKUVnt: "brave-vpn-premium-year",
Location: "vpn.brave.software",
Description: "brave-vpn-premium",
Description: "brave-vpn-premium-year",
CredentialType: "time-limited-v2",
CredentialValidDuration: "P1M",
Price: decimal.RequireFromString("9.99"),
Price: decimal.RequireFromString("99.99"),
IssuerTokenBuffer: ptrTo(31),
IssuerTokenOverlap: ptrTo(2),
CredentialValidDurationEach: ptrTo("P1D"),
StripeMetadata: &model.ItemStripeMetadata{
ProductID: "prod_K1c8W3oM4mUsGw",
ItemID: "price_1JNYuNHof20bphG6BvgeYEnt",
ItemID: "price_1L7m0CHof20bphG6AYaCd9OU",
},
},
},
Expand All @@ -417,18 +417,18 @@ func TestNewOrderItemReqForSubID(t *testing.T) {
req: model.OrderItemRequestNew{
Quantity: 1,
SKU: "brave-vpn-premium",
SKUVnt: "brave-vpn-premium",
SKUVnt: "brave-vpn-premium-year",
Location: "vpn.brave.software",
Description: "brave-vpn-premium",
Description: "brave-vpn-premium-year",
CredentialType: "time-limited-v2",
CredentialValidDuration: "P1M",
Price: decimal.RequireFromString("9.99"),
Price: decimal.RequireFromString("99.99"),
IssuerTokenBuffer: ptrTo(31),
IssuerTokenOverlap: ptrTo(2),
CredentialValidDurationEach: ptrTo("P1D"),
StripeMetadata: &model.ItemStripeMetadata{
ProductID: "prod_K1c8W3oM4mUsGw",
ItemID: "price_1JNYuNHof20bphG6BvgeYEnt",
ItemID: "price_1L7m0CHof20bphG6AYaCd9OU",
},
},
},
Expand Down Expand Up @@ -610,7 +610,7 @@ func TestNewCreateOrderReqNewMobile(t *testing.T) {
name: "staging_vpn_yearly",
given: tcGiven{
ppcfg: newPaymentProcessorConfig("staging"),
item: newOrderItemReqNewMobileSet("staging")["brave-vpn-premium"],
item: newOrderItemReqNewMobileSet("staging")["brave-vpn-premium-year"],
},
exp: model.CreateOrderRequestNew{
Currency: "USD",
Expand All @@ -624,18 +624,18 @@ func TestNewCreateOrderReqNewMobile(t *testing.T) {
{
Quantity: 1,
SKU: "brave-vpn-premium",
SKUVnt: "brave-vpn-premium",
SKUVnt: "brave-vpn-premium-year",
Location: "vpn.bravesoftware.com",
Description: "brave-vpn-premium",
Description: "brave-vpn-premium-year",
CredentialType: "time-limited-v2",
CredentialValidDuration: "P1M",
Price: decimal.RequireFromString("9.99"),
Price: decimal.RequireFromString("99.99"),
IssuerTokenBuffer: ptrTo(31),
IssuerTokenOverlap: ptrTo(2),
CredentialValidDurationEach: ptrTo("P1D"),
StripeMetadata: &model.ItemStripeMetadata{
ProductID: "prod_Lhv4OM1aAPxflY",
ItemID: "price_1L0VEhBSm1mtrN9nGB4kZkfh",
ItemID: "price_1L8O6dBSm1mtrN9nOYyDqe0F",
},
},
},
Expand Down Expand Up @@ -754,6 +754,24 @@ func TestNewOrderItemReqNewMobileSet(t *testing.T) {
ItemID: "price_1L0VHmBSm1mtrN9nT5DPmUZb",
},
},

"brave-vpn-premium-year": model.OrderItemRequestNew{
Quantity: 1,
SKU: "brave-vpn-premium",
SKUVnt: "brave-vpn-premium-year",
Location: "vpn.brave.com",
Description: "brave-vpn-premium-year",
CredentialType: "time-limited-v2",
CredentialValidDuration: "P1M",
Price: decimal.RequireFromString("99.99"),
IssuerTokenBuffer: ptrTo(31),
IssuerTokenOverlap: ptrTo(2),
CredentialValidDurationEach: ptrTo("P1D"),
StripeMetadata: &model.ItemStripeMetadata{
ProductID: "prod_Lhv8qsPsn6WHrx",
ItemID: "price_1L7lgCBSm1mtrN9nDlAz8WT2",
},
},
},
},

Expand Down Expand Up @@ -814,6 +832,24 @@ func TestNewOrderItemReqNewMobileSet(t *testing.T) {
ItemID: "price_1L0VEhBSm1mtrN9nGB4kZkfh",
},
},

"brave-vpn-premium-year": model.OrderItemRequestNew{
Quantity: 1,
SKU: "brave-vpn-premium",
SKUVnt: "brave-vpn-premium-year",
Location: "vpn.bravesoftware.com",
Description: "brave-vpn-premium-year",
CredentialType: "time-limited-v2",
CredentialValidDuration: "P1M",
Price: decimal.RequireFromString("99.99"),
IssuerTokenBuffer: ptrTo(31),
IssuerTokenOverlap: ptrTo(2),
CredentialValidDurationEach: ptrTo("P1D"),
StripeMetadata: &model.ItemStripeMetadata{
ProductID: "prod_Lhv4OM1aAPxflY",
ItemID: "price_1L8O6dBSm1mtrN9nOYyDqe0F",
},
},
},
},

Expand Down Expand Up @@ -874,6 +910,24 @@ func TestNewOrderItemReqNewMobileSet(t *testing.T) {
ItemID: "price_1JNYuNHof20bphG6BvgeYEnt",
},
},

"brave-vpn-premium-year": model.OrderItemRequestNew{
Quantity: 1,
SKU: "brave-vpn-premium",
SKUVnt: "brave-vpn-premium-year",
Location: "vpn.brave.software",
Description: "brave-vpn-premium-year",
CredentialType: "time-limited-v2",
CredentialValidDuration: "P1M",
Price: decimal.RequireFromString("99.99"),
IssuerTokenBuffer: ptrTo(31),
IssuerTokenOverlap: ptrTo(2),
CredentialValidDurationEach: ptrTo("P1D"),
StripeMetadata: &model.ItemStripeMetadata{
ProductID: "prod_K1c8W3oM4mUsGw",
ItemID: "price_1L7m0CHof20bphG6AYaCd9OU",
},
},
},
},

Expand Down Expand Up @@ -934,6 +988,24 @@ func TestNewOrderItemReqNewMobileSet(t *testing.T) {
ItemID: "price_1JNYuNHof20bphG6BvgeYEnt",
},
},

"brave-vpn-premium-year": model.OrderItemRequestNew{
Quantity: 1,
SKU: "brave-vpn-premium",
SKUVnt: "brave-vpn-premium-year",
Location: "vpn.brave.software",
Description: "brave-vpn-premium-year",
CredentialType: "time-limited-v2",
CredentialValidDuration: "P1M",
Price: decimal.RequireFromString("99.99"),
IssuerTokenBuffer: ptrTo(31),
IssuerTokenOverlap: ptrTo(2),
CredentialValidDurationEach: ptrTo("P1D"),
StripeMetadata: &model.ItemStripeMetadata{
ProductID: "prod_K1c8W3oM4mUsGw",
ItemID: "price_1L7m0CHof20bphG6AYaCd9OU",
},
},
},
},
}
Expand Down

0 comments on commit 8a3b0da

Please sign in to comment.