diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-04-25 02:49:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-25 02:49:25 +0200 |
| commit | e451ba0e837eb5b3d4f7fe75ca3e16680afaf129 (patch) | |
| tree | 212519b375fa3f963fbaf318e169faf8862ae554 /app/models/concerns | |
| parent | f27d7093513c0265010d019adc01b3f7ea02ef47 (diff) | |
Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621)
Diffstat (limited to 'app/models/concerns')
| -rw-r--r-- | app/models/concerns/ldap_authenticable.rb | 1 | ||||
| -rw-r--r-- | app/models/concerns/omniauthable.rb | 1 | ||||
| -rw-r--r-- | app/models/concerns/pam_authenticable.rb | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/app/models/concerns/ldap_authenticable.rb b/app/models/concerns/ldap_authenticable.rb index e1b5e3832..84ff84c4b 100644 --- a/app/models/concerns/ldap_authenticable.rb +++ b/app/models/concerns/ldap_authenticable.rb @@ -6,6 +6,7 @@ module LdapAuthenticable def ldap_setup(_attributes) self.confirmed_at = Time.now.utc self.admin = false + self.external = true save! end diff --git a/app/models/concerns/omniauthable.rb b/app/models/concerns/omniauthable.rb index 1b28b8162..283033083 100644 --- a/app/models/concerns/omniauthable.rb +++ b/app/models/concerns/omniauthable.rb @@ -66,6 +66,7 @@ module Omniauthable email: email || "#{TEMP_EMAIL_PREFIX}-#{auth.uid}-#{auth.provider}.com", password: Devise.friendly_token[0, 20], agreement: true, + external: true, account_attributes: { username: ensure_unique_username(auth.uid), display_name: display_name, diff --git a/app/models/concerns/pam_authenticable.rb b/app/models/concerns/pam_authenticable.rb index 2f651c1a3..6169d4dfa 100644 --- a/app/models/concerns/pam_authenticable.rb +++ b/app/models/concerns/pam_authenticable.rb @@ -34,6 +34,7 @@ module PamAuthenticable self.confirmed_at = Time.now.utc self.admin = false self.account = account + self.external = true account.destroy! unless save end |