only validate gpg_key#fingerprint "internally"

1 files changed, 9 insertions, 5 deletions

diff --git a/app/models/gpg_key.rb b/app/models/gpg_key.rb
index d77051850f3..b012db1428f 100644
--- a/app/models/gpg_key.rb
+++ b/app/models/gpg_key.rb
@@ -3,17 +3,21 @@ class GpgKey < ActiveRecord::Base
 
   belongs_to :user
 
-  validates :fingerprint,
-    presence: true,
-    uniqueness: true
-
   validates :key,
     presence: true,
     uniqueness: true,
     format: {
-      with: /\A#{KEY_PREFIX}((?!#{KEY_PREFIX}).)+\Z/m
+      with: /\A#{KEY_PREFIX}((?!#{KEY_PREFIX}).)+\Z/m,
+      message: "is invalid. A valid public GPG key begins with '#{KEY_PREFIX}'"
     }
 
+  validates :fingerprint,
+    presence: true,
+    uniqueness: true,
+    # only validate when the `key` is valid, as we don't want the user to show
+    # the error about the fingerprint
+    unless: -> { errors.has_key?(:key) }
+
   before_validation :extract_fingerprint
 
   def key=(value)