diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-02-04 05:42:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-04 05:42:13 +0100 |
| commit | 26f21fd5a03b1c6407cd81c58481288d06958ad3 (patch) | |
| tree | ef7cf0e00f4bfddfff65d4c28d38fe082ec6de37 /app/models/user.rb | |
| parent | 9da81a16391edfcbda9c748dcd519fb3ebd765e5 (diff) | |
CAS + SAML authentication feature (#6425)
* Cas authentication feature * Config * Remove class_eval + Omniauth initializer * Codeclimate review * Codeclimate review 2 * Codeclimate review 3 * Remove uid/email reconciliation * SAML authentication * Clean up code * Improve login form * Fix code style issues * Add locales
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index fa4ebfc71..fba478453 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -39,6 +39,7 @@ class User < ApplicationRecord include Settings::Extend + include Omniauthable ACTIVE_DURATION = 14.days @@ -52,6 +53,7 @@ class User < ApplicationRecord :confirmable devise :pam_authenticatable + devise :omniauthable belongs_to :account, inverse_of: :user belongs_to :invite, counter_cache: :uses, optional: true |