diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-05-04 16:37:26 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-05-04 16:37:26 +0200 |
| commit | 33c80e07838d932efc6214cb1642cefaeb624b67 (patch) | |
| tree | 51cae2d9096888cc27ae38ec4b0ceceb1853bb73 /app/models/concerns | |
| parent | 2c2f649200ba5b742ba9d17ac5ba553c752b59aa (diff) | |
| parent | c88d9e524b02cba895de9bdb7cba0e29e37703d5 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/models/media_attachment.rb
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 |