3 files changed, 14 insertions, 3 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1eff1a9..25700af 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -4,6 +4,7 @@
 
 class ApplicationController < ActionController::Base
   require 'sso'
+  SSO::FromDiscourse.config = Rails.configuration.sso
 
   before_action :current_user
 
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index ad9cd95..d5f5fe9 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -6,7 +6,7 @@ class WelcomeController < ApplicationController
   # GET /
   def index
     @map       = Map.first
-    @taxonomy  = @map.taxonomy
+    @taxonomy  = @map&.taxonomy
     @resources = Resource.order(:uuid).page params[:page]
     Rails.logger.info "WECLOME ///// #{@resources&.count || 0}"
   end
diff --git a/app/lib/sso/from_discourse.rb b/app/lib/sso/from_discourse.rb
index 94969c9..8c5eea7 100644
--- a/app/lib/sso/from_discourse.rb
+++ b/app/lib/sso/from_discourse.rb
@@ -14,12 +14,12 @@ module SSO
       # This is a hash:
       # SSO::FromDiscourse.config = {
       #   sso_url: 'https://talk.incommon.cc/session/sso_provider',
-      #   return_url: "#{API_ROOT_URL}/my/account",
+      #   return_url: 'https://incommon-map.example/authenticate',
       #   sso_secret: Rails.application.credentials.sso_secret,
       # }
       # In config/routes.rb:
       # ...
-      # get 'my/account/:token' => 'authentications#sso_login'
+      # get 'authenticate/(:token)' => 'authentications#sso_login'
       attr_accessor :config
     end
 
@@ -93,5 +93,15 @@ module SSO
     def mac_signature(payload = b64_payload)
       OpenSSL::HMAC.hexdigest('SHA256', self.class.config[:sso_secret], payload)
     end
+
+    def sso_secret
+      @sso_secret = begin
+                      self.class.config[:sso_secret].presence ||
+                        Rails.application.credentials.sso_secret ||
+                        raise
+                    rescue MissingConstant
+                      raise("Missing SSO Secret! Please set `SSO::FromDiscourse.config[:sso_secret]`")
+                    end
+    end
   end
 end