populate_realms: Allow billing page access without stripe_api_key.

This commit is contained in:
Aman Agrawal 2024-01-12 15:54:34 +00:00 committed by Tim Abbott
parent 39376190fe
commit f285de39e9
2 changed files with 47 additions and 13 deletions

View File

@ -1877,12 +1877,19 @@ class BillingSession(ABC):
renewal_cents = renewal_cents - discount renewal_cents = renewal_cents - discount
charge_automatically = plan.charge_automatically charge_automatically = plan.charge_automatically
assert customer.stripe_customer_id is not None # for mypy if customer.stripe_customer_id is not None:
stripe_customer = stripe_get_customer(customer.stripe_customer_id) stripe_customer = stripe_get_customer(customer.stripe_customer_id)
stripe_email = stripe_customer.email
if charge_automatically: if charge_automatically:
payment_method = payment_method_string(stripe_customer) payment_method = payment_method_string(stripe_customer)
else: else:
payment_method = "Billed by invoice" payment_method = "Billed by invoice"
elif settings.DEVELOPMENT: # nocoverage
# Allow access to billing page in development environment without a stripe_customer_id.
payment_method = "Payment method not populated"
stripe_email = "not_populated@zulip.com"
else: # nocoverage
raise BillingError(f"stripe_customer_id is None for {customer}")
fixed_price = ( fixed_price = (
cents_to_dollar_string(plan.fixed_price) if plan.fixed_price is not None else None cents_to_dollar_string(plan.fixed_price) if plan.fixed_price is not None else None
@ -1908,7 +1915,7 @@ class BillingSession(ABC):
"renewal_amount": cents_to_dollar_string(renewal_cents), "renewal_amount": cents_to_dollar_string(renewal_cents),
"payment_method": payment_method, "payment_method": payment_method,
"charge_automatically": charge_automatically, "charge_automatically": charge_automatically,
"stripe_email": stripe_customer.email, "stripe_email": stripe_email,
"CustomerPlan": CustomerPlan, "CustomerPlan": CustomerPlan,
"billing_frequency": billing_frequency, "billing_frequency": billing_frequency,
"fixed_price": fixed_price, "fixed_price": fixed_price,

View File

@ -39,6 +39,7 @@ from zilencer.views import update_remote_realm_data_for_server
from zproject.config import get_secret from zproject.config import get_secret
current_time = timezone_now().strftime(TIMESTAMP_FORMAT) current_time = timezone_now().strftime(TIMESTAMP_FORMAT)
communicate_with_stripe = get_secret("stripe_secret_key") is not None
@dataclass @dataclass
@ -267,6 +268,9 @@ class Command(BaseCommand):
def add_card_to_customer(customer: Customer) -> None: def add_card_to_customer(customer: Customer) -> None:
if not communicate_with_stripe:
return
assert customer.stripe_customer_id is not None assert customer.stripe_customer_id is not None
# Set the Stripe API key # Set the Stripe API key
stripe.api_key = get_secret("stripe_secret_key") stripe.api_key = get_secret("stripe_secret_key")
@ -389,8 +393,13 @@ def populate_realm(customer_profile: CustomerProfile) -> Optional[Realm]:
return realm return realm
billing_session = RealmBillingSession(user) billing_session = RealmBillingSession(user)
if communicate_with_stripe:
# This attaches stripe_customer_id to customer.
customer = billing_session.update_or_create_stripe_customer() customer = billing_session.update_or_create_stripe_customer()
assert customer.stripe_customer_id is not None assert customer.stripe_customer_id is not None
else:
customer = billing_session.update_or_create_customer()
if customer_profile.card: if customer_profile.card:
add_card_to_customer(customer) add_card_to_customer(customer)
@ -454,6 +463,16 @@ def populate_remote_server(customer_profile: CustomerProfile) -> Dict[str, str]:
tzinfo=timezone.utc tzinfo=timezone.utc
) )
billing_session.migrate_customer_to_legacy_plan(renewal_date, end_date) billing_session.migrate_customer_to_legacy_plan(renewal_date, end_date)
if not communicate_with_stripe:
# We need to communicate with stripe to upgrade here.
return {
"unique_id": unique_id,
"server_uuid": server_uuid,
"api_key": api_key,
"ERROR": "Need to communicate with stripe to populate this profile.",
}
# Scheduled server to upgrade to business plan. # Scheduled server to upgrade to business plan.
if customer_profile.status == CustomerPlan.SWITCH_PLAN_TIER_AT_PLAN_END: if customer_profile.status == CustomerPlan.SWITCH_PLAN_TIER_AT_PLAN_END:
# This attaches stripe_customer_id to customer. # This attaches stripe_customer_id to customer.
@ -474,8 +493,12 @@ def populate_remote_server(customer_profile: CustomerProfile) -> Dict[str, str]:
billing_session.do_upgrade(upgrade_request) billing_session.do_upgrade(upgrade_request)
elif customer_profile.tier == CustomerPlan.TIER_SELF_HOSTED_BUSINESS: elif customer_profile.tier == CustomerPlan.TIER_SELF_HOSTED_BUSINESS:
if communicate_with_stripe:
# This attaches stripe_customer_id to customer.
customer = billing_session.update_or_create_stripe_customer() customer = billing_session.update_or_create_stripe_customer()
assert customer.stripe_customer_id is not None assert customer.stripe_customer_id is not None
else:
customer = billing_session.update_or_create_customer()
add_card_to_customer(customer) add_card_to_customer(customer)
create_plan_for_customer(customer, customer_profile) create_plan_for_customer(customer, customer_profile)
@ -523,8 +546,12 @@ def populate_remote_realms(customer_profile: CustomerProfile) -> Dict[str, str]:
# TODO: Save property audit log data for server. # TODO: Save property audit log data for server.
remote_realm.server.last_audit_log_update = timezone_now() remote_realm.server.last_audit_log_update = timezone_now()
remote_realm.server.save(update_fields=["last_audit_log_update"]) remote_realm.server.save(update_fields=["last_audit_log_update"])
if communicate_with_stripe:
# This attaches stripe_customer_id to customer.
customer = billing_session.update_or_create_stripe_customer() customer = billing_session.update_or_create_stripe_customer()
assert customer.stripe_customer_id is not None assert customer.stripe_customer_id is not None
else:
customer = billing_session.update_or_create_customer()
add_card_to_customer(customer) add_card_to_customer(customer)
if customer_profile.tier is not None: if customer_profile.tier is not None:
billing_session.do_change_plan_type( billing_session.do_change_plan_type(