diff options
| author | Reverite <github@reverite.sh> | 2019-05-06 18:17:05 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-05-06 18:17:05 -0700 |
| commit | 5b85256b334b13fad26a2bc073a874750a3cdc2e (patch) | |
| tree | 2d523aa8266e42ae31ab82c7fc2533cf4a90ff0d /app/models/concerns | |
| parent | e10a9794f4ed7c90e3190f285359f55dd00da435 (diff) | |
| parent | 89d2859296bc5a57a8db07be86239cc938a3f691 (diff) | |
Merge remote-tracking branch 'glitch/master' into production
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 |