Improve configuration injection; separate preview from AuthController

Author: anarchivist

app/controllers/auth_controller.rb

@@ -3,13 +3,6 @@
 class AuthController < ApplicationController
   ERR_TICKET_MISMATCH = 'Ticket from callback URL parameter does not match credential from OmniAuth hash'.freeze
 
-  # Debug UI for staging, 404 Not Found for production
-  def index
-    raise Error::NotFoundError if ENV['SERVE_TEST_UI'].blank?
-
-    redirect_to preview_path
-  end
-
   def callback
     logger.debug({ msg: 'Received omniauth callback', omniauth: auth_hash, params: params.to_unsafe_h })
 

app/controllers/preview/preview_controller.rb

@@ -2,7 +2,7 @@ module Preview
   class PreviewController < Preview::ApplicationController
 
     def index
-      @api_url = Rails.env.production? ? 'https://galc-api.ucblib.org' : 'http://localhost:3000'
+      @api_url = ENV['GALC_API_URL'] || 'http://localhost:3000'
     end
   end
 end

config/routes.rb

@@ -1,13 +1,12 @@
 Rails.application.routes.draw do
-  root to: 'auth#index'
-
+  
   direct(:login) { '/auth/calnet' } # convenience to provide login_url helper
   get '/logout', to: 'auth#logout', as: :logout
   get '/auth/:provider/callback', to: 'auth#callback', as: :omniauth_callback
 
   scope module: 'preview' do
     constraints(->(_) { ENV['SERVE_TEST_UI'].present? }) do
-      get '/preview', to: 'preview#index', as: :preview
+      root to: 'preview#index', as: :preview
     end
   end
 

docker-compose.yml

@@ -8,6 +8,7 @@ services:
       - db
     environment:
       - SERVE_TEST_UI=${SERVE_TEST_UI:-true}
+      - GALC_API_URL=${GALC_API_URL:-http://localhost:3000}
     init: true
     networks:
       default:

spec/requests/auth_spec.rb

@@ -39,21 +39,6 @@
   # ------------------------------------------------------------
   # Tests
 
-  describe 'GET /' do
-    it 'returns 404 Not Found' do
-      allow(ENV).to receive(:[]).with('SERVE_TEST_UI').and_return(nil)
-      get root_path
-      expect(response).to have_http_status(:not_found)
-    end
-
-    it 'redirects to a test UI in staging' do
-      allow(ENV).to receive(:[]).with('SERVE_TEST_UI').and_return(true)
-
-      get root_path
-      expect(response).to redirect_to(preview_path)
-    end
-  end
-
   describe 'GET /auth/calnet' do
     # See https://github.com/omniauth/omniauth/wiki/Resolving-CVE-2015-9284
     it 'is disallowed' do

spec/requests/preview/preview_spec.rb

@@ -1,27 +1,28 @@
 require 'rails_helper'
 
 RSpec.describe Preview::PreviewController, type: :request do
-  describe 'GET /preview' do
+  describe 'GET /' do
     context 'with the preview environment enabled' do
       before do
         allow(ENV).to receive(:[]).with('SERVE_TEST_UI').and_return(true)
       end
 
       it 'shows a test UI in when SERVE_TEST_UI is true' do
+        allow(ENV).to receive(:[]).with('GALC_API_URL').and_return('https://galc.biz')
         get preview_path
         expect(response).to have_http_status(:ok)
         expect(response.content_type).to start_with('text/html')
       end
 
       context 'sets the API URL correctly' do
-        it 'sets the url for staging API in production' do
-          allow(Rails.env).to receive(:production?).and_return(true)
+        it 'sets the url when GALC_API_URL is present' do
+          allow(ENV).to receive(:[]).with('GALC_API_URL').and_return('https://galc.biz')
           get preview_path
-          expect(assigns(:api_url)).to eq('https://galc-api.ucblib.org')
+          expect(assigns(:api_url)).to eq('https://galc.biz')
         end
 
-        it 'sets the url for API to be localhost in dev/test' do
-          allow(Rails.env).to receive(:production?).and_return(false)
+        it 'sets the API URL when GALC_API_URL is not present' do
+          allow(ENV).to receive(:[]).with('GALC_API_URL').and_return(nil)
           get preview_path
           expect(assigns(:api_url)).to eq('http://localhost:3000')
         end