4819 manage super user roles

app/models/user.rb

@@ -111,13 +111,11 @@ def invitation_status
     "invited" if invitation_sent_at.present?
   end
 
-  def kind
-    return "super" if has_cached_role?(Role::SUPER_ADMIN)
-    return "admin" if has_cached_role?(Role::ORG_ADMIN, organization)
-    return "normal" if has_cached_role?(Role::ORG_USER, organization)
-    return "partner" if has_cached_role?(Role::PARTNER, partner)
+  def org_role
+    return "admin" if has_role?(Role::ORG_ADMIN, organization)
+    return "normal" if has_role?(Role::ORG_USER, organization)
 
-    "normal"
+    "not a member"
   end
 
   def is_admin?(org)

app/views/admin/users/_roles.html.erb

@@ -24,7 +24,9 @@
                 <% user.roles.each do |role| %>
                   <tr>
                     <td><%= role.title %></td>
-                    <td><%= role.resource.name %> (id: <%= role.resource.id %>)</td>
+                    <td>
+                      <%= role.resource&.name || "Super Admin" %> <%= role.resource&.id ? "(id: #{role.resource&.id})" : "" %>
+                    </td>
                     <td class="text-right">
                       <%= delete_button_to admin_user_remove_role_path(user, role_id: role.id),
                                            confirm: "Are you sure you want to remove this role?" %>

app/views/users/_organization_user.html.erb

@@ -3,41 +3,37 @@
     <%= user.display_name %>
   </td>
   <td><%= user.email %></td>
-  <td><%= user.kind %> </td>
+  <td><%= user.org_role %> </td>
   <td><%= user.current_sign_in_at&.strftime('%Y/%m/%d') %></td>
   <td><%= user.invitation_status %></td>
   <td nowrap><%= reinvite_user_link(user) %></td>
   <td>
-    <% unless user.has_cached_role?(Role::SUPER_ADMIN) || user.has_cached_role?(Role::ORG_ADMIN, current_organization) %>
+    <% unless user.has_role?(Role::ORG_ADMIN, current_organization) %>
       <div class="dropdown">
         <button class="btn btn-default dropdown-toggle" type="button" id="<%= dom_id(user, "dropdownMenu") %>" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
           Actions
           <span class="caret"></span>
         </button>
         <ul class="dropdown-menu">
           <li>
-            <% if current_user.has_cached_role?(Role::SUPER_ADMIN) %>
-              <%= edit_button_to(edit_admin_user_path(user), { text: 'Edit User' }) %>
-            <% else %>
-              <%= edit_button_to(
-                promote_to_org_admin_organization_path(user_id: user.id),
-                {text: 'Promote to Admin'},
-                {method: :post, rel: "nofollow", data: {confirm: 'This will promote the user to admin status. Are you sure that you want to submit this?', size: 'xs'}}
-              ) %>
-            <% end %>
+            <%= edit_button_to(
+              promote_to_org_admin_organization_path(user_id: user.id),
+              {text: 'Promote to Admin'},
+              {method: :post, rel: "nofollow", data: {confirm: 'This will promote the user to admin status. Are you sure that you want to submit this?', size: 'xs'}}
+            ) %>
           </li>
           <li>
             <%= delete_button_to remove_user_organization_path(user_id: user.id),
               {id: dom_id(user), method: :post, class: 'deactivate', text: "Remove User", rel: "nofollow", data: {confirm: 'This will revoke the user\'s organization permissions. Are you sure that you want to submit this?', size: 'xs'}} %>
           </li>
         </ul>
       </div>
+
     <% end %>
     <% if current_user.is_admin?(current_organization) && user.has_cached_role?(Role::ORG_ADMIN, current_organization) %>
       <%= edit_button_to demote_to_user_organization_path(user_id: user.id, organization_name: current_organization.short_name),
                  {text: 'Demote to User'},
                  {method: :post, rel: "nofollow", data: {confirm: 'This will demote the admin to user status. Are you sure that you want to submit this?', size: 'xs'}} unless user.id == current_user.id %>
     <% end %>
   </td>
-</td>
 </tr>

spec/factories/users.rb

@@ -76,6 +76,13 @@
             resource_type: Role::ORG_ADMIN)
         end
       end
+
+      factory :super_admin_org_admin do
+        name { "Administrative User And Org Admin" }
+        after(:create) do |user|
+          user.add_role(Role::SUPER_ADMIN)
+        end
+      end
     end
 
     factory :super_admin do

spec/models/user_spec.rb

@@ -115,10 +115,12 @@
       expect(build(:user, invitation_sent_at: Time.zone.parse("2018-10-10 00:00:00"), invitation_accepted_at: Time.zone.parse("2018-10-11 00:00:00"), current_sign_in_at: Time.zone.parse("2018-10-23 00:00:00")).invitation_status).to eq("joined")
     end
 
-    it "#kind" do
-      expect(create(:super_admin).kind).to eq("super")
-      expect(create(:organization_admin).kind).to eq("admin")
-      expect(create(:user).kind).to eq("normal")
+    it "#org_role" do
+      expect(create(:super_admin).org_role).to eq("normal")
+      expect(create(:super_admin_org_admin).org_role).to eq("admin")
+      expect(create(:organization_admin).org_role).to eq("admin")
+      expect(create(:user).org_role).to eq("normal")
+      expect(create(:partner_user).org_role).to eq("not a member")
     end
 
     it "#reinvitable?" do

spec/requests/admin/organizations_requests_spec.rb

@@ -100,6 +100,10 @@
       it "returns http success" do
         get admin_organizations_path
         expect(response).to be_successful
+        expect(response.body).to include(organization.name)
+        expect(response.body).to include(organization.email)
+        expect(response.body).to include(organization.created_at.strftime("%Y-%m-%d"))
+        expect(response.body).to include(organization.display_last_distribution_date)
       end
     end
 
@@ -184,8 +188,11 @@
         it "provides links to edit the user" do
           get admin_organization_path({ id: organization.id })
 
-          expect(response.body).to include("Edit User")
-          expect(response.body).to include(edit_admin_user_path(user.id))
+          expect(response.body).to include("Actions")
+          expect(response.body).to include('Promote to Admin')
+          expect(response.body).to include(promote_to_org_admin_organization_path(user_id: user.id))
+          expect(response.body).to include('Remove User')
+          expect(response.body).to include(remove_user_organization_path(user_id: user.id))
         end
       end
     end

spec/requests/admin/users_requests_spec.rb

@@ -53,21 +53,30 @@
     end
 
     describe '#add_role' do
-      context 'with no errors' do
-        it 'should call the service and redirect back' do
+      shared_examples "add role check" do |user_factory|
+        let!(:user_to_modify) { create(user_factory, name: "User to modify", organization: organization) }
+
+        it "should call the service and redirect back", :aggregate_failures do
           allow(AddRoleService).to receive(:call)
-          post admin_user_add_role_path(user_id: user.id,
+          post admin_user_add_role_path(user_id: user_to_modify.id,
             resource_type: Role::ORG_ADMIN,
             resource_id: organization.id),
             headers: { 'HTTP_REFERER' => '/back/url'}
-          expect(AddRoleService).to have_received(:call).with(user_id: user.id.to_s,
+          expect(AddRoleService).to have_received(:call).with(user_id: user_to_modify.id.to_s,
             resource_type: Role::ORG_ADMIN.to_s,
             resource_id: organization.id.to_s)
           expect(flash[:notice]).to eq('Role added!')
           expect(response).to redirect_to('/back/url')
         end
       end
 
+      context 'with no errors' do
+        include_examples "add role check", :user
+        context "modifying another super admin" do
+          include_examples "add role check", :super_admin
+        end
+      end
+
       context 'with errors' do
         it 'should redirect back with error' do
           allow(AddRoleService).to receive(:call).and_raise('OH NOES')
@@ -85,19 +94,29 @@
     end
 
     describe '#remove_role' do
-      context 'with no errors' do
-        it 'should call the service and redirect back' do
+      shared_examples "remove role check" do |user_factory|
+        let!(:user_to_modify) { create(user_factory, name: "User to modify", organization: organization) }
+
+        it "should call the service and redirect back", :aggregate_failures do
+          role_to_remove_id = user_to_modify.roles.find_by(name: Role::ORG_ADMIN, resource_id: organization.id).id
           allow(RemoveRoleService).to receive(:call)
-          delete admin_user_remove_role_path(user_id: user.id,
-            role_id: 123),
+          delete admin_user_remove_role_path(user_id: user_to_modify.id,
+            role_id: role_to_remove_id),
             headers: { 'HTTP_REFERER' => '/back/url'}
-          expect(RemoveRoleService).to have_received(:call).with(user_id: user.id.to_s,
-            role_id: '123')
+          expect(RemoveRoleService).to have_received(:call).with(user_id: user_to_modify.id.to_s,
+            role_id: role_to_remove_id.to_s)
           expect(flash[:notice]).to eq('Role removed!')
           expect(response).to redirect_to('/back/url')
         end
       end
 
+      context 'with no errors' do
+        include_examples "remove role check", :organization_admin
+        context 'modifying another super admin' do
+          include_examples "remove role check", :super_admin_org_admin
+        end
+      end
+
       context 'with errors' do
         it 'should redirect back with error' do
           allow(RemoveRoleService).to receive(:call).and_raise('OH NOES')