" class="tag custom-role-tag">
diff --git a/app/views/admins/components/_manage_users_tags.html.erb b/app/views/admins/components/_manage_users_tags.html.erb
new file mode 100644
index 00000000..e622c867
--- /dev/null
+++ b/app/views/admins/components/_manage_users_tags.html.erb
@@ -0,0 +1,33 @@
+<%
+# BigBlueButton open source conferencing system - http://www.bigbluespan.org/.
+# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
+# This program is free software; you can redistribute it and/or modify it under the
+# terms of the GNU Lesser General Public License as published by the Free Software
+# Foundation; either version 3.0 of the License, or (at your option) any later
+# version.
+#
+# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+# You should have received a copy of the GNU Lesser General Public License along
+# with BigBlueButton; if not, see .
+%>
+
+
\ No newline at end of file
diff --git a/app/views/admins/components/_users.html.erb b/app/views/admins/components/_users.html.erb
index aa0a6a3c..e893b745 100644
--- a/app/views/admins/components/_users.html.erb
+++ b/app/views/admins/components/_users.html.erb
@@ -28,7 +28,9 @@
# with BigBlueButton; if not, see .
%>
-<% unless @role.nil? %>
+<% if @role.nil? %>
+ <%= render "admins/components/manage_users_tags" %>
+<% else %>
<%= render "admins/components/admins_tags" %>
<% end %>
@@ -91,40 +93,43 @@
<%= render "admins/components/admins_role", role: user.highest_priority_role %>
- <% if roles.include?("pending") %>
+ <% if !roles.include?("super_admin") %>
- <% elsif !roles.include?("super_admin") %>
-
diff --git a/app/views/shared/modals/_delete_account_modal.html.erb b/app/views/shared/modals/_delete_account_modal.html.erb
index da19d594..87b22300 100644
--- a/app/views/shared/modals/_delete_account_modal.html.erb
+++ b/app/views/shared/modals/_delete_account_modal.html.erb
@@ -26,13 +26,17 @@
<%= t("modal.delete_account.keep") %>
- <%= button_to delete_location, method: :delete, id: "delete-confirm", class: "btn btn-danger my-1 btn-del-room" do %>
+ <%= button_to delete_location, method: :delete, id: "delete-confirm", class: "btn btn-danger my-1 btn-del-room", disabled:"" do %>
<%= t("modal.delete_account.delete") %>
<% end %>
diff --git a/app/views/users/components/_delete.html.erb b/app/views/users/components/_delete.html.erb
index 2fd4c027..17808624 100644
--- a/app/views/users/components/_delete.html.erb
+++ b/app/views/users/components/_delete.html.erb
@@ -19,7 +19,7 @@
<%= t("settings.delete.disclaimer").html_safe %>
-
+
<%= t("settings.delete.button") %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0088c051..c13114df 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -77,9 +77,11 @@ en:
demoted: User has been successfully demoted
invite: Invite successfully sent to %{email}
invite_email_verification: Emails must be enabled in order to use this method. Please contact your system administrator.
+ perm_deleted: User has been permanently deleted
promoted: User has been successfully promoted
registration_method_updated: Registration method successfully updated
reset_password: The user has been sent an email to reset their password. (Please ask them to check their spam folder if they haven't received it)
+ restored: User has been successfully restored
settings: Site Settings successfully changed
unauthorized: You are not authorized to perform actions on this user
recordings:
@@ -116,7 +118,9 @@ en:
delete: Delete
edit: Edit
edit_roles: Edit the user roles
+ perm_delete: Permanently Delete
unban: Unban User
+ undelete: Undelete
table:
authenticator: Authenticator
created: Created
@@ -307,6 +311,7 @@ en:
confirm: Are you sure you want to delete this account?
delete: I'm sure, delete this account.
keep: Actually, I'll keep it.
+ delete_warning: This will deactivate the user's account. All deactived users can be found under the deleted tab.
warning: This decision is final. You will not be able to recover associated data.
delete_room:
confirm: Are you sure you want to delete %{room}?
@@ -401,8 +406,10 @@ en:
confirm: New Password Confirmation
update: Update Password
roles:
+ active: Active
admin: Admin
banned: Banned
+ deleted: Deleted
pending: Pending
user: User
room:
diff --git a/config/routes.rb b/config/routes.rb
index 17ea941b..dd7c07ec 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -48,6 +48,7 @@ Rails.application.routes.draw do
post '/invite', to: 'admins#invite', as: :invite_user
post '/approve/:user_uid', to: 'admins#approve', as: :admin_approve
get '/reset', to: 'admins#reset', as: :admin_reset
+ post '/undelete', to: 'admins#undelete', as: :admin_undelete
# Site Settings
post '/update_settings', to: 'admins#update_settings', as: :admin_update_settings
post '/registration_method', to: 'admins#registration_method', as: :admin_change_registration
diff --git a/spec/controllers/admins_controller_spec.rb b/spec/controllers/admins_controller_spec.rb
index 2b9a32ef..78069e69 100644
--- a/spec/controllers/admins_controller_spec.rb
+++ b/spec/controllers/admins_controller_spec.rb
@@ -166,6 +166,37 @@ describe AdminsController, type: :controller do
expect { post :approve, params: params }.to change { ActionMailer::Base.deliveries.count }.by(1)
end
end
+
+ context "POST #undelete" do
+ it "undeletes a user" do
+ @request.session[:user_id] = @admin.id
+
+ @user.delete
+
+ expect(User.find_by(uid: @user.uid)).to be_nil
+
+ post :undelete, params: { user_uid: @user.uid }
+
+ expect(User.find_by(uid: @user.uid)).to be_present
+ expect(flash[:success]).to be_present
+ expect(response).to redirect_to(admins_path)
+ end
+
+ it "undeletes the users rooms" do
+ @request.session[:user_id] = @admin.id
+
+ @user.main_room.delete
+ @user.delete
+
+ expect(Room.find_by(uid: @user.main_room.uid)).to be_nil
+
+ post :undelete, params: { user_uid: @user.uid }
+
+ expect(Room.find_by(uid: @user.main_room.uid)).to be_present
+ expect(flash[:success]).to be_present
+ expect(response).to redirect_to(admins_path)
+ end
+ end
end
describe "User Design" do
diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb
index d5e5c500..f1ef34eb 100644
--- a/spec/controllers/sessions_controller_spec.rb
+++ b/spec/controllers/sessions_controller_spec.rb
@@ -134,6 +134,26 @@ describe SessionsController, type: :controller do
expect(response).to redirect_to(account_activation_path(email: @user3.email))
end
+ it "should not login user if account is deleted" do
+ user = create(:user, provider: "greenlight",
+ password: "example", password_confirmation: 'example')
+
+ user.delete
+ user.reload
+ expect(user.deleted?).to be true
+
+ post :create, params: {
+ session: {
+ email: user.email,
+ password: 'example',
+ },
+ }
+
+ expect(@request.session[:user_id]).to be_nil
+ expect(flash[:alert]).to eq(I18n.t("registration.banned.fail"))
+ expect(response).to redirect_to(root_path)
+ end
+
it "redirects the user to the page they clicked sign in from" do
user = create(:user, provider: "greenlight",
password: "example", password_confirmation: 'example')
@@ -289,6 +309,27 @@ describe SessionsController, type: :controller do
expect(@request.session[:user_id]).to eql(u.id)
end
+ it "redirects a deleted user to the root page" do
+ # Create the user first
+ request.env["omniauth.auth"] = OmniAuth.config.mock_auth[:bn_launcher]
+ get :omniauth, params: { provider: 'bn_launcher' }
+
+ # Delete the user
+ user = User.find_by(social_uid: "bn-launcher-user")
+
+ @request.session[:user_id] = nil
+ user.delete
+ user.reload
+ expect(user.deleted?).to be true
+
+ # Try to sign back in
+ get :omniauth, params: { provider: 'bn_launcher' }
+
+ expect(@request.session[:user_id]).to be_nil
+ expect(flash[:alert]).to eq(I18n.t("registration.banned.fail"))
+ expect(response).to redirect_to(root_path)
+ end
+
it "should redirect to root on invalid omniauth login" do
request.env["omniauth.auth"] = :invalid_credentials
get :omniauth, params: { provider: :google }
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index 21025cce..c33daf74 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -396,16 +396,17 @@ describe UsersController, type: :controller do
describe "DELETE #user" do
before { allow(Rails.configuration).to receive(:allow_user_signup).and_return(true) }
- it "properly deletes user" do
+ it "permanently deletes user" do
user = create(:user)
@request.session[:user_id] = user.id
delete :destroy, params: { user_uid: user.uid }
+ expect(User.include_deleted.find_by(uid: user.uid)).to be_nil
expect(response).to redirect_to(root_path)
end
- it "allows admins to delete users" do
+ it "allows admins to tombstone users" do
allow(Rails.configuration).to receive(:loadbalanced_configuration).and_return(true)
allow_any_instance_of(User).to receive(:greenlight_account?).and_return(true)
allow_any_instance_of(ApplicationController).to receive(:set_user_domain).and_return("provider1")
@@ -418,6 +419,46 @@ describe UsersController, type: :controller do
delete :destroy, params: { user_uid: user.uid }
+ expect(User.deleted.find_by(uid: user.uid)).to be_present
+ expect(flash[:success]).to be_present
+ expect(response).to redirect_to(admins_path)
+ end
+
+ it "allows admins to permanently delete users" do
+ allow(Rails.configuration).to receive(:loadbalanced_configuration).and_return(true)
+ allow_any_instance_of(User).to receive(:greenlight_account?).and_return(true)
+ allow_any_instance_of(ApplicationController).to receive(:set_user_domain).and_return("provider1")
+ controller.instance_variable_set(:@user_domain, "provider1")
+
+ user = create(:user, provider: "provider1")
+ admin = create(:user, provider: "provider1")
+ admin.add_role :admin
+ @request.session[:user_id] = admin.id
+
+ delete :destroy, params: { user_uid: user.uid, permanent: "true" }
+
+ expect(User.include_deleted.find_by(uid: user.uid)).to be_nil
+ expect(flash[:success]).to be_present
+ expect(response).to redirect_to(admins_path)
+ end
+
+ it "permanently deletes the users rooms if the user is permanently deleted" do
+ allow(Rails.configuration).to receive(:loadbalanced_configuration).and_return(true)
+ allow_any_instance_of(User).to receive(:greenlight_account?).and_return(true)
+ allow_any_instance_of(ApplicationController).to receive(:set_user_domain).and_return("provider1")
+ controller.instance_variable_set(:@user_domain, "provider1")
+
+ user = create(:user, provider: "provider1")
+ admin = create(:user, provider: "provider1")
+ admin.add_role :admin
+ @request.session[:user_id] = admin.id
+ uid = user.main_room.uid
+
+ expect(Room.find_by(uid: uid)).to be_present
+
+ delete :destroy, params: { user_uid: user.uid, permanent: "true" }
+
+ expect(Room.include_deleted.find_by(uid: uid)).to be_nil
expect(flash[:success]).to be_present
expect(response).to redirect_to(admins_path)
end
@@ -435,7 +476,8 @@ describe UsersController, type: :controller do
delete :destroy, params: { user_uid: user.uid }
- expect(response).to redirect_to(root_path)
+ expect(flash[:alert]).to be_present
+ expect(response).to redirect_to(admins_path)
end
end
|