summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2017-11-16 13:18:55 +0100
committerAzul <azul@riseup.net>2017-11-16 13:18:55 +0100
commit1ce9a3355ee59181df0359ebb455efa9ef323bb6 (patch)
treec911f020eb11d0e1342c96ae225cf2a4a6ca57df /app/models
parentae0aa02d038f16bb0919eebee805624bb891f48f (diff)
fix: respond with error on invalid pgp key
We used to just ignore the key. Also separated the code for handling key updates from other user updates. This should eventually be moved to a different route. Mixing the two makes the implementation really hard.
Diffstat (limited to 'app/models')
-rw-r--r--app/models/account.rb12
1 files changed, 0 insertions, 12 deletions
diff --git a/app/models/account.rb b/app/models/account.rb
index d77c61f..5a4111d 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -65,9 +65,6 @@ class Account
if attrs[:recovery_code_verifier].present?
user.update_attributes attrs.slice(:recovery_code_verifier, :recovery_code_salt)
end
- # TODO: move into identity controller
- key = update_pgp_key(attrs[:public_key])
- user.errors.set :public_key, key.errors.full_messages
user.save && save_identities
user.refresh_identity
end
@@ -129,15 +126,6 @@ class Account
@old_identity.destination = user.email_address # alias old -> new
end
- def update_pgp_key(key)
- PgpKey.new(key).tap do |key|
- if key.present? && key.valid?
- @new_identity ||= Identity.for(user)
- @new_identity.set_key(:pgp, key)
- end
- end
- end
-
def save_identities
@new_identity.try(:save) && @old_identity.try(:save)
end