bterkuile/fizzy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename LOCAL_AUTHENTICATION to OSS_CONFIG

Browse Source
This commit is contained in:
Mike Dalessio
2025-10-02 15:18:11 -04:00
parent 3cc0fd8c1f
commit 320558919c
13 changed files with 86 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gemfile
+1 -1
View File
@@ -71,7 +71,7 @@ group :test do
end
require_relative "lib/bootstrap"
unless Bootstrap.local_authentication?
unless Bootstrap.oss_config?
eval_gemfile "gems/fizzy-saas/Gemfile"
gem "fizzy-saas", path: "gems/fizzy-saas"
end
bin/dev
+2 -2
View File
@@ -14,8 +14,8 @@ if [ -f tmp/solid-queue.txt ]; then
export SOLID_QUEUE_IN_PUMA=1
fi
if [ -f tmp/local-auth.txt ]; then
export LOCAL_AUTHENTICATION=1
if [ -f tmp/oss-config.txt ]; then
export OSS_CONFIG=1
fi
exec ./bin/rails server -p 3006
bin/rails
+1 -1
View File
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
require_relative "../lib/bootstrap"
if !Bootstrap.local_authentication?
if !Bootstrap.oss_config?
# default from rails/test_unit/runner.rb but adding the saas gem test files
ENV["DEFAULT_TEST"] = "{gems/fizzy-saas/,}test/**/*_test.rb"
ENV["DEFAULT_TEST_EXCLUDE"] = "{gems/fizzy-saas/,}test/{system,dummy,fixtures}/**/*_test.rb"
bin/setup
+1 -1
View File
@@ -11,7 +11,7 @@ system("bundle config set --local auto_install true")
system("bundle check") || system!("bundle install")
require_relative "../lib/bootstrap"
load File.expand_path("../gems/fizzy-saas/bin/setup", __dir__) unless Bootstrap.local_authentication?
load File.expand_path("../gems/fizzy-saas/bin/setup", __dir__) unless Bootstrap.oss_config?
puts "\n== Preparing database =="
if ARGV.include?("--reset")
config/ci.rb
+4 -4
View File
@@ -9,10 +9,10 @@ CI.run do
step "Security: Importmap audit", "bin/importmap audit"
step "Security: Brakeman audit", "bin/brakeman --quiet --no-pager --exit-on-warn --exit-on-error"
step "Tests: Rails with 37id auth", "bin/rails test"
step "Tests: Rails with local auth", "LOCAL_AUTHENTICATION=1 bin/rails test"
step "Tests: 37id", "bin/rails 37id:test:units"
step "Tests: System", "bin/rails test:system"
step "Tests: Rails: SaaS config", "bin/rails test"
step "Tests: Rails: OSS config", "OSS_CONFIG=1 bin/rails test"
step "Tests: 37id", "bin/rails 37id:test:units"
step "Tests: System", "bin/rails test:system"
if success?
step "Signoff: All systems go. Ready for merge and deploy.", "gh signoff"
config/initializers/authentication.rb
+1 -1
View File
@@ -1,2 +1,2 @@
require "bootstrap"
Rails.application.config.x.local_authentication = Bootstrap.local_authentication?
Rails.application.config.x.oss_config = Bootstrap.oss_config?
config/routes.rb
+1 -1
View File
@@ -221,7 +221,7 @@ Rails.application.routes.draw do
root "events#index"
unless Rails.application.config.x.local_authentication
unless Rails.application.config.x.oss_config
mount Fizzy::Saas::Engine, at: "/", as: "saas"
end
db/seeds.rb
+2 -2
View File
@@ -13,7 +13,7 @@ end
def create_tenant(signal_account_name, bare: false)
if bare
tenant_id = Digest::SHA256.hexdigest(signal_account_name)[0..8].to_i(16)
elsif Rails.application.config.x.local_authentication
elsif Rails.application.config.x.oss_config
tenant_id = ActiveRecord::FixtureSet.identify signal_account_name
else
signal_account = SignalId::Account.find_by_product_and_name!("fizzy", signal_account_name)
@@ -22,7 +22,7 @@ def create_tenant(signal_account_name, bare: false)
ApplicationRecord.destroy_tenant tenant_id
ApplicationRecord.create_tenant(tenant_id) do
account = if bare || Rails.application.config.x.local_authentication
account = if bare || Rails.application.config.x.oss_config
Account.create(name: signal_account_name, tenant_id: tenant_id).tap do
User.create!(
name: "David Heinemeier Hansson",
lib/bootstrap.rb
+2 -2
View File
@@ -1,5 +1,5 @@
module Bootstrap
def self.local_authentication?
ENV.fetch("LOCAL_AUTHENTICATION", "") != "" || !File.directory?(File.expand_path("../gems/fizzy-saas", __dir__))
def self.oss_config?
ENV.fetch("OSS_CONFIG", "") != "" || !File.directory?(File.expand_path("../gems/fizzy-saas", __dir__))
end
end
script/create-local-user.rb
-33
View File
@@ -1,33 +0,0 @@
#!/usr/bin/env ruby
#
# This script creates a new user that can be logged into via LOCAL_AUTHENTICATION, avoiding Launchpad/37id integration.
# In order to login as this user, you must set the `LOCAL_AUTHENTICATION` environment variable when running the Rails server:
#
# LOCAL_AUTHENTICATION=1 bin/dev
#
require_relative "../config/environment"
unless Rails.env.development?
puts "ERROR: This script is intended to be run in development mode only."
exit 1
end
if ARGV.length < 2
puts "Usage: #{$0} <email> <tenant>"
exit 1
end
email_address = ARGV[0]
tenant = ARGV[1]
ApplicationRecord.with_tenant(tenant) do
user = User.create!(
name: email_address.split("@").first,
email_address: email_address,
password: "secret123456"
)
puts "Created: "
pp user
end
test/models/period_highlights_test.rb
+16 -19
View File
@@ -1,30 +1,27 @@
require "test_helper"
class PeriodHighlightTest < ActiveSupport::TestCase
# Skipping when locally authenticating because the VCR cassettes would need to be re-recorded.
unless Rails.application.config.x.local_authentication
include VcrTestHelper
include VcrTestHelper
setup do
@user = users(:david)
setup do
@user = users(:david)
end
test "generate period highlights" do
period_highlights = assert_difference -> { PeriodHighlights.count }, 1 do
PeriodHighlights.create_or_find_for(@user.collections, starts_at: 1.month.ago, duration: 2.months)
end
test "generate period highlights" do
period_highlights = assert_difference -> { PeriodHighlights.count }, 1 do
PeriodHighlights.create_or_find_for(@user.collections, starts_at: 1.month.ago, duration: 2.months)
end
assert_match /logo/i, period_highlights.to_html
end
assert_match /logo/i, period_highlights.to_html
test "don't generate highlights for existing periods" do
new_period_highlights = PeriodHighlights.create_or_find_for(@user.collections, starts_at: 1.month.ago, duration: 2.months)
existing_period_highlights = assert_no_difference -> { PeriodHighlights.count } do
PeriodHighlights.create_or_find_for(@user.collections, starts_at: 1.month.ago, duration: 2.months)
end
test "don't generate highlights for existing periods" do
new_period_highlights = PeriodHighlights.create_or_find_for(@user.collections, starts_at: 1.month.ago, duration: 2.months)
existing_period_highlights = assert_no_difference -> { PeriodHighlights.count } do
PeriodHighlights.create_or_find_for(@user.collections, starts_at: 1.month.ago, duration: 2.months)
end
assert_equal new_period_highlights, existing_period_highlights
end
assert_equal new_period_highlights, existing_period_highlights
end
end
test/models/user/highlights_test.rb
+54 -57
View File
@@ -1,67 +1,64 @@
require "test_helper"
class User::HighlightsTest < ActiveSupport::TestCase
# Skipping when locally authenticating because the VCR cassettes would need to be re-recorded.
unless Rails.application.config.x.local_authentication
include VcrTestHelper
include VcrTestHelper
setup do
@user = users(:david)
travel_to 1.week.ago + 2.days
Current.session = sessions(:david)
end
setup do
@user = users(:david)
travel_to 1.week.ago + 2.days
Current.session = sessions(:david)
end
test "generate weekly highlights" do
stub_const(PeriodHighlights::Period, :MIN_EVENTS_TO_BE_INTERESTING, 3) do
period_highlights = assert_difference -> { PeriodHighlights.count }, 1 do
@user.generate_weekly_highlights
end
assert_match /logo/i, period_highlights.to_html
end
end
test "don't generate highlights for existing periods" do
stub_const(PeriodHighlights::Period, :MIN_EVENTS_TO_BE_INTERESTING, 3) do
new_period_highlights = @user.generate_weekly_highlights
assert_not_nil new_period_highlights
existing_period_highlights = assert_no_difference -> { PeriodHighlights.count } do
@user.generate_weekly_highlights
end
assert_equal new_period_highlights, existing_period_highlights
end
end
test "periods respect user timezone for week boundaries" do
@user.settings.update!(timezone_name: "America/New_York")
# Sunday Jan 7, 2024 at 2am EST (7am UTC) - this is Sunday in NYC
sunday_in_nyc = Time.zone.parse("2024-01-07 07:00:00 UTC")
# Saturday Jan 6, 2024 at 11pm EST (Jan 7 4am UTC) - still Saturday in NYC but Sunday in UTC
saturday_in_nyc = Time.zone.parse("2024-01-07 04:00:00 UTC")
# Event on Saturday evening in NYC (but Sunday in UTC)
saturday_event = travel_to(saturday_in_nyc) { cards(:logo).track_event("Saturday event") }
# Events throughout the week starting Sunday in NYC
7.times do |i|
travel_to(sunday_in_nyc + i.days) { cards(:logo).track_event("Event #{i}") }
test "generate weekly highlights" do
stub_const(PeriodHighlights::Period, :MIN_EVENTS_TO_BE_INTERESTING, 3) do
period_highlights = assert_difference -> { PeriodHighlights.count }, 1 do
@user.generate_weekly_highlights
end
wednesday = sunday_in_nyc + 3.days
# The period should start at Sunday in NYC timezone
period_start = wednesday.in_time_zone("America/New_York").beginning_of_week(:sunday)
period = PeriodHighlights::Period.new(@user.collections, starts_at: period_start, duration: 1.week)
# The Saturday event should NOT be included (it's in the previous week in NYC time)
assert_not_includes period.events, saturday_event
# Should include 7 events from the current week
assert_equal 7, period.events.count
assert_match /logo/i, period_highlights.to_html
end
end
test "don't generate highlights for existing periods" do
stub_const(PeriodHighlights::Period, :MIN_EVENTS_TO_BE_INTERESTING, 3) do
new_period_highlights = @user.generate_weekly_highlights
assert_not_nil new_period_highlights
existing_period_highlights = assert_no_difference -> { PeriodHighlights.count } do
@user.generate_weekly_highlights
end
assert_equal new_period_highlights, existing_period_highlights
end
end
test "periods respect user timezone for week boundaries" do
@user.settings.update!(timezone_name: "America/New_York")
# Sunday Jan 7, 2024 at 2am EST (7am UTC) - this is Sunday in NYC
sunday_in_nyc = Time.zone.parse("2024-01-07 07:00:00 UTC")
# Saturday Jan 6, 2024 at 11pm EST (Jan 7 4am UTC) - still Saturday in NYC but Sunday in UTC
saturday_in_nyc = Time.zone.parse("2024-01-07 04:00:00 UTC")
# Event on Saturday evening in NYC (but Sunday in UTC)
saturday_event = travel_to(saturday_in_nyc) { cards(:logo).track_event("Saturday event") }
# Events throughout the week starting Sunday in NYC
7.times do |i|
travel_to(sunday_in_nyc + i.days) { cards(:logo).track_event("Event #{i}") }
end
wednesday = sunday_in_nyc + 3.days
# The period should start at Sunday in NYC timezone
period_start = wednesday.in_time_zone("America/New_York").beginning_of_week(:sunday)
period = PeriodHighlights::Period.new(@user.collections, starts_at: period_start, duration: 1.week)
# The Saturday event should NOT be included (it's in the previous week in NYC time)
assert_not_includes period.events, saturday_event
# Should include 7 events from the current week
assert_equal 7, period.events.count
end
end
test/test_helper.rb
+1 -1
View File
@@ -65,6 +65,6 @@ RubyLLM.configure do |config|
config.openai_api_key ||= "DUMMY-TEST-KEY" # Run tests with VCR without having to configure OpenAI API key locally.
end
unless Rails.application.config.x.local_authentication
unless Rails.application.config.x.oss_config
load File.expand_path("../gems/fizzy-saas/test/test_helper.rb", __dir__)
end