From 85da83f8b03a0a93e09ab5b912981984d9a99f03 Mon Sep 17 00:00:00 2001
From: shawn-higgins1 <23224097+shawn-higgins1@users.noreply.github.com>
Date: Thu, 11 Jul 2019 11:14:43 -0400
Subject: [PATCH] Fix office365 if hd environment variable isn't set (#629)

---
 app/helpers/application_helper.rb |  2 +-
 app/helpers/sessions_helper.rb    | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index eb3ebf65..d947f54b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -33,7 +33,7 @@ module ApplicationHelper
 
   # Determines which providers can show a login button in the login modal.
   def iconset_providers
-    providers = configured_providers & [:google, :twitter, :microsoft_office365, :ldap]
+    providers = configured_providers & [:google, :twitter, :office365, :ldap]
 
     providers.delete(:twitter) if session[:old_twitter_user_id]
 
diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb
index 099cd50e..c9ab3525 100644
--- a/app/helpers/sessions_helper.rb
+++ b/app/helpers/sessions_helper.rb
@@ -99,14 +99,16 @@ module SessionsHelper
   end
 
   def set_hd(env, hd)
-    hd_opts = hd.split(',')
-    env['omniauth.strategy'].options[:hd] =
-      if hd_opts.empty?
-        nil
-      elsif hd_opts.length == 1
-        hd_opts[0]
-      else
-        hd_opts
+    if hd
+      hd_opts = hd.split(',')
+      env['omniauth.strategy'].options[:hd] =
+        if hd_opts.empty?
+          nil
+        elsif hd_opts.length == 1
+          hd_opts[0]
+        else
+          hd_opts
+        end
       end
   end