Change: 一般ユーザーはデフォルトで招待を不可にするよう変更 (#629)

* Change: 一般ユーザーはデフォルトで招待を不可にするよう変更 * Fix test
kmycode · Mar 4, 2024 · 4119b87 · 4119b87
1 parent 878b4eb
commit 4119b87
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/app/models/user_role.rb b/app/models/user_role.rb
@@ -47,7 +47,8 @@ module Flags
     NONE = 0
     ALL  = FLAGS.values.reduce(&:|)
 
-    DEFAULT = FLAGS[:invite_users]
+    DEFAULT = 0
+    EVERYONE_ALLOWED = FLAGS[:invite_users]
 
     CATEGORIES = {
       invites: %i(
@@ -197,6 +198,6 @@ def validate_position_elevation
   end
 
   def validate_dangerous_permissions
-    errors.add(:permissions_as_keys, :dangerous) if everyone? && Flags::DEFAULT & permissions != permissions
+    errors.add(:permissions_as_keys, :dangerous) if everyone? && Flags::EVERYONE_ALLOWED & permissions != permissions
   end
 end
diff --git a/config/roles.yml b/config/roles.yml
@@ -28,6 +28,7 @@ admin:
     - manage_custom_emojis
     - manage_webhooks
     - manage_roles
+    - invite_users
 owner:
   name: Owner
   position: 1000

diff --git a/spec/models/user_role_spec.rb b/spec/models/user_role_spec.rb
@@ -135,12 +135,16 @@
     end
 
     it 'has default permissions' do
-      expect(subject.permissions).to eq UserRole::FLAGS[:invite_users]
+      expect(subject.permissions).to eq 0
     end
 
     it 'has negative position' do
       expect(subject.position).to eq(described_class::NOBODY_POSITION)
     end
+
+    it 'is able to add invite permission' do
+      expect { subject.update!(permissions: UserRole::FLAGS[:invite_users]) }.to_not raise_error
+    end
   end
 
   describe '.nobody' do