From 85537b00695b1091e2a147597ab7c3557b150b11 Mon Sep 17 00:00:00 2001
From: Aurélien Reeves <aurelien.reeves@hiptest.net>
Date: Mon, 11 Mar 2019 20:48:24 +0100
Subject: Squish username before validation (#10239)

* Squish username before validation (#10101)

Fix #10101

* Move before_validation hook to a private method

Also add Unicode wite-spaces to the spec to support the use of squish
over strip.
---
 app/models/account.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'app/models/account.rb')

diff --git a/app/models/account.rb b/app/models/account.rb
index b81c64182..d6d718354 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -472,6 +472,7 @@ class Account < ApplicationRecord
 
   before_create :generate_keys
   before_validation :prepare_contents, if: :local?
+  before_validation :prepare_username, on: :create
   before_destroy :clean_feed_manager
 
   private
@@ -481,6 +482,10 @@ class Account < ApplicationRecord
     note&.strip!
   end
 
+  def prepare_username
+    username&.squish!
+  end
+
   def generate_keys
     return unless local? && !Rails.env.test?
 
-- 
cgit