`122ca19`

Add org billing checkout result pages

Authored by mfwolffe <wolffemf@dukes.jmu.edu> yesterday

SHA: 122ca19fe434b67ab6a3065f184bef84be9e9819
Parents: 4a186b5
Tree: 7e5468e

6 changed files

Status	File	+	-
M	`docs/internal/billing.md`	11	0
M	`docs/internal/orgs.md`	4	1
M	`internal/web/handlers/orgs/billing_settings.go`	26	2
M	`internal/web/handlers/orgs/billing_test.go`	27	0
M	`internal/web/static/css/shithub.css`	30	0
A	`internal/web/templates/orgs/billing_result.html`	23	0

docs/internal/billing.mdmodified

  The operator enablement flow is documented in
  [`runbooks/stripe-billing.md`](./runbooks/stripe-billing.md).
++PAYMENTS SP04 adds the self-serve onboarding flow:
++
++- `/organizations/plan` is the canonical plan picker.
++- Free setup creates the organization locally without Stripe.
++- Team setup creates the organization, creates or reuses the Stripe
++  customer, counts billable seats, and redirects directly to hosted
++  Stripe Checkout.
++- Checkout success and cancel returns render shithub pages. Success
++  tells the owner that activation waits for webhook processing; cancel
++  keeps the organization on Free and offers a retry path.
++
  ## Entitlement architecture
  Paid feature checks must live behind a central entitlement package, not

docs/internal/orgs.mdmodified

  site admins see operator setup copy. Choosing Team creates the
  organization first and then redirects the owner to hosted Stripe
  Checkout; webhook processing, not checkout creation, activates paid
--entitlements.
++entitlements. Stripe success and cancel returns render explicit
++post-checkout pages: success explains that Team activation waits for
++webhook processing, and cancel leaves the organization on Free with a
++path to retry checkout.
  Existing owner-managed orgs also link to that billing page from
  `/settings/organizations` for plan comparison.

internal/web/handlers/orgs/billing_settings.gomodified

  	if !ok {
  		return
+ 	}
--	http.Redirect(w, r, orgBillingSettingsPath(org.Slug)+"?notice=checkout-success", http.StatusSeeOther)
++	h.renderBillingResult(w, r, org, billingResultSuccess)
+ }
  func (h *Handlers) billingCancel(w http.ResponseWriter, r *http.Request) {
  	if !ok {
  		return
+ 	}
--	http.Redirect(w, r, orgBillingSettingsPath(org.Slug)+"?notice=checkout-canceled", http.StatusSeeOther)
++	h.renderBillingResult(w, r, org, billingResultCanceled)
++}
++
++const (
++	billingResultSuccess  = "success"
++	billingResultCanceled = "canceled"
++)
++
++func (h *Handlers) renderBillingResult(w http.ResponseWriter, r *http.Request, org orgsdb.Org, result string) {
++	heading := "Checkout complete"
++	message := "Stripe accepted the checkout session. Team activation finishes after shithub receives and processes the signed Stripe webhook."
++	if result == billingResultCanceled {
++		heading = "Checkout canceled"
++		message = "No Team subscription was activated. The organization stays on Free until checkout is completed."
++	}
++	_ = h.d.Render.RenderPage(w, r, "orgs/billing_result", map[string]any{
++		"Title":       heading,
++		"CSRFToken":   middleware.CSRFTokenForRequest(r),
++		"Org":         org,
++		"AvatarURL":   "/avatars/" + url.PathEscape(org.Slug),
++		"Result":      result,
++		"Heading":     heading,
++		"Message":     message,
++		"BillingPath": orgBillingSettingsPath(org.Slug),
++	})
+ }
  func (h *Handlers) renderSettingsBilling(w http.ResponseWriter, r *http.Request, org orgsdb.Org, errMsg, notice string) {

internal/web/handlers/orgs/billing_test.gomodified

+ 	}
+ }
++func TestOrgBillingResultPagesRenderPostCheckoutState(t *testing.T) {
++	t.Parallel()
++	pool := dbtest.NewTestDB(t)
++	ownerID := insertOrgAvatarUser(t, pool, "owner")
++	insertOrgAvatarOrg(t, pool, ownerID, "acme")
++	mux := newOrgBillingMux(t, pool, ownerID, &fakeStripeRemote{})
++
++	for _, tc := range []struct {
++		path string
++		want string
++	}{
++		{path: "/organizations/acme/billing/success", want: "RESULT=success;HEADING=Checkout complete"},
++		{path: "/organizations/acme/billing/cancel", want: "RESULT=canceled;HEADING=Checkout canceled"},
++	} {
++		resp := httptest.NewRecorder()
++		req := newOrgFormRequest(http.MethodGet, tc.path, nil)
++		mux.ServeHTTP(resp, req)
++		if resp.Code != http.StatusOK {
++			t.Fatalf("%s status=%d body=%s", tc.path, resp.Code, resp.Body.String())
++		}
++		if !strings.Contains(resp.Body.String(), tc.want) {
++			t.Fatalf("%s missing %q in body %s", tc.path, tc.want, resp.Body.String())
++		}
++	}
++}
++
  func TestOrgBillingWebhookProcessesSubscriptionAndStaysIdempotent(t *testing.T) {
  	t.Parallel()
  	ctx := context.Background()
  	t.Helper()
  	tmplFS := fstest.MapFS{
  		"_layout.html":               {Data: []byte(`{{ define "layout" }}<html><body>{{ template "page" . }}</body></html>{{ end }}`)},
++		"orgs/billing_result.html":   {Data: []byte(`{{ define "page" }}RESULT={{ .Result }};HEADING={{ .Heading }};MESSAGE={{ .Message }};BILLING={{ .BillingPath }}{{ end }}`)},
  		"orgs/settings_billing.html": {Data: []byte(`{{ define "page" }}{{ with .Error }}ERROR={{ . }}{{ end }}{{ with .Notice }}NOTICE={{ . }}{{ end }}{{ range .Invoices }}INVOICE={{ .Number }};{{ end }}{{ end }}`)},
  		"errors/403.html":            {Data: []byte(`{{ define "page" }}403{{ end }}`)},
  		"errors/404.html":            {Data: []byte(`{{ define "page" }}404{{ end }}`)},

internal/web/static/css/shithub.cssmodified

    color: var(--fg-muted);
    font-size: 0.9rem;
+ }
++.shithub-billing-result {
++  display: flex;
++  justify-content: center;
++  padding: 4rem 1rem;
++}
++.shithub-billing-result-card {
++  width: min(100%, 34rem);
++  padding: 2rem;
++  text-align: center;
++  background: var(--canvas-default);
++  border: 1px solid var(--border-default);
++  border-radius: 6px;
++}
++.shithub-billing-result-card img {
++  border-radius: 50%;
++}
++.shithub-billing-result-card h1 {
++  margin: 0.5rem 0 0.75rem;
++  font-size: 1.6rem;
++}
++.shithub-billing-result-card p {
++  color: var(--fg-muted);
++}
++.shithub-billing-result-actions {
++  display: flex;
++  flex-wrap: wrap;
++  justify-content: center;
++  gap: 0.75rem;
++  margin-top: 1.5rem;
++}
  .shithub-org-billing-compare {
    margin-top: 0;
+ }

internal/web/templates/orgs/billing_result.htmladded

++{{ define "page" -}}
++<section class="shithub-billing-result">
++  <div class="shithub-billing-result-card">
++    <img src="{{ .AvatarURL }}" alt="" width="48" height="48">
++    <p class="shithub-org-plan-kicker">{{ if eq .Result "success" }}Payment setup{{ else }}Team checkout{{ end }}</p>
++    <h1>{{ .Heading }}</h1>
++    <p>{{ .Message }}</p>
++
++    <div class="shithub-billing-result-actions">
++      {{ if eq .Result "success" }}
++      <a href="{{ .BillingPath }}" class="shithub-button shithub-button-primary">View billing and plans</a>
++      <a href="/{{ .Org.Slug }}" class="shithub-button">Go to organization</a>
++      {{ else }}
++      <form method="POST" action="/organizations/{{ .Org.Slug }}/billing/checkout">
++        <input type="hidden" name="csrf_token" value="{{ .CSRFToken }}">
++        <button type="submit" class="shithub-button shithub-button-primary">Continue with Team</button>
++      </form>
++      <a href="{{ .BillingPath }}" class="shithub-button">Keep Free for now</a>
++      {{ end }}
++    </div>
++  </div>
++</section>
++{{- end }}