diff --git a/.rubocop.yml b/.rubocop.yml
index 16773cd4c..c0d945b70 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -11,3 +11,5 @@ AllCops:
Exclude:
- 'db/migrate/**/*'
- 'db/schema*.rb'
+ - 'saas/db/migrate/**/*'
+ - 'saas/db/saas_schema.rb'
diff --git a/Gemfile.saas b/Gemfile.saas
index 2366e80aa..05e6bbabd 100644
--- a/Gemfile.saas
+++ b/Gemfile.saas
@@ -6,7 +6,7 @@ git_source(:bc) { |repo| "https://github.com/basecamp/#{repo}" }
gem "activeresource", require: "active_resource"
gem "stripe", "~> 18.0"
gem "queenbee", bc: "queenbee-plugin"
-gem "fizzy-saas", bc: "fizzy-saas"
+gem "fizzy-saas", path: "saas"
gem "console1984", bc: "console1984"
gem "audits1984", bc: "audits1984"
diff --git a/Gemfile.saas.lock b/Gemfile.saas.lock
index bd811d9d6..576bbc731 100644
--- a/Gemfile.saas.lock
+++ b/Gemfile.saas.lock
@@ -19,28 +19,6 @@ GIT
rails (>= 7.0)
rainbow
-GIT
- remote: https://github.com/basecamp/fizzy-saas
- revision: 8eaa692316bb27ed73bd628b4735082585498ca0
- specs:
- fizzy-saas (0.1.0)
- audits1984
- console1984
- prometheus-client-mmap (~> 1.4.0)
- queenbee
- rails (>= 8.1.0.beta1)
- rails_structured_logging
- sentry-rails
- sentry-ruby
- yabeda
- yabeda-actioncable
- yabeda-activejob
- yabeda-gc
- yabeda-http_requests
- yabeda-prometheus-mmap
- yabeda-puma-plugin
- yabeda-rails (>= 0.10)
-
GIT
remote: https://github.com/basecamp/lexxy
revision: 7c197c0afc7095c89df9cb6e24484df9e7212ac8
@@ -181,6 +159,27 @@ GIT
tsort (>= 0.2)
zeitwerk (~> 2.6)
+PATH
+ remote: saas
+ specs:
+ fizzy-saas (0.1.0)
+ audits1984
+ console1984
+ prometheus-client-mmap (~> 1.4.0)
+ queenbee
+ rails (>= 8.1.0.beta1)
+ rails_structured_logging
+ sentry-rails
+ sentry-ruby
+ yabeda
+ yabeda-actioncable
+ yabeda-activejob
+ yabeda-gc
+ yabeda-http_requests
+ yabeda-prometheus-mmap
+ yabeda-puma-plugin
+ yabeda-rails (>= 0.10)
+
GEM
remote: https://rubygems.org/
specs:
diff --git a/bin/setup b/bin/setup
index e1a9dabb8..a49eaa9d4 100755
--- a/bin/setup
+++ b/bin/setup
@@ -136,8 +136,7 @@ bundle config set --local auto_install true
step "Installing RubyGems" bundle install
if [ -n "$SAAS" ]; then
- saas_setup=$(bundle show fizzy-saas)/bin/setup
- source "$saas_setup"
+ source "$app_root/saas/bin/setup"
else
if [ "$DATABASE_ADAPTER" = "mysql" ]; then
oss_mysql_setup
diff --git a/config/database.yml b/config/database.yml
index d5ab7dbc0..359ac6655 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -1,6 +1,6 @@
<%
config_path = if Fizzy.saas?
- gem_path = Gem::Specification.find_by_name("fizzy-saas").gem_dir
+ gem_path = Rails.root.join("saas").to_s
File.join(gem_path, "config", "database.yml")
else
File.join("config", "database.#{Fizzy.db_adapter}.yml")
diff --git a/saas/.kamal/hooks/post-deploy b/saas/.kamal/hooks/post-deploy
new file mode 100755
index 000000000..871506078
--- /dev/null
+++ b/saas/.kamal/hooks/post-deploy
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+MESSAGE="$KAMAL_PERFORMER deployed $KAMAL_SERVICE_VERSION to $KAMAL_DESTINATION in $KAMAL_RUNTIME seconds"
+CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+
+bin/notify_dash_of_deployment "$MESSAGE" $KAMAL_VERSION $KAMAL_PERFORMER $CURRENT_BRANCH $KAMAL_DESTINATION $KAMAL_RUNTIME
+
+if [[ $CURRENT_BRANCH == "main" && $KAMAL_DESTINATION == "production" ]]; then
+ gh release create $KAMAL_SERVICE_VERSION --target $KAMAL_VERSION --generate-notes 2> /dev/null || true
+
+ RELEASE_URL=$(gh release view $KAMAL_SERVICE_VERSION --json url,body --jq .url)
+ RELEASE_BODY=$(gh release view $KAMAL_SERVICE_VERSION --json url,body --jq .body)
+
+ bin/broadcast_to_bc "$MESSAGE "$'\n'"$RELEASE_URL "$'\n'"$RELEASE_BODY"
+else
+ bin/broadcast_to_bc "$MESSAGE"
+fi
diff --git a/saas/.kamal/hooks/pre-connect b/saas/.kamal/hooks/pre-connect
new file mode 100755
index 000000000..39c98c167
--- /dev/null
+++ b/saas/.kamal/hooks/pre-connect
@@ -0,0 +1,82 @@
+#!/usr/bin/env bash
+
+# Validate hostnames are FQDNs ending in -int.37signals.com
+if command -v yq >/dev/null 2>&1; then
+ declare -A SUGGESTIONS
+ while IFS= read -r host; do
+ if [[ ! $host =~ -int\.37signals\.com$ ]]; then
+ if [[ $host =~ -4[0-9]{2}$ ]]; then
+ SUGGESTIONS["$host"]="$host.df-ams-int.37signals.com"
+ elif [[ $host =~ -1[0-9]{2}$ ]]; then
+ SUGGESTIONS["$host"]="$host.df-iad-int.37signals.com"
+ else
+ SUGGESTIONS["$host"]="$host.sc-chi-int.37signals.com"
+ fi
+ fi
+ done < <(bin/kamal config -d "${KAMAL_DESTINATION:-production}" 2>/dev/null | yq -r '.":hosts"[]')
+
+ if [ ${#SUGGESTIONS[@]} -gt 0 ]; then
+ echo "Unqualified hostnames found in config/deploy.${KAMAL_DESTINATION:-production}.yml:" >&2
+ echo "" >&2
+ echo "Update to use fully-qualified hostnames:" >&2
+ for host in "${!SUGGESTIONS[@]}"; do
+ echo " $host → ${SUGGESTIONS[$host]}" >&2
+ done
+ exit 1
+ fi
+fi
+
+# Verify Tailscale connection and SSH authentication before deploying.
+tailscale_cmd() {
+ if command -v tailscale >/dev/null 2>&1; then
+ tailscale "$@"
+ elif [ -f "/Applications/Tailscale.app/Contents/MacOS/Tailscale" ]; then
+ env TAILSCALE_BE_CLI=1 /Applications/Tailscale.app/Contents/MacOS/Tailscale "$@"
+ else
+ return 1
+ fi
+}
+
+on_tailscale() {
+ tailscale_cmd status --json 2>/dev/null | jq -e '.Self.Online' >/dev/null 2>&1
+}
+
+# Check Tailscale connection
+if ! on_tailscale; then
+ echo "" >&2
+ echo "You must be connected to Tailscale to deploy." >&2
+ echo "" >&2
+ echo "→ Connect to Tailscale and try again" >&2
+ echo "" >&2
+ exit 1
+fi
+
+# Verify SSH access
+echo "Deploying via Tailscale. Verifying SSH access…" >&2
+
+TEST_HOST="fizzy-app-101.df-iad-int.37signals.com"
+
+SSH_OUTPUT=$(ssh -o ConnectTimeout=5 "app@$TEST_HOST" true 2>&1)
+SSH_EXIT=$?
+
+echo "$SSH_OUTPUT" >&2
+
+if echo "$SSH_OUTPUT" | grep -q "Permission denied"; then
+ GITHUB_USER=$(gh api user 2>/dev/null | jq -r '.login // "unknown"')
+ GITHUB_KEYS_URL="https://github.com/${GITHUB_USER}.keys"
+
+ echo "" >&2
+ echo "ERROR: SSH authentication failed" >&2
+ echo "" >&2
+ echo "You must deploy with an SSH key that's on your GitHub account." >&2
+ echo "" >&2
+ echo "→ Verify your public key is at $GITHUB_KEYS_URL" >&2
+ echo " Add it at https://github.com/settings/keys if not" >&2
+ echo "" >&2
+ echo "Note that SSH keys are pulled from GitHub every 5 minutes, so if you've" >&2
+ echo "just added a new key to GitHub, try again in five." >&2
+ echo "" >&2
+ exit 1
+fi
+
+exit $SSH_EXIT
diff --git a/saas/.kamal/secrets.beta b/saas/.kamal/secrets.beta
new file mode 100644
index 000000000..0fb3db660
--- /dev/null
+++ b/saas/.kamal/secrets.beta
@@ -0,0 +1,26 @@
+SECRETS=$(kamal secrets fetch --adapter 1password --account basecamp --from Deploy/Fizzy Deployments/BASECAMP_REGISTRY_PASSWORD Deployments/DASH_BASIC_AUTH_SECRET Beta/RAILS_MASTER_KEY Beta/MYSQL_ALTER_PASSWORD Beta/MYSQL_ALTER_USER Beta/MYSQL_APP_PASSWORD Beta/MYSQL_APP_USER Beta/MYSQL_READONLY_PASSWORD Beta/MYSQL_READONLY_USER Beta/SECRET_KEY_BASE Beta/VAPID_PUBLIC_KEY Beta/VAPID_PRIVATE_KEY Beta/ACTIVE_STORAGE_ACCESS_KEY_ID Beta/ACTIVE_STORAGE_SECRET_ACCESS_KEY Beta/QUEENBEE_API_TOKEN Beta/SIGNAL_ID_SECRET Beta/SENTRY_DSN Beta/ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY Beta/ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY Beta/ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT Beta/STRIPE_MONTHLY_V1_PRICE_ID Beta/STRIPE_SECRET_KEY Beta/STRIPE_WEBHOOK_SECRET)
+
+GITHUB_TOKEN=$(gh config get -h github.com oauth_token)
+BASECAMP_REGISTRY_PASSWORD=$(kamal secrets extract BASECAMP_REGISTRY_PASSWORD $SECRETS)
+DASH_BASIC_AUTH_SECRET=$(kamal secrets extract DASH_BASIC_AUTH_SECRET $SECRETS)
+RAILS_MASTER_KEY=$(kamal secrets extract RAILS_MASTER_KEY $SECRETS)
+MYSQL_ALTER_PASSWORD=$(kamal secrets extract MYSQL_ALTER_PASSWORD $SECRETS)
+MYSQL_ALTER_USER=$(kamal secrets extract MYSQL_ALTER_USER $SECRETS)
+MYSQL_APP_PASSWORD=$(kamal secrets extract MYSQL_APP_PASSWORD $SECRETS)
+MYSQL_APP_USER=$(kamal secrets extract MYSQL_APP_USER $SECRETS)
+MYSQL_READONLY_PASSWORD=$(kamal secrets extract MYSQL_READONLY_PASSWORD $SECRETS)
+MYSQL_READONLY_USER=$(kamal secrets extract MYSQL_READONLY_USER $SECRETS)
+SECRET_KEY_BASE=$(kamal secrets extract SECRET_KEY_BASE $SECRETS)
+VAPID_PUBLIC_KEY=$(kamal secrets extract VAPID_PUBLIC_KEY $SECRETS)
+VAPID_PRIVATE_KEY=$(kamal secrets extract VAPID_PRIVATE_KEY $SECRETS)
+ACTIVE_STORAGE_ACCESS_KEY_ID=$(kamal secrets extract ACTIVE_STORAGE_ACCESS_KEY_ID $SECRETS)
+ACTIVE_STORAGE_SECRET_ACCESS_KEY=$(kamal secrets extract ACTIVE_STORAGE_SECRET_ACCESS_KEY $SECRETS)
+QUEENBEE_API_TOKEN=$(kamal secrets extract QUEENBEE_API_TOKEN $SECRETS)
+SIGNAL_ID_SECRET=$(kamal secrets extract SIGNAL_ID_SECRET $SECRETS)
+SENTRY_DSN=$(kamal secrets extract SENTRY_DSN $SECRETS)
+ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=$(kamal secrets extract ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY $SECRETS)
+ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=$(kamal secrets extract ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY $SECRETS)
+ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=$(kamal secrets extract ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT $SECRETS)
+STRIPE_MONTHLY_V1_PRICE_ID=$(kamal secrets extract STRIPE_MONTHLY_V1_PRICE_ID $SECRETS)
+STRIPE_SECRET_KEY=$(kamal secrets extract STRIPE_SECRET_KEY $SECRETS)
+STRIPE_WEBHOOK_SECRET=$(kamal secrets extract STRIPE_WEBHOOK_SECRET $SECRETS)
diff --git a/saas/.kamal/secrets.production b/saas/.kamal/secrets.production
new file mode 100644
index 000000000..672359a13
--- /dev/null
+++ b/saas/.kamal/secrets.production
@@ -0,0 +1,26 @@
+SECRETS=$(kamal secrets fetch --adapter 1password --account basecamp --from Deploy/Fizzy Deployments/BASECAMP_REGISTRY_PASSWORD Deployments/DASH_BASIC_AUTH_SECRET Production/RAILS_MASTER_KEY Production/MYSQL_ALTER_PASSWORD Production/MYSQL_ALTER_USER Production/MYSQL_APP_PASSWORD Production/MYSQL_APP_USER Production/MYSQL_READONLY_PASSWORD Production/MYSQL_READONLY_USER Production/SECRET_KEY_BASE Production/VAPID_PUBLIC_KEY Production/VAPID_PRIVATE_KEY Production/ACTIVE_STORAGE_ACCESS_KEY_ID Production/ACTIVE_STORAGE_SECRET_ACCESS_KEY Production/QUEENBEE_API_TOKEN Production/SIGNAL_ID_SECRET Production/SENTRY_DSN Production/ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY Production/ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY Production/ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT Production/STRIPE_MONTHLY_V1_PRICE_ID Production/STRIPE_SECRET_KEY Production/STRIPE_WEBHOOK_SECRET)
+
+GITHUB_TOKEN=$(gh config get -h github.com oauth_token)
+BASECAMP_REGISTRY_PASSWORD=$(kamal secrets extract BASECAMP_REGISTRY_PASSWORD $SECRETS)
+DASH_BASIC_AUTH_SECRET=$(kamal secrets extract DASH_BASIC_AUTH_SECRET $SECRETS)
+RAILS_MASTER_KEY=$(kamal secrets extract RAILS_MASTER_KEY $SECRETS)
+MYSQL_ALTER_PASSWORD=$(kamal secrets extract MYSQL_ALTER_PASSWORD $SECRETS)
+MYSQL_ALTER_USER=$(kamal secrets extract MYSQL_ALTER_USER $SECRETS)
+MYSQL_APP_PASSWORD=$(kamal secrets extract MYSQL_APP_PASSWORD $SECRETS)
+MYSQL_APP_USER=$(kamal secrets extract MYSQL_APP_USER $SECRETS)
+MYSQL_READONLY_PASSWORD=$(kamal secrets extract MYSQL_READONLY_PASSWORD $SECRETS)
+MYSQL_READONLY_USER=$(kamal secrets extract MYSQL_READONLY_USER $SECRETS)
+SECRET_KEY_BASE=$(kamal secrets extract SECRET_KEY_BASE $SECRETS)
+VAPID_PUBLIC_KEY=$(kamal secrets extract VAPID_PUBLIC_KEY $SECRETS)
+VAPID_PRIVATE_KEY=$(kamal secrets extract VAPID_PRIVATE_KEY $SECRETS)
+ACTIVE_STORAGE_ACCESS_KEY_ID=$(kamal secrets extract ACTIVE_STORAGE_ACCESS_KEY_ID $SECRETS)
+ACTIVE_STORAGE_SECRET_ACCESS_KEY=$(kamal secrets extract ACTIVE_STORAGE_SECRET_ACCESS_KEY $SECRETS)
+QUEENBEE_API_TOKEN=$(kamal secrets extract QUEENBEE_API_TOKEN $SECRETS)
+SIGNAL_ID_SECRET=$(kamal secrets extract SIGNAL_ID_SECRET $SECRETS)
+SENTRY_DSN=$(kamal secrets extract SENTRY_DSN $SECRETS)
+ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=$(kamal secrets extract ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY $SECRETS)
+ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=$(kamal secrets extract ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY $SECRETS)
+ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=$(kamal secrets extract ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT $SECRETS)
+STRIPE_MONTHLY_V1_PRICE_ID=$(kamal secrets extract STRIPE_MONTHLY_V1_PRICE_ID $SECRETS)
+STRIPE_SECRET_KEY=$(kamal secrets extract STRIPE_SECRET_KEY $SECRETS)
+STRIPE_WEBHOOK_SECRET=$(kamal secrets extract STRIPE_WEBHOOK_SECRET $SECRETS)
diff --git a/saas/.kamal/secrets.staging b/saas/.kamal/secrets.staging
new file mode 100644
index 000000000..7121f5e3a
--- /dev/null
+++ b/saas/.kamal/secrets.staging
@@ -0,0 +1,26 @@
+SECRETS=$(kamal secrets fetch --adapter 1password --account basecamp --from Deploy/Fizzy Deployments/BASECAMP_REGISTRY_PASSWORD Deployments/DASH_BASIC_AUTH_SECRET Staging/RAILS_MASTER_KEY Staging/MYSQL_ALTER_PASSWORD Staging/MYSQL_ALTER_USER Staging/MYSQL_APP_PASSWORD Staging/MYSQL_APP_USER Staging/MYSQL_READONLY_PASSWORD Staging/MYSQL_READONLY_USER Staging/SECRET_KEY_BASE Staging/VAPID_PUBLIC_KEY Staging/VAPID_PRIVATE_KEY Staging/ACTIVE_STORAGE_ACCESS_KEY_ID Staging/ACTIVE_STORAGE_SECRET_ACCESS_KEY Staging/QUEENBEE_API_TOKEN Staging/SIGNAL_ID_SECRET Staging/SENTRY_DSN Staging/ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY Staging/ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY Staging/ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT Staging/STRIPE_MONTHLY_V1_PRICE_ID Staging/STRIPE_SECRET_KEY Staging/STRIPE_WEBHOOK_SECRET)
+
+GITHUB_TOKEN=$(gh config get -h github.com oauth_token)
+BASECAMP_REGISTRY_PASSWORD=$(kamal secrets extract BASECAMP_REGISTRY_PASSWORD $SECRETS)
+DASH_BASIC_AUTH_SECRET=$(kamal secrets extract DASH_BASIC_AUTH_SECRET $SECRETS)
+RAILS_MASTER_KEY=$(kamal secrets extract RAILS_MASTER_KEY $SECRETS)
+MYSQL_ALTER_PASSWORD=$(kamal secrets extract MYSQL_ALTER_PASSWORD $SECRETS)
+MYSQL_ALTER_USER=$(kamal secrets extract MYSQL_ALTER_USER $SECRETS)
+MYSQL_APP_PASSWORD=$(kamal secrets extract MYSQL_APP_PASSWORD $SECRETS)
+MYSQL_APP_USER=$(kamal secrets extract MYSQL_APP_USER $SECRETS)
+MYSQL_READONLY_PASSWORD=$(kamal secrets extract MYSQL_READONLY_PASSWORD $SECRETS)
+MYSQL_READONLY_USER=$(kamal secrets extract MYSQL_READONLY_USER $SECRETS)
+SECRET_KEY_BASE=$(kamal secrets extract SECRET_KEY_BASE $SECRETS)
+VAPID_PUBLIC_KEY=$(kamal secrets extract VAPID_PUBLIC_KEY $SECRETS)
+VAPID_PRIVATE_KEY=$(kamal secrets extract VAPID_PRIVATE_KEY $SECRETS)
+ACTIVE_STORAGE_ACCESS_KEY_ID=$(kamal secrets extract ACTIVE_STORAGE_ACCESS_KEY_ID $SECRETS)
+ACTIVE_STORAGE_SECRET_ACCESS_KEY=$(kamal secrets extract ACTIVE_STORAGE_SECRET_ACCESS_KEY $SECRETS)
+QUEENBEE_API_TOKEN=$(kamal secrets extract QUEENBEE_API_TOKEN $SECRETS)
+SIGNAL_ID_SECRET=$(kamal secrets extract SIGNAL_ID_SECRET $SECRETS)
+SENTRY_DSN=$(kamal secrets extract SENTRY_DSN $SECRETS)
+ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=$(kamal secrets extract ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY $SECRETS)
+ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=$(kamal secrets extract ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY $SECRETS)
+ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=$(kamal secrets extract ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT $SECRETS)
+STRIPE_MONTHLY_V1_PRICE_ID=$(kamal secrets extract STRIPE_MONTHLY_V1_PRICE_ID $SECRETS)
+STRIPE_SECRET_KEY=$(kamal secrets extract STRIPE_SECRET_KEY $SECRETS)
+STRIPE_WEBHOOK_SECRET=$(kamal secrets extract STRIPE_WEBHOOK_SECRET $SECRETS)
diff --git a/saas/Dockerfile b/saas/Dockerfile
new file mode 100644
index 000000000..92fd9c4ec
--- /dev/null
+++ b/saas/Dockerfile
@@ -0,0 +1,84 @@
+# Make sure RUBY_VERSION matches the Ruby version in .ruby-version
+ARG RUBY_VERSION=3.4.7
+FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim AS base
+
+# Rails app lives here
+WORKDIR /rails
+
+# Set production environment
+ENV RAILS_ENV="production" \
+ BUNDLE_DEPLOYMENT="1" \
+ SAAS="1" \
+ BUNDLE_PATH="/usr/local/bundle" \
+ BUNDLE_GEMFILE="Gemfile.saas" \
+ BUNDLE_WITHOUT="development"
+
+
+# Throw-away build stage to reduce size of final image
+FROM base AS build
+
+# Install packages needed to build gems
+RUN apt-get update -qq && \
+ apt-get install -y --no-install-recommends -y build-essential pkg-config git libvips libyaml-dev libssl-dev && \
+ rm -rf /var/lib/apt/lists /var/cache/apt/archives
+
+# Install application gems
+COPY Gemfile Gemfile.lock Gemfile.saas Gemfile.saas.lock .ruby-version ./
+COPY lib/fizzy.rb ./lib/fizzy.rb
+COPY saas/fizzy-saas.gemspec ./saas/
+COPY saas/lib/fizzy/saas/version.rb ./saas/lib/fizzy/saas/
+RUN --mount=type=secret,id=GITHUB_TOKEN --mount=type=cache,id=fizzy-permabundle-${RUBY_VERSION},sharing=locked,target=/permabundle \
+ gem install bundler && \
+ BUNDLE_PATH=/permabundle BUNDLE_GITHUB__COM="$(cat /run/secrets/GITHUB_TOKEN):x-oauth-basic" bundle install && \
+ cp -a /permabundle/. "$BUNDLE_PATH"/ && \
+ bundle clean --force && \
+ rm -rf "$BUNDLE_PATH"/ruby/*/bundler/gems/*/.git && \
+ find "$BUNDLE_PATH" -type f \( -name '*.gem' -o -iname '*.a' -o -iname '*.o' -o -iname '*.h' -o -iname '*.c' -o -iname '*.hpp' -o -iname '*.cpp' \) -delete && \
+ bundle exec bootsnap precompile --gemfile
+
+# Copy application code
+COPY . .
+
+# Precompile bootsnap code for faster boot times
+RUN bundle exec bootsnap precompile app/ lib/
+
+# Precompiling assets for production
+RUN SECRET_KEY_BASE_DUMMY=1 \
+ ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=1 \
+ ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=1 \
+ ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=1 \
+ ./bin/rails assets:precompile
+
+# Final stage for app image
+FROM base
+
+# Install packages needed for deployment
+RUN apt-get update -qq && \
+ apt-get install --no-install-recommends -y curl libsqlite3-0 libvips build-essential ffmpeg groff libreoffice-writer libreoffice-impress libreoffice-calc mupdf-tools sqlite3 libjemalloc-dev && \
+ rm -rf /var/lib/apt/lists /var/cache/apt/archives
+
+# Copy built artifacts: gems, application
+COPY --from=build /usr/local/bundle /usr/local/bundle
+COPY --from=build /rails /rails
+
+# Run and own only the runtime files as a non-root user for security
+RUN useradd rails --create-home --shell /bin/bash && \
+ chown -R rails:rails db log storage tmp
+USER rails:rails
+
+# Entrypoint prepares the database.
+ENTRYPOINT ["/rails/bin/docker-entrypoint"]
+
+# Ruby GC tuning values pulled from Autotuner recommendations
+ENV RUBY_GC_HEAP_0_INIT_SLOTS=692636 \
+ RUBY_GC_HEAP_1_INIT_SLOTS=175943 \
+ RUBY_GC_HEAP_2_INIT_SLOTS=148807 \
+ RUBY_GC_HEAP_3_INIT_SLOTS=9169 \
+ RUBY_GC_HEAP_4_INIT_SLOTS=3054 \
+ RUBY_GC_MALLOC_LIMIT=67108864 \
+ RUBY_GC_MALLOC_LIMIT_MAX=134217728 \
+ LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.2
+
+# Start the server by default, this can be overwritten at runtime
+EXPOSE 80 443 9394
+CMD ["./bin/thrust", "./bin/rails", "server"]
diff --git a/saas/Gemfile b/saas/Gemfile
new file mode 100644
index 000000000..bb3829719
--- /dev/null
+++ b/saas/Gemfile
@@ -0,0 +1,9 @@
+source "https://rubygems.org"
+git_source(:bc) { |repo| "https://github.com/basecamp/#{repo}" }
+
+# 37id and Queenbee integration
+gem "queenbee", bc: "queenbee-plugin", ref: "14312a940471e20617b38cdec7c092a01567d18b"
+gem "rails_structured_logging", bc: "rails-structured-logging"
+gem "activeresource", require: "active_resource" # needed by queenbee
+
+gem "rubocop-rails-omakase", require: false
diff --git a/saas/Gemfile.lock b/saas/Gemfile.lock
new file mode 100644
index 000000000..16c647b27
--- /dev/null
+++ b/saas/Gemfile.lock
@@ -0,0 +1,291 @@
+GIT
+ remote: https://github.com/basecamp/queenbee-plugin
+ revision: 14312a940471e20617b38cdec7c092a01567d18b
+ ref: 14312a940471e20617b38cdec7c092a01567d18b
+ specs:
+ queenbee (3.2.0)
+ activeresource
+ builder
+ rexml
+
+GIT
+ remote: https://github.com/basecamp/rails-structured-logging
+ revision: 76960cb5c15fc2b6b5f7542e05d7dcc031cef9e6
+ specs:
+ rails_structured_logging (0.2.1)
+ json
+ rails (>= 6.0.0)
+
+GEM
+ remote: https://rubygems.org/
+ specs:
+ action_text-trix (2.1.15)
+ railties
+ actioncable (8.1.1)
+ actionpack (= 8.1.1)
+ activesupport (= 8.1.1)
+ nio4r (~> 2.0)
+ websocket-driver (>= 0.6.1)
+ zeitwerk (~> 2.6)
+ actionmailbox (8.1.1)
+ actionpack (= 8.1.1)
+ activejob (= 8.1.1)
+ activerecord (= 8.1.1)
+ activestorage (= 8.1.1)
+ activesupport (= 8.1.1)
+ mail (>= 2.8.0)
+ actionmailer (8.1.1)
+ actionpack (= 8.1.1)
+ actionview (= 8.1.1)
+ activejob (= 8.1.1)
+ activesupport (= 8.1.1)
+ mail (>= 2.8.0)
+ rails-dom-testing (~> 2.2)
+ actionpack (8.1.1)
+ actionview (= 8.1.1)
+ activesupport (= 8.1.1)
+ nokogiri (>= 1.8.5)
+ rack (>= 2.2.4)
+ rack-session (>= 1.0.1)
+ rack-test (>= 0.6.3)
+ rails-dom-testing (~> 2.2)
+ rails-html-sanitizer (~> 1.6)
+ useragent (~> 0.16)
+ actiontext (8.1.1)
+ action_text-trix (~> 2.1.15)
+ actionpack (= 8.1.1)
+ activerecord (= 8.1.1)
+ activestorage (= 8.1.1)
+ activesupport (= 8.1.1)
+ globalid (>= 0.6.0)
+ nokogiri (>= 1.8.5)
+ actionview (8.1.1)
+ activesupport (= 8.1.1)
+ builder (~> 3.1)
+ erubi (~> 1.11)
+ rails-dom-testing (~> 2.2)
+ rails-html-sanitizer (~> 1.6)
+ activejob (8.1.1)
+ activesupport (= 8.1.1)
+ globalid (>= 0.3.6)
+ activemodel (8.1.1)
+ activesupport (= 8.1.1)
+ activemodel-serializers-xml (1.0.3)
+ activemodel (>= 5.0.0.a)
+ activesupport (>= 5.0.0.a)
+ builder (~> 3.1)
+ activerecord (8.1.1)
+ activemodel (= 8.1.1)
+ activesupport (= 8.1.1)
+ timeout (>= 0.4.0)
+ activeresource (6.1.4)
+ activemodel (>= 6.0)
+ activemodel-serializers-xml (~> 1.0)
+ activesupport (>= 6.0)
+ activestorage (8.1.1)
+ actionpack (= 8.1.1)
+ activejob (= 8.1.1)
+ activerecord (= 8.1.1)
+ activesupport (= 8.1.1)
+ marcel (~> 1.0)
+ activesupport (8.1.1)
+ base64
+ bigdecimal
+ concurrent-ruby (~> 1.0, >= 1.3.1)
+ connection_pool (>= 2.2.5)
+ drb
+ i18n (>= 1.6, < 2)
+ json
+ logger (>= 1.4.2)
+ minitest (>= 5.1)
+ securerandom (>= 0.3)
+ tzinfo (~> 2.0, >= 2.0.5)
+ uri (>= 0.13.1)
+ ast (2.4.3)
+ base64 (0.3.0)
+ bigdecimal (3.2.3)
+ builder (3.3.0)
+ concurrent-ruby (1.3.5)
+ connection_pool (2.5.4)
+ crass (1.0.6)
+ date (3.5.0)
+ drb (2.2.3)
+ erb (6.0.0)
+ erubi (1.13.1)
+ globalid (1.3.0)
+ activesupport (>= 6.1)
+ i18n (1.14.7)
+ concurrent-ruby (~> 1.0)
+ io-console (0.8.1)
+ irb (1.15.3)
+ pp (>= 0.6.0)
+ rdoc (>= 4.0.0)
+ reline (>= 0.4.2)
+ json (2.16.0)
+ language_server-protocol (3.17.0.5)
+ lint_roller (1.1.0)
+ logger (1.7.0)
+ loofah (2.24.1)
+ crass (~> 1.0.2)
+ nokogiri (>= 1.12.0)
+ mail (2.9.0)
+ logger
+ mini_mime (>= 0.1.1)
+ net-imap
+ net-pop
+ net-smtp
+ marcel (1.1.0)
+ mini_mime (1.1.5)
+ minitest (5.25.5)
+ net-imap (0.5.12)
+ date
+ net-protocol
+ net-pop (0.1.2)
+ net-protocol
+ net-protocol (0.2.2)
+ timeout
+ net-smtp (0.5.1)
+ net-protocol
+ nio4r (2.7.5)
+ nokogiri (1.18.10-aarch64-linux-gnu)
+ racc (~> 1.4)
+ nokogiri (1.18.10-aarch64-linux-musl)
+ racc (~> 1.4)
+ nokogiri (1.18.10-arm-linux-gnu)
+ racc (~> 1.4)
+ nokogiri (1.18.10-arm-linux-musl)
+ racc (~> 1.4)
+ nokogiri (1.18.10-arm64-darwin)
+ racc (~> 1.4)
+ nokogiri (1.18.10-x86_64-darwin)
+ racc (~> 1.4)
+ nokogiri (1.18.10-x86_64-linux-gnu)
+ racc (~> 1.4)
+ nokogiri (1.18.10-x86_64-linux-musl)
+ racc (~> 1.4)
+ parallel (1.27.0)
+ parser (3.3.10.0)
+ ast (~> 2.4.1)
+ racc
+ pp (0.6.3)
+ prettyprint
+ prettyprint (0.2.0)
+ prism (1.6.0)
+ psych (5.2.6)
+ date
+ stringio
+ racc (1.8.1)
+ rack (3.2.4)
+ rack-session (2.1.1)
+ base64 (>= 0.1.0)
+ rack (>= 3.0.0)
+ rack-test (2.2.0)
+ rack (>= 1.3)
+ rackup (2.2.1)
+ rack (>= 3)
+ rails (8.1.1)
+ actioncable (= 8.1.1)
+ actionmailbox (= 8.1.1)
+ actionmailer (= 8.1.1)
+ actionpack (= 8.1.1)
+ actiontext (= 8.1.1)
+ actionview (= 8.1.1)
+ activejob (= 8.1.1)
+ activemodel (= 8.1.1)
+ activerecord (= 8.1.1)
+ activestorage (= 8.1.1)
+ activesupport (= 8.1.1)
+ bundler (>= 1.15.0)
+ railties (= 8.1.1)
+ rails-dom-testing (2.3.0)
+ activesupport (>= 5.0.0)
+ minitest
+ nokogiri (>= 1.6)
+ rails-html-sanitizer (1.6.2)
+ loofah (~> 2.21)
+ nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+ railties (8.1.1)
+ actionpack (= 8.1.1)
+ activesupport (= 8.1.1)
+ irb (~> 1.13)
+ rackup (>= 1.0.0)
+ rake (>= 12.2)
+ thor (~> 1.0, >= 1.2.2)
+ tsort (>= 0.2)
+ zeitwerk (~> 2.6)
+ rainbow (3.1.1)
+ rake (13.3.1)
+ rdoc (6.15.1)
+ erb
+ psych (>= 4.0.0)
+ tsort
+ regexp_parser (2.11.3)
+ reline (0.6.3)
+ io-console (~> 0.5)
+ rexml (3.4.4)
+ rubocop (1.81.7)
+ json (~> 2.3)
+ language_server-protocol (~> 3.17.0.2)
+ lint_roller (~> 1.1.0)
+ parallel (~> 1.10)
+ parser (>= 3.3.0.2)
+ rainbow (>= 2.2.2, < 4.0)
+ regexp_parser (>= 2.9.3, < 3.0)
+ rubocop-ast (>= 1.47.1, < 2.0)
+ ruby-progressbar (~> 1.7)
+ unicode-display_width (>= 2.4.0, < 4.0)
+ rubocop-ast (1.48.0)
+ parser (>= 3.3.7.2)
+ prism (~> 1.4)
+ rubocop-performance (1.26.1)
+ lint_roller (~> 1.1)
+ rubocop (>= 1.75.0, < 2.0)
+ rubocop-ast (>= 1.47.1, < 2.0)
+ rubocop-rails (2.34.2)
+ activesupport (>= 4.2.0)
+ lint_roller (~> 1.1)
+ rack (>= 1.1)
+ rubocop (>= 1.75.0, < 2.0)
+ rubocop-ast (>= 1.44.0, < 2.0)
+ rubocop-rails-omakase (1.1.0)
+ rubocop (>= 1.72)
+ rubocop-performance (>= 1.24)
+ rubocop-rails (>= 2.30)
+ ruby-progressbar (1.13.0)
+ securerandom (0.4.1)
+ stringio (3.1.8)
+ thor (1.4.0)
+ timeout (0.4.4)
+ tsort (0.2.0)
+ tzinfo (2.0.6)
+ concurrent-ruby (~> 1.0)
+ unicode-display_width (3.2.0)
+ unicode-emoji (~> 4.1)
+ unicode-emoji (4.1.0)
+ uri (1.0.3)
+ useragent (0.16.11)
+ websocket-driver (0.8.0)
+ base64
+ websocket-extensions (>= 0.1.0)
+ websocket-extensions (0.1.5)
+ zeitwerk (2.7.3)
+
+PLATFORMS
+ aarch64-linux-gnu
+ aarch64-linux-musl
+ arm-linux-gnu
+ arm-linux-musl
+ arm64-darwin
+ x86_64-darwin
+ x86_64-linux
+ x86_64-linux-gnu
+ x86_64-linux-musl
+
+DEPENDENCIES
+ activeresource
+ queenbee!
+ rails_structured_logging!
+ rubocop-rails-omakase
+
+BUNDLED WITH
+ 2.7.0
diff --git a/saas/LICENSE.md b/saas/LICENSE.md
new file mode 100644
index 000000000..db5383855
--- /dev/null
+++ b/saas/LICENSE.md
@@ -0,0 +1,10 @@
+# O'Saasy License Agreement
+
+Copyright © 2025, 37signals LLC.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+1. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+2. No licensee or downstream recipient may use the Software (including any modified or derivative versions) to directly compete with the original Licensor by offering it to third parties as a hosted, managed, or Software-as-a-Service (SaaS) product or cloud service where the primary value of the service is the functionality of the Software itself.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/saas/README.md b/saas/README.md
new file mode 100644
index 000000000..80ff67a36
--- /dev/null
+++ b/saas/README.md
@@ -0,0 +1,79 @@
+This is a Rails engine that [37signals](https://37signals.com/) bundles with [Fizzy](https://github.com/basecamp/fizzy) to offer the hosted version at https://fizzy.do.
+
+## Development
+
+To make Fizzy run in SaaS mode, run this in the terminal:
+
+```ruby
+bin/rails saas:enable
+```
+
+To go back to open source mode:
+
+```ruby
+bin/rails saas:disable
+```
+
+Then you can work do [Fizzy development as usual](https://github.com/basecamp/fizzy).
+
+## How to update Fizzy
+
+After making changes to this gem, you need to update Fizzy to pick up the changes:
+
+```ruby
+BUNDLE_GEMFILE=Gemfile.saas bundle update --conservative fizzy-saas
+```
+
+## Working with Stripe
+
+The first time, you need to:
+
+1. Install Stripe CLI: https://stripe.com/docs/stripe-cli
+2. Run `stripe login` and authorize the environment `37signals Development`
+
+Then, for working on the Stripe integration locally, you need to run this script to start the tunneling and set the environment variables:
+
+```sh
+eval "$(BUNDLE_GEMFILE=Gemfile.saas bundle exec stripe-dev)"
+bin/dev # You need to start the dev server in the same terminal session
+```
+
+This will ask for your 1password authorization to read and set the environment variables that Stripe needs.
+
+### Stripe environments
+
+* [Development](https://dashboard.stripe.com/acct_1SdTFtRus34tgjsJ/test/dashboard)
+* [Staging](https://dashboard.stripe.com/acct_1SdTbuRvb8txnPBR/test/dashboard)
+* [Production](https://dashboard.stripe.com/acct_1SNy97RwChFE4it8/dashboard)
+
+## Environments
+
+Fizzy is deployed with [Kamal](https://kamal-deploy.org/). You'll need to have the 1Password CLI set up in order to access the secrets that are used when deploying. Provided you have that, it should be as simple as `bin/kamal deploy` to the correct environment.
+
+## Handbook
+
+See the [Fizzy handbook](https://handbooks.37signals.works/18/fizzy) for runbooks and more.
+
+### Production
+
+- https://app.fizzy.do/
+
+This environment uses a FlashBlade bucket for blob storage.
+
+### Beta
+
+Beta is primarily intended for testing product features. It uses the same production database and Active Storage configuration.
+
+Beta tenant is:
+
+- https://fizzy-beta.37signals.com
+
+### Staging
+
+Staging is primarily intended for testing infrastructure changes. It uses production-like but separate database and Active Storage configurations.
+
+- https://app.fizzy-staging.com/
+
+## License
+
+fizzy-saas is released under the [O'Saasy License](LICENSE.md).
diff --git a/saas/Rakefile b/saas/Rakefile
new file mode 100644
index 000000000..e7793b5c1
--- /dev/null
+++ b/saas/Rakefile
@@ -0,0 +1,8 @@
+require "bundler/setup"
+
+APP_RAKEFILE = File.expand_path("test/dummy/Rakefile", __dir__)
+load "rails/tasks/engine.rake"
+
+load "rails/tasks/statistics.rake"
+
+require "bundler/gem_tasks"
diff --git a/saas/app/assets/images/fizzy/saas/.keep b/saas/app/assets/images/fizzy/saas/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/saas/app/assets/stylesheets/fizzy/saas.css b/saas/app/assets/stylesheets/fizzy/saas.css
new file mode 100644
index 000000000..318c749e0
--- /dev/null
+++ b/saas/app/assets/stylesheets/fizzy/saas.css
@@ -0,0 +1,64 @@
+/* Subscriptions
+/* ------------------------------------------------------------------------ */
+:root {
+ --settings-subscription-background: linear-gradient(to bottom, var(--color-canvas), oklch(var(--lch-violet-lighter)));
+ --settings-subscription-color: oklch(var(--lch-violet-medium));
+ --settings-subscription-text-color: oklch(var(--lch-violet-dark));
+
+ .settings-subscription__button {
+ --btn-background: var(--settings-subscription-color);
+ --btn-border-color: var(--color-canvas);
+ --btn-color: var(--color-canvas);
+ --focus-ring-color: var(--color-ink);
+ }
+
+ .settings-subscription__divider {
+ --divider-color: currentColor;
+
+ color: var(--settings-subscription-color);
+ margin-block-start: calc(var(--block-space-half) * -1);
+ }
+
+ .settings-subscription__footer {
+ color: var(--settings-subscription-text-color);
+
+ &::before {
+ content: "————";
+ display: block;
+ margin: auto;
+ text-align: center;
+ }
+ }
+
+ .settings-subscription__notch {
+ animation: wiggle 500ms ease;
+ background: var(--settings-subscription-background);
+ box-shadow: 0 0 0.3em 0.2em var(--settings-subscription-color);
+ border-radius: 3em;
+ color: var(--settings-subscription-text-color);
+ margin-inline: auto;
+ padding: 0 0.3em 0 1.2em;
+ transform: rotate(-1deg);
+
+ @media (max-width: 640px) {
+ padding-block: 0.6em;
+ padding-inline-start: 0.3em;
+ }
+
+ .btn {
+ margin-block: 0.3em;
+ }
+ }
+
+ .settings-subscription__panel {
+ background: var(--settings-subscription-background);
+ }
+
+ .settings_subscription__warning {
+ color: var(--settings-subscription-text-color);
+
+ a {
+ color: var(--settings-subscription-text-color);
+ }
+ }
+}
diff --git a/saas/app/controllers/account/billing_portals_controller.rb b/saas/app/controllers/account/billing_portals_controller.rb
new file mode 100644
index 000000000..67eaffe6c
--- /dev/null
+++ b/saas/app/controllers/account/billing_portals_controller.rb
@@ -0,0 +1,19 @@
+class Account::BillingPortalsController < ApplicationController
+ before_action :ensure_admin
+ before_action :ensure_subscribed_account
+
+ def show
+ redirect_to create_stripe_billing_portal_session.url, allow_other_host: true
+ end
+
+ private
+ def ensure_subscribed_account
+ unless Current.account.subscribed?
+ redirect_to account_subscription_path, alert: "No billing information found"
+ end
+ end
+
+ def create_stripe_billing_portal_session
+ Stripe::BillingPortal::Session.create(customer: Current.account.subscription.stripe_customer_id, return_url: account_settings_url)
+ end
+end
diff --git a/saas/app/controllers/account/subscriptions_controller.rb b/saas/app/controllers/account/subscriptions_controller.rb
new file mode 100644
index 000000000..8ddfb4b7a
--- /dev/null
+++ b/saas/app/controllers/account/subscriptions_controller.rb
@@ -0,0 +1,42 @@
+class Account::SubscriptionsController < ApplicationController
+ before_action :ensure_admin
+ before_action :set_stripe_session, only: :show
+
+ def show
+ end
+
+ def create
+ session = Stripe::Checkout::Session.create \
+ customer: find_or_create_stripe_customer,
+ mode: "subscription",
+ line_items: [ { price: Plan.paid.stripe_price_id, quantity: 1 } ],
+ success_url: account_subscription_url + "?session_id={CHECKOUT_SESSION_ID}",
+ cancel_url: account_subscription_url,
+ metadata: { account_id: Current.account.id, plan_key: Plan.paid.key },
+ automatic_tax: { enabled: true },
+ tax_id_collection: { enabled: true },
+ billing_address_collection: "required",
+ customer_update: { address: "auto", name: "auto" }
+
+ redirect_to session.url, allow_other_host: true
+ end
+
+ private
+ def set_stripe_session
+ @stripe_session = Stripe::Checkout::Session.retrieve(params[:session_id]) if params[:session_id]
+ end
+
+ def find_or_create_stripe_customer
+ find_stripe_customer || create_stripe_customer
+ end
+
+ def find_stripe_customer
+ Stripe::Customer.retrieve(Current.account.subscription.stripe_customer_id) if Current.account.subscription&.stripe_customer_id
+ end
+
+ def create_stripe_customer
+ Stripe::Customer.create(email: Current.user.identity.email_address, name: Current.account.name, metadata: { account_id: Current.account.id }).tap do |customer|
+ Current.account.create_subscription!(stripe_customer_id: customer.id, plan_key: Plan.paid.key, status: "incomplete")
+ end
+ end
+end
diff --git a/saas/app/controllers/admin/account_searches_controller.rb b/saas/app/controllers/admin/account_searches_controller.rb
new file mode 100644
index 000000000..db655a9ef
--- /dev/null
+++ b/saas/app/controllers/admin/account_searches_controller.rb
@@ -0,0 +1,5 @@
+class Admin::AccountSearchesController < AdminController
+ def create
+ redirect_to saas.edit_admin_account_path(params[:q])
+ end
+end
diff --git a/saas/app/controllers/admin/accounts_controller.rb b/saas/app/controllers/admin/accounts_controller.rb
new file mode 100644
index 000000000..ba6200d1b
--- /dev/null
+++ b/saas/app/controllers/admin/accounts_controller.rb
@@ -0,0 +1,27 @@
+class Admin::AccountsController < AdminController
+ include Admin::AccountScoped
+
+ layout "public"
+
+ before_action :set_account, only: %i[ edit update ]
+
+ def index
+ end
+
+ def edit
+ end
+
+ def update
+ @account.override_limits(card_count: overridden_card_count_param)
+ redirect_to saas.edit_admin_account_path(@account.external_account_id), notice: "Account limits updated"
+ end
+
+ private
+ def set_account
+ @account = Account.find_by!(external_account_id: params[:id])
+ end
+
+ def overridden_card_count_param
+ params[:account][:overridden_card_count].to_i
+ end
+end
diff --git a/saas/app/controllers/admin/billing_waivers_controller.rb b/saas/app/controllers/admin/billing_waivers_controller.rb
new file mode 100644
index 000000000..713891069
--- /dev/null
+++ b/saas/app/controllers/admin/billing_waivers_controller.rb
@@ -0,0 +1,13 @@
+class Admin::BillingWaiversController < AdminController
+ include Admin::AccountScoped
+
+ def create
+ @account.comp
+ redirect_to saas.edit_admin_account_path(@account.external_account_id), notice: "Account comped"
+ end
+
+ def destroy
+ @account.uncomp
+ redirect_to saas.edit_admin_account_path(@account.external_account_id), notice: "Account uncomped"
+ end
+end
diff --git a/saas/app/controllers/admin/overridden_limits_controller.rb b/saas/app/controllers/admin/overridden_limits_controller.rb
new file mode 100644
index 000000000..fff8ea3e3
--- /dev/null
+++ b/saas/app/controllers/admin/overridden_limits_controller.rb
@@ -0,0 +1,8 @@
+class Admin::OverriddenLimitsController < AdminController
+ include Admin::AccountScoped
+
+ def destroy
+ @account.reset_overridden_limits
+ redirect_to saas.edit_admin_account_path(@account.external_account_id), notice: "Limits reset"
+ end
+end
diff --git a/saas/app/controllers/admin/stats_controller.rb b/saas/app/controllers/admin/stats_controller.rb
new file mode 100644
index 000000000..6d508fc2c
--- /dev/null
+++ b/saas/app/controllers/admin/stats_controller.rb
@@ -0,0 +1,20 @@
+class Admin::StatsController < AdminController
+ layout "public"
+
+ def show
+ @accounts_total = Account.count
+ @accounts_last_7_days = Account.where(created_at: 7.days.ago..).count
+ @accounts_last_24_hours = Account.where(created_at: 24.hours.ago..).count
+
+ @identities_total = Identity.count
+ @identities_last_7_days = Identity.where(created_at: 7.days.ago..).count
+ @identities_last_24_hours = Identity.where(created_at: 24.hours.ago..).count
+
+ @top_accounts = Account
+ .where("cards_count > 0")
+ .order(cards_count: :desc)
+ .limit(20)
+
+ @recent_accounts = Account.order(created_at: :desc).limit(10)
+ end
+end
diff --git a/saas/app/controllers/concerns/admin/account_scoped.rb b/saas/app/controllers/concerns/admin/account_scoped.rb
new file mode 100644
index 000000000..314720cd2
--- /dev/null
+++ b/saas/app/controllers/concerns/admin/account_scoped.rb
@@ -0,0 +1,12 @@
+module Admin::AccountScoped
+ extend ActiveSupport::Concern
+
+ included do
+ before_action :set_account
+ end
+
+ private
+ def set_account
+ @account = Account.find_by!(external_account_id: params[:account_id] || params[:id])
+ end
+end
diff --git a/saas/app/controllers/concerns/card/limited_creation.rb b/saas/app/controllers/concerns/card/limited_creation.rb
new file mode 100644
index 000000000..b4c773449
--- /dev/null
+++ b/saas/app/controllers/concerns/card/limited_creation.rb
@@ -0,0 +1,14 @@
+module Card::LimitedCreation
+ extend ActiveSupport::Concern
+
+ included do
+ # Only limit API requests. We let you create drafts in the app to actually show the banner, no matter the card count.
+ # We limit card publications separately. See +Card::LimitedPublishing+.
+ before_action :ensure_can_create_cards, only: %i[ create ], if: -> { request.format.json? }
+ end
+
+ private
+ def ensure_can_create_cards
+ head :forbidden if Current.account.exceeding_card_limit?
+ end
+end
diff --git a/saas/app/controllers/concerns/card/limited_publishing.rb b/saas/app/controllers/concerns/card/limited_publishing.rb
new file mode 100644
index 000000000..b92ab06f3
--- /dev/null
+++ b/saas/app/controllers/concerns/card/limited_publishing.rb
@@ -0,0 +1,12 @@
+module Card::LimitedPublishing
+ extend ActiveSupport::Concern
+
+ included do
+ before_action :ensure_can_publish_cards, only: %i[ create ]
+ end
+
+ private
+ def ensure_can_publish_cards
+ head :forbidden if Current.account.exceeding_card_limit?
+ end
+end
diff --git a/saas/app/controllers/saas_admin_controller.rb b/saas/app/controllers/saas_admin_controller.rb
new file mode 100644
index 000000000..f68ca492e
--- /dev/null
+++ b/saas/app/controllers/saas_admin_controller.rb
@@ -0,0 +1,6 @@
+class SaasAdminController < ::AdminController
+ private
+ def find_current_auditor
+ Current.identity
+ end
+end
diff --git a/saas/app/controllers/stripe/webhooks_controller.rb b/saas/app/controllers/stripe/webhooks_controller.rb
new file mode 100644
index 000000000..bf00fc23f
--- /dev/null
+++ b/saas/app/controllers/stripe/webhooks_controller.rb
@@ -0,0 +1,79 @@
+class Stripe::WebhooksController < ApplicationController
+ allow_unauthenticated_access
+ skip_before_action :require_account
+ skip_before_action :verify_authenticity_token
+
+ def create
+ if event = verify_webhook_signature
+ dispatch_stripe_event(event)
+ head :ok
+ else
+ head :bad_request
+ end
+ end
+
+ private
+ def dispatch_stripe_event(event)
+ case event.type
+ when "checkout.session.completed"
+ sync_new_subscription(event.data.object.subscription, plan_key: event.data.object.metadata["plan_key"]) if event.data.object.mode == "subscription"
+ when "customer.subscription.updated", "customer.subscription.deleted"
+ sync_subscription(event.data.object.id)
+ end
+ end
+
+ def verify_webhook_signature
+ payload = request.body.read
+ sig_header = request.env["HTTP_STRIPE_SIGNATURE"]
+
+ Stripe::Webhook.construct_event(payload, sig_header, ENV["STRIPE_WEBHOOK_SECRET"])
+ rescue Stripe::SignatureVerificationError => e
+ Rails.logger.error "Stripe webhook signature verification failed: #{e.message}"
+ nil
+ end
+
+ def sync_new_subscription(stripe_subscription_id, plan_key:)
+ sync_subscription(stripe_subscription_id) do |subscription_properties|
+ subscription_properties[:plan_key] = plan_key if plan_key
+ end
+ end
+
+ # Always fetch fresh subscription data from Stripe to handle out-of-order
+ # event delivery. Not relying on payload data.
+ def sync_subscription(stripe_subscription_id)
+ stripe_subscription = Stripe::Subscription.retrieve(stripe_subscription_id)
+
+ if subscription = find_subscription_by_stripe_customer(stripe_subscription.customer)
+ subscription_properties = {
+ stripe_subscription_id: stripe_subscription.id,
+ status: stripe_subscription.status,
+ current_period_end: current_period_end_for(stripe_subscription),
+ cancel_at: stripe_subscription.cancel_at ? Time.at(stripe_subscription.cancel_at) : nil,
+ next_amount_due_in_cents: next_amount_due_for(stripe_subscription)
+ }
+
+ yield subscription_properties if block_given?
+ subscription_properties[:stripe_subscription_id] = nil if stripe_subscription.status == "canceled"
+
+ subscription.update!(subscription_properties)
+ end
+ end
+
+ def find_subscription_by_stripe_customer(id)
+ Account::Subscription.find_by(stripe_customer_id: id)
+ end
+
+ def current_period_end_for(stripe_subscription)
+ timestamp = stripe_subscription.items.data.first&.current_period_end
+ Time.at(timestamp) if timestamp
+ end
+
+ def next_amount_due_for(stripe_subscription)
+ return nil if stripe_subscription.status == "canceled"
+
+ preview = Stripe::Invoice.create_preview(customer: stripe_subscription.customer, subscription: stripe_subscription.id)
+ preview.amount_due
+ rescue Stripe::InvalidRequestError
+ nil
+ end
+end
diff --git a/saas/app/helpers/subscriptions_helper.rb b/saas/app/helpers/subscriptions_helper.rb
new file mode 100644
index 000000000..a1c4c07d9
--- /dev/null
+++ b/saas/app/helpers/subscriptions_helper.rb
@@ -0,0 +1,15 @@
+module SubscriptionsHelper
+ def plan_storage_limit(plan)
+ number_to_human_size(plan.storage_limit).delete(" ")
+ end
+
+ def subscription_period_end_action(subscription)
+ if subscription.to_be_canceled?
+ "Your Fizzy subscription ends on"
+ elsif subscription.canceled?
+ "Your Fizzy subscription ended on"
+ else
+ "Your next payment of #{ number_to_currency(subscription.next_amount_due) } will be billed on".html_safe
+ end
+ end
+end
diff --git a/saas/app/models/account/billing.rb b/saas/app/models/account/billing.rb
new file mode 100644
index 000000000..dada43721
--- /dev/null
+++ b/saas/app/models/account/billing.rb
@@ -0,0 +1,42 @@
+module Account::Billing
+ extend ActiveSupport::Concern
+
+ included do
+ has_one :subscription, class_name: "Account::Subscription", dependent: :destroy
+ has_one :billing_waiver, class_name: "Account::BillingWaiver", dependent: :destroy
+ end
+
+ def plan
+ active_subscription&.plan || Plan.free
+ end
+
+ def subscribed?
+ subscription.present?
+ end
+
+ def comped?
+ billing_waiver.present?
+ end
+
+ def comp
+ create_billing_waiver unless billing_waiver
+ end
+
+ def uncomp
+ billing_waiver&.destroy
+ reload_billing_waiver
+ end
+
+ private
+ def active_subscription
+ if comped?
+ comped_subscription
+ elsif subscription&.active?
+ subscription
+ end
+ end
+
+ def comped_subscription
+ @comped_subscription ||= billing_waiver&.subscription
+ end
+end
diff --git a/saas/app/models/account/billing_waiver.rb b/saas/app/models/account/billing_waiver.rb
new file mode 100644
index 000000000..c1968522a
--- /dev/null
+++ b/saas/app/models/account/billing_waiver.rb
@@ -0,0 +1,7 @@
+class Account::BillingWaiver < SaasRecord
+ belongs_to :account
+
+ def subscription
+ @subscription ||= Account::Subscription.new(plan_key: Plan.paid.key)
+ end
+end
diff --git a/saas/app/models/account/limited.rb b/saas/app/models/account/limited.rb
new file mode 100644
index 000000000..f7eb3cbc1
--- /dev/null
+++ b/saas/app/models/account/limited.rb
@@ -0,0 +1,35 @@
+module Account::Limited
+ extend ActiveSupport::Concern
+
+ included do
+ has_one :overridden_limits, class_name: "Account::OverriddenLimits", dependent: :destroy
+ end
+
+ NEAR_CARD_LIMIT_THRESHOLD = 100
+
+ def override_limits(card_count:)
+ (overridden_limits || build_overridden_limits).update!(card_count:)
+ end
+
+ def billed_cards_count
+ overridden_limits&.card_count || cards_count
+ end
+
+ def nearing_plan_cards_limit?
+ plan.limit_cards? && remaining_cards_count < NEAR_CARD_LIMIT_THRESHOLD
+ end
+
+ def exceeding_card_limit?
+ plan.limit_cards? && billed_cards_count > plan.card_limit
+ end
+
+ def reset_overridden_limits
+ overridden_limits&.destroy
+ reload_overridden_limits
+ end
+
+ private
+ def remaining_cards_count
+ plan.card_limit - billed_cards_count
+ end
+end
diff --git a/saas/app/models/account/overridden_limits.rb b/saas/app/models/account/overridden_limits.rb
new file mode 100644
index 000000000..cdf3c51ec
--- /dev/null
+++ b/saas/app/models/account/overridden_limits.rb
@@ -0,0 +1,4 @@
+# To ease testing of limits
+class Account::OverriddenLimits < SaasRecord
+ belongs_to :account
+end
diff --git a/saas/app/models/account/subscription.rb b/saas/app/models/account/subscription.rb
new file mode 100644
index 000000000..0eac71b02
--- /dev/null
+++ b/saas/app/models/account/subscription.rb
@@ -0,0 +1,21 @@
+class Account::Subscription < SaasRecord
+ belongs_to :account
+
+ enum :status, %w[ active past_due unpaid canceled incomplete incomplete_expired trialing paused ].index_by(&:itself)
+
+ validates :plan_key, presence: true, inclusion: { in: Plan::PLANS.keys.map(&:to_s) }
+
+ delegate :paid?, to: :plan
+
+ def plan
+ @plan ||= Plan.find(plan_key)
+ end
+
+ def to_be_canceled?
+ active? && cancel_at.present?
+ end
+
+ def next_amount_due
+ next_amount_due_in_cents ? next_amount_due_in_cents / 100.0 : plan.price
+ end
+end
diff --git a/saas/app/models/plan.rb b/saas/app/models/plan.rb
new file mode 100644
index 000000000..7ef7f922e
--- /dev/null
+++ b/saas/app/models/plan.rb
@@ -0,0 +1,50 @@
+class Plan
+ PLANS = {
+ free_v1: { name: "Free", price: 0, card_limit: 1000, storage_limit: 1.gigabytes },
+ monthly_v1: { name: "Unlimited", price: 20, card_limit: Float::INFINITY, storage_limit: 5.gigabytes, stripe_price_id: ENV["STRIPE_MONTHLY_V1_PRICE_ID"] }
+ }
+
+ attr_reader :key, :name, :price, :card_limit, :storage_limit, :stripe_price_id
+
+ class << self
+ def all
+ @all ||= PLANS.map { |key, properties| new(key: key, **properties) }
+ end
+
+ def free
+ @free ||= find(:free_v1)
+ end
+
+ def paid
+ @paid ||= find(:monthly_v1)
+ end
+
+ def find(key)
+ @all_by_key ||= all.index_by(&:key).with_indifferent_access
+ @all_by_key[key]
+ end
+
+ alias [] find
+ end
+
+ def initialize(key:, name:, price:, card_limit:, storage_limit:, stripe_price_id: nil)
+ @key = key
+ @name = name
+ @price = price
+ @card_limit = card_limit
+ @storage_limit = storage_limit
+ @stripe_price_id = stripe_price_id
+ end
+
+ def free?
+ price.zero?
+ end
+
+ def paid?
+ !free?
+ end
+
+ def limit_cards?
+ card_limit != Float::INFINITY
+ end
+end
diff --git a/saas/app/models/saas_record.rb b/saas/app/models/saas_record.rb
new file mode 100644
index 000000000..37a1d8980
--- /dev/null
+++ b/saas/app/models/saas_record.rb
@@ -0,0 +1,5 @@
+class SaasRecord < ActiveRecord::Base
+ self.abstract_class = true
+
+ connects_to database: { writing: :saas, reading: :saas }
+end
diff --git a/saas/app/models/subscription.rb b/saas/app/models/subscription.rb
new file mode 100644
index 000000000..5efb1a7fa
--- /dev/null
+++ b/saas/app/models/subscription.rb
@@ -0,0 +1,13 @@
+class Subscription < Queenbee::Subscription
+ SHORT_NAMES = %w[ FreeV1 ]
+
+ def self.short_name
+ name.demodulize
+ end
+
+ class FreeV1 < Subscription
+ property :proper_name, "Free Subscription"
+ property :price, 0
+ property :frequency, "yearly"
+ end
+end
diff --git a/saas/app/views/account/settings/_subscription.html.erb b/saas/app/views/account/settings/_subscription.html.erb
new file mode 100644
index 000000000..3aef9b853
--- /dev/null
+++ b/saas/app/views/account/settings/_subscription.html.erb
@@ -0,0 +1,7 @@
+Status: <%= subscription.status.titleize %>
+
+<% if subscription.current_period_end %>
+ <%= subscription_period_end_action(subscription) %> <%= subscription.current_period_end.to_date.to_fs(:long) %>
+<% end %>
+
+<%= link_to "Manage Billing", account_billing_portal_path, class: "btn", data: { turbo_prefetch: false } %>
diff --git a/saas/app/views/account/settings/_subscription_panel.html.erb b/saas/app/views/account/settings/_subscription_panel.html.erb
new file mode 100644
index 000000000..44949e022
--- /dev/null
+++ b/saas/app/views/account/settings/_subscription_panel.html.erb
@@ -0,0 +1,28 @@
+<% if Current.user.admin? && !Current.account.comped? %>
+
+ Subscription
+
+ <% if Current.account.plan.free? %>
+ <% if Current.account.exceeding_card_limit? %>
+ You’ve used up your <%= Plan.free.card_limit %> free cards
+ <% else %>
+ You’ve used <%= Current.account.billed_cards_count %> free cards out of <%= Plan.free.card_limit %>
+ <% end %>
+
+ If you’d like to keep using Fizzy past <%= Plan.free.card_limit %> cards, it’s only $<%= Plan.paid.price %>/month for unlimited cards + unlimited users . You'll also get <%= plan_storage_limit(Plan.paid) %> of storage.
+
+ <%= button_to "Upgrade to #{Plan.paid.name} for $#{ Plan.paid.price }/month", account_subscription_path, class: "btn settings-subscription__button txt-medium", form: { data: { turbo: false } } %>
+
+ Cancel anytime, no contracts, take your data with you whenever.
+
+ <% else %>
+ Thank you for buying Fizzy
+
+ <% if Current.account.subscription %>
+ <%= render "account/settings/subscription", subscription: Current.account.subscription %>
+
+ <% end %>
+ <% end %>
+
+
+<% end %>
diff --git a/saas/app/views/account/subscriptions/_upgrade.html.erb b/saas/app/views/account/subscriptions/_upgrade.html.erb
new file mode 100644
index 000000000..d1c06e7f0
--- /dev/null
+++ b/saas/app/views/account/subscriptions/_upgrade.html.erb
@@ -0,0 +1,12 @@
+
+ <% if Current.user.admin? %>
+
You’ve used your <%= Plan.free.card_limit %> free cards.
+ <%= link_to account_settings_path(anchor: "subscription"), class: "btn settings-subscription__button" do %>
+
Upgrade to Unlimited
+ <% end %>
+ <% else %>
+
+ This account has used <%= Plan.free.card_limit %> free cards. Upgrade to get more.
+
+ <% end %>
+
+ Thanks for buying Fizzy!
+ Your payment was successful. You’re now on the <%= Current.account.plan.name %> plan.
+ <%= link_to "Done", account_settings_path, class: "btn settings-subscription__button txt-medium" %>
+
+<% end %>
diff --git a/saas/app/views/admin/accounts/edit.html.erb b/saas/app/views/admin/accounts/edit.html.erb
new file mode 100644
index 000000000..49c99773d
--- /dev/null
+++ b/saas/app/views/admin/accounts/edit.html.erb
@@ -0,0 +1,39 @@
+
+
+
Edit Account <%= @account.external_account_id %>
+
+
+
+
Name:
+ <%= @account.name %>
+
+
+
Actual card count:
+ <%= @account.cards_count %>
+
+
+
+ <%= form_with model: @account, url: saas.admin_account_path(@account.external_account_id), class: "flex flex-column gap" do |form| %>
+
+ <%= form.label :overridden_card_count, "Override card count", class: "font-weight-bold" %>
+
+ <%= form.number_field :overridden_card_count, value: @account.overridden_limits&.card_count, class: "input full-width" %>
+
+
+
+
Save
+ <% end %>
+
+ <% if @account.overridden_limits %>
+ <%= button_to "Reset limits", saas.admin_account_overridden_limits_path(@account.external_account_id), method: :delete, class: "btn btn--negative" %>
+ <% end %>
+
+ <% if @account.comped? %>
+ <%= button_to "Uncomp account", saas.admin_account_billing_waiver_path(@account.external_account_id), method: :delete, class: "btn btn--negative" %>
+ <% else %>
+ <%= button_to "Comp account", saas.admin_account_billing_waiver_path(@account.external_account_id), method: :post, class: "btn btn--positive" %>
+ <% end %>
+
+ <%= link_to "Back to accounts", saas.admin_accounts_path, class: "btn btn--plain txt-link" %>
+
+
Find Account
+
+<%= form_with url: saas.admin_account_search_path do |form| %>
+ <%= form.text_field :q, placeholder: "Account ID", autofocus: true %>
+ <%= form.submit "Search" %>
+<% end %>
diff --git a/saas/app/views/admin/stats/show.html.erb b/saas/app/views/admin/stats/show.html.erb
new file mode 100644
index 000000000..7c7491d2a
--- /dev/null
+++ b/saas/app/views/admin/stats/show.html.erb
@@ -0,0 +1,126 @@
+<% @page_title = "Account Statistics" %>
+
+<% content_for :header do %>
+
+<% end %>
+
+
+
+
+
+
+
+
+
Total
+
+ <%= @accounts_total %>
+
+
+
+
7 days
+
+ <%= @accounts_last_7_days %>
+
+
+
+
24 hours
+
+ <%= @accounts_last_24_hours %>
+
+
+
+
+
+
+
+
+
+
Total
+
+ <%= @identities_total %>
+
+
+
+
7 days
+
+ <%= @identities_last_7_days %>
+
+
+
+
24 hours
+
+ <%= @identities_last_24_hours %>
+
+
+
+
+
+
+
+
+ 10 Most Recent Signups
+
+
+
+
+
+
+
+ Top 20 Accounts by Card Count
+
+
+
+
+
diff --git a/saas/app/views/cards/container/footer/saas/_create.html.erb b/saas/app/views/cards/container/footer/saas/_create.html.erb
new file mode 100644
index 000000000..295c9bd19
--- /dev/null
+++ b/saas/app/views/cards/container/footer/saas/_create.html.erb
@@ -0,0 +1,5 @@
+<% if Current.account.exceeding_card_limit? %>
+ <%= render "account/subscriptions/upgrade" %>
+<% else %>
+ <%= render "cards/container/footer/create", card: card %>
+<% end %>
diff --git a/saas/app/views/cards/container/footer/saas/_near_notice.html.erb b/saas/app/views/cards/container/footer/saas/_near_notice.html.erb
new file mode 100644
index 000000000..e40aa9fb5
--- /dev/null
+++ b/saas/app/views/cards/container/footer/saas/_near_notice.html.erb
@@ -0,0 +1,9 @@
+<% if Current.account.nearing_plan_cards_limit? %>
+
+ <% if Current.user.admin? %>
+ You’ve used <%= Current.account.billed_cards_count %> out of <%= Plan.free.card_limit %> free cards. <%= link_to "Upgrade to unlimited", account_settings_path(anchor: "subscription") %> .
+ <% else %>
+ This account has used <%= Current.account.billed_cards_count %> out of <%= Plan.free.card_limit %> free cards. Upgrade soon
+ <% end %>
+
+<% end %>
diff --git a/saas/app/views/layouts/fizzy/saas/application.html.erb b/saas/app/views/layouts/fizzy/saas/application.html.erb
new file mode 100644
index 000000000..144b37838
--- /dev/null
+++ b/saas/app/views/layouts/fizzy/saas/application.html.erb
@@ -0,0 +1,17 @@
+
+
+
+ Fizzy saas
+ <%= csrf_meta_tags %>
+ <%= csp_meta_tag %>
+
+ <%= yield :head %>
+
+ <%= stylesheet_link_tag "fizzy/saas/application", media: "all" %>
+
+
+
+<%= yield %>
+
+
+
diff --git a/saas/app/views/signup/completions/new.html.erb b/saas/app/views/signup/completions/new.html.erb
new file mode 100644
index 000000000..aee8f4586
--- /dev/null
+++ b/saas/app/views/signup/completions/new.html.erb
@@ -0,0 +1,30 @@
+<% @page_title = "Complete your sign-up" %>
+
+">
+
<%= @page_title %>
+
+ <%= form_with model: @signup, url: saas.signup_completion_path, scope: "signup", class: "flex flex-column gap", data: { controller: "form" } do |form| %>
+ <%= form.text_field :full_name, class: "input txt-large", autocomplete: "name", placeholder: "Enter your full name…", autofocus: true, required: true %>
+
+
You’re one step away. Just enter your name to get your own Fizzy account.
+
+ <% if @signup.errors.any? %>
+
+
+ <% @signup.errors.full_messages.each do |message| %>
+ <%= message %>
+ <% end %>
+
+
+ <% end %>
+
+
+ Continue
+ <%= icon_tag "arrow-right" %>
+
+ <% end %>
+
">
+
Sign up
+
+ <%= form_with model: @signup, url: saas.signup_path, scope: "signup", class: "flex flex-column gap", data: { turbo: false, controller: "form" } do |form| %>
+ <%= form.email_field :email_address, class: "input", autocomplete: "username", placeholder: "Email address", required: true %>
+
+ <% if @signup.errors.any? %>
+
+
+ <% @signup.errors.full_messages.each do |message| %>
+ <%= message %>
+ <% end %>
+
+
+ <% end %>
+
+
+ Continue
+ <%= icon_tag "arrow-right" %>
+
+ <% end %>
+