refactor: conditional routing

.env.template

@@ -12,6 +12,11 @@ THREEMARB_API_IDENTITY=
 THREEMARB_API_SECRET=
 THREEMARB_PRIVATE=
 
+TWILIO_ACCOUNT_SID=
+TWILIO_API_KEY_SID=
+TWILIO_API_KEY_SECRET=
+WHATS_APP_SERVER_PHONE_NUMBER=
+
 # These environment variables are optional during
 # development, but required when running 100eyes
 # in a production environment.
@@ -27,4 +32,4 @@ THREEMARB_PRIVATE=
 #
 # THREE_SIXTY_DIALOG_PARTNER_ID=
 # THREE_SIXTY_DIALOG_PARTNER_USERNAME=
-# THREE_SIXTY_DIALOG_PARTNER_PASSWORD=
+# THREE_SIXTY_DIALOG_PARTNER_PASSWORD=

app/controllers/onboarding/signal_controller.rb

@@ -3,7 +3,6 @@
 module Onboarding
   class SignalController < OnboardingController
     skip_before_action :verify_jwt, only: :link
-    before_action :ensure_signal_is_set_up
 
     def link; end
 
@@ -20,11 +19,5 @@ def redirect_to_success
     def complete_onboarding(contributor)
       SignalAdapter::CreateContactJob.perform_later(contributor)
     end
-
-    def ensure_signal_is_set_up
-      return if Setting.signal_server_phone_number.present?
-
-      raise ActionController::RoutingError, 'Not Found'
-    end
   end
 end

app/controllers/onboarding/whats_app_controller.rb

@@ -2,18 +2,10 @@
 
 module Onboarding
   class WhatsAppController < OnboardingController
-    before_action :ensure_whats_app_is_set_up
-
     private
 
     def attr_name
       :whats_app_phone_number
     end
-
-    def ensure_whats_app_is_set_up
-      return if Setting.whats_app_server_phone_number.present? || Setting.three_sixty_dialog_client_api_key.present?
-
-      raise ActionController::RoutingError, 'Not Found'
-    end
   end
 end

config/routes.rb

@@ -20,9 +20,11 @@
       get '/email', to: 'email#show'
       post '/email', to: 'email#create'
 
-      get '/signal/', to: 'signal#show'
-      get '/signal/link/', to: 'signal#link', as: 'signal_link'
-      post '/signal/', to: 'signal#create'
+      constraints(-> { Setting.signal_server_phone_number.present? }) do
+        get '/signal/', to: 'signal#show'
+        get '/signal/link/', to: 'signal#link', as: 'signal_link'
+        post '/signal/', to: 'signal#create'
+      end
 
       get '/threema/', to: 'threema#show'
       post '/threema/', to: 'threema#create'
@@ -32,8 +34,10 @@
       get '/telegram/fallback/:telegram_onboarding_token', to: 'telegram#fallback', as: 'telegram_fallback'
       post '/telegram/', to: 'telegram#create'
 
-      get '/whats-app/', to: 'whats_app#show'
-      post '/whats-app/', to: 'whats_app#create'
+      constraints(-> { Setting.whats_app_server_phone_number.present? || Setting.three_sixty_dialog_client_api_key.present? }) do
+        get '/whats-app/', to: 'whats_app#show'
+        post '/whats-app/', to: 'whats_app#create'
+      end
     end
   end
 

spec/jobs/signal_adapter/receive_polling_job_spec.rb

@@ -45,10 +45,7 @@
       before do
         create(:request)
 
-        unless Setting.signal_server_phone_number
-          allow(Setting).to receive(:signal_server_phone_number).and_return('SIGNAL_SERVER_PHONE_NUMBER')
-        end
-
+        allow(Setting).to receive(:signal_server_phone_number).and_return('SIGNAL_SERVER_PHONE_NUMBER')
         allow(job).to receive(:ping_monitoring_service).and_return(nil)
       end
 
@@ -174,10 +171,8 @@
 
     describe 'given a known contributor requests to unsubscribe', vcr: { cassette_name: :receive_signal_message_to_unsubscribe } do
       before do
-        unless Setting.signal_server_phone_number
-          allow(Setting).to receive(:signal_server_phone_number).and_return('SIGNAL_SERVER_PHONE_NUMBER')
-          allow(Setting).to receive(:signal_cli_rest_api_endpoint).and_return('http://signal:8080')
-        end
+        allow(Setting).to receive(:signal_server_phone_number).and_return('SIGNAL_SERVER_PHONE_NUMBER')
+        allow(Setting).to receive(:signal_cli_rest_api_endpoint).and_return('http://signal:8080')
       end
 
       let!(:contributor) { create(:contributor, signal_phone_number: '+4915112345789', signal_onboarding_completed_at: Time.zone.now) }
@@ -187,10 +182,8 @@
     describe 'given a contributor who has unsubscribed and requests to resubscribe',
              vcr: { cassette_name: :receive_signal_message_to_resubscribe } do
       before do
-        unless Setting.signal_server_phone_number
-          allow(Setting).to receive(:signal_server_phone_number).and_return('SIGNAL_SERVER_PHONE_NUMBER')
-          allow(Setting).to receive(:signal_cli_rest_api_endpoint).and_return('http://signal:8080')
-        end
+        allow(Setting).to receive(:signal_server_phone_number).and_return('SIGNAL_SERVER_PHONE_NUMBER')
+        allow(Setting).to receive(:signal_cli_rest_api_endpoint).and_return('http://signal:8080')
       end
       let!(:contributor) do
         create(:contributor, signal_phone_number: '+4915112345789', signal_onboarding_completed_at: Time.zone.now,

spec/requests/onboarding/whatsapp_spec.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Onboarding::Whatsapp', type: :routing do
+  describe 'GET /onboarding/whatsapp' do
+    subject { { get: '/onboarding/whats-app' } }
+
+    describe 'when no Whatsapp number was configured' do
+      before { allow(Setting).to receive(:whats_app_server_phone_number).and_return('') }
+      it { should_not be_routable }
+    end
+
+    describe 'but when a Whatsapp number was configured' do
+      before { allow(Setting).to receive(:whats_app_server_phone_number).and_return('+49123456789') }
+      it { should be_routable }
+    end
+  end
+
+  describe 'POST /onboarding/whatsapp' do
+    subject { { post: '/onboarding/whats-app' } }
+
+    describe 'when no Whatsapp number was configured' do
+      before { allow(Setting).to receive(:whats_app_server_phone_number).and_return('') }
+      it { should_not be_routable }
+    end
+
+    describe 'but when a Whatsapp number was configured' do
+      before { allow(Setting).to receive(:whats_app_server_phone_number).and_return('+49123456789') }
+      it { should be_routable }
+    end
+  end
+end