Refactoring auth

2012-09-12 07:48:22 +03:00 · 2012-09-12 07:48:22 +03:00 · 486de8c3f4
commit 486de8c3f4
parent 621affecb5
7 changed files with 91 additions and 69 deletions
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@ -120,8 +120,16 @@ class Settings < Settingslogic
      app['backup_keep_time'] || 0
    end

+    def ldap_enabled?
+      ldap['enabled']
+    rescue
+      false
+    end
+
    def omniauth_enabled?
-      omniauth['enabled'] || false
+      omniauth && omniauth['enabled']
+    rescue
+      false
    end

    def omniauth_providers