From 5cb35c7b31fd909b9d6156f3760c9c4044d180a6 Mon Sep 17 00:00:00 2001 From: mgabdev <> Date: Tue, 15 Sep 2020 00:14:22 -0500 Subject: [PATCH] Fixed issue with empty passwords for groups MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Fixed: - issue with empty passwords for groups --- app/models/group.rb | 8 ++++++++ app/serializers/rest/group_serializer.rb | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/models/group.rb b/app/models/group.rb index 1f666109..677e1e2a 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -56,6 +56,7 @@ class Group < ApplicationRecord record.errors.add(:base, I18n.t('groups.errors.limit')) if Group.where(account_id: value).count >= PER_ACCOUNT_LIMIT end + before_save :set_password before_destroy :clean_feed_manager after_create :add_owner_to_accounts @@ -72,6 +73,13 @@ class Group < ApplicationRecord private + def set_password + if password.nil? || !password || password.gsub(/\s+/, "").length <= 1 || password == "null" + nil + else + password + end + end def add_owner_to_accounts group_accounts << GroupAccount.new(account: account, role: :admin, write_permissions: true) end diff --git a/app/serializers/rest/group_serializer.rb b/app/serializers/rest/group_serializer.rb index c9de6868..3c00908f 100644 --- a/app/serializers/rest/group_serializer.rb +++ b/app/serializers/rest/group_serializer.rb @@ -12,7 +12,7 @@ class REST::GroupSerializer < ActiveModel::Serializer end def has_password - return !!object.password + return !!object.password && object.password.gsub(/\s+/, "").length > 1 && object.password.to_s != "null" end def password