Enable / Disable user from web application #27333

AlexLaroche · 2017-03-08T05:20:03Z

Description

The option introduce permet to enable / disable to users management in the web application.

The option is available only to an admin or a subadmin.

Related Issue

#809
#12601

Motivation and Context

Easy management of the users.

How Has This Been Tested?

The functionnality have been test with the owncloud version 9.1.4.2 installed on Ubuntu 16.04.2 LTS.

Server version: Apache/2.4.18 (Ubuntu)
Server built: 2016-07-14T12:32:26
PHP 7.0.15-0ubuntu0.16.04.4

Screenshots (if appropriate):

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

My code follows the code style of this project.
My change requires a change to the documentation.
I have updated the documentation accordingly.
I have read the CONTRIBUTING document.
I have added tests to cover my changes.
All new and existing tests passed.

mention-bot · 2017-03-08T05:20:05Z

@AlexLaroche, thanks for your PR! By analyzing the history of the files in this pull request, we identified @DeepDiver1975, @ringmaster and @PVince81 to be potential reviewers.

CLAassistant · 2017-03-08T05:21:04Z

All committers have signed the CLA.

DeepDiver1975 · 2017-03-08T06:54:04Z

Thanks a lot! Please have a look at the failing unit tests. And also please get rid of that ajax/set enabled.php

PVince81 · 2017-03-08T09:47:40Z

And also please get rid of that ajax/set enabled.php

which means: please use the UsersController class instead.
Basically add a new method there, you can see one here for example: https://github.com/owncloud/core/blob/master/settings/Controller/UsersController.php#L621
Then put a matching route here: https://github.com/owncloud/core/blob/master/settings/routes.php#L50

Let us know if you need help 😄

DeepDiver1975 · 2017-03-08T23:21:40Z

@AlexLaroche 13 unit tests are failing - please have a look - in case you need guidance just let us know. THX

https://jenkins.owncloud.org/job/owncloud-core/job/core/job/PR-27333/2/testReport/

DeepDiver1975 · 2017-03-09T06:24:49Z

Nice! Great job!

PVince81 · 2017-03-09T09:08:41Z

@AlexLaroche tests passed, great. Please let us know when you think this is ready for another review. (you might still be tweaking stuff, we can't guess 😄)

AlexLaroche · 2017-03-09T12:39:33Z

It's ready for review. :)

PVince81 · 2017-03-09T13:36:57Z

TODO: prevent the current user to disable themselves (on API side and also remove the checkbox on frontend)
TODO: would be good to also have the "undo" feature. Basically don't perform the action before 7 seconds have expired. See how delete is done. Because disabling a user kills all their sessions which is a bit nasty.
TODO: add display name of the user in the notification: User "{someUser}" has been disabled (not "have been" which is plural)
I wonder if we should hide this column by default to avoid cluttering the UI like other fields (optional)

Other than that this seems to work nicely!

I'll have a look at the code.

PVince81 · 2017-03-09T13:40:31Z

BUG: as subadmin I can disable users not in my group. I see that you put in checks in the code but they don't seem to work.

Steps to reproduce:

Create three users "user1", "user2", "user3"
Add "user1" and "user2" into a group "group1"
Make "user1" a subadmin of group "group1"
Login as "user1"
Open the browser network console
Disable "user2"
Select the "enabled" request in the network console and do "copy as curl"
Paste the curl command in a terminal and replace "user2" with "user3" and run the command

Expected: 403 error
Actual: user3 got disabled

PVince81

Apart from some minor issues (and the bugs), the code looks good!

PVince81 · 2017-03-09T13:42:59Z

settings/Controller/UsersController.php

+                $userId = $this->userSession->getUser()->getUID();
+                $user = $this->userManager->get($id);
+
+                if($userId === $id


yes, prevent disabling yourself, but it seems this doesn't work correctly

PVince81 · 2017-03-09T13:43:57Z

settings/Controller/UsersController.php

+                        );
+                }
+
+		if($enabled !== 'true' && $enabled !== 'false')


Maybe convert this to a boolean directly at the beginning of the function ?
Booleans compared as strings usually give me the shivers 😄

PVince81 · 2017-03-09T13:45:22Z

settings/js/users/users.js

+        onEnabledChange: function() {
+                var $select = $(this);
+                var uid = UserList.getUID($select);
+                var enabled = $select.attr('checked') ? 'true' : 'false';


use the boolean $select.prop('checked') for better browser compatibility

PVince81 · 2017-03-09T13:45:36Z

settings/js/users/users.js

+                var enabled = $select.attr('checked') ? 'true' : 'false';
+                UserList._updateEnabled(uid, enabled, function(returnedEnabled){
+                        if (enabled !== returnedEnabled) {
+				$select.find('#isEnabled').attr("checked", user.isEnabled);


use $select.prop('checked', user.isEnabled) for better browser compatibility

PVince81 · 2017-03-09T13:47:25Z

settings/js/users/users.js

+			function (result) {
+                               	if(result.status == 'success') {
+					var msg = 'User have been ' + (result.data.enabled === 'true' ? 'enabled'  : 'disabled') + '!'; 
+					OC.Notification.showTemporary(t('admin', msg));


Please add the message directly inside the t() block instead of using a variable.
This is because the translation bot looks for the t() functions to find what text to submit for translation.

Also use a placeholder for the state: t('admin', 'User {displayName} has been {state}', {displayName: ..., state: stateText). and for the stateText: t('admin', 'enabled'), etc

PVince81 · 2017-03-09T13:48:41Z

settings/templates/users/part.userlist.php

@@ -46,6 +47,9 @@
 				><span class="title groupsList"></span><span class="icon-triangle-s"></span></div>
 			</td>
 		<?php endif;?>
+			<td class="enabled">
+				<input type="checkbox" id="isEnabled" checked="checked">


Please use a class instead of id because ids must be unique within the page but here it would be repeated across the page. This will also require changing your jQuery selectors.

PVince81 · 2017-03-17T07:52:25Z

@AlexLaroche ready for review again or are you still working on it ? (please always post a message when ready for review)

AlexLaroche · 2017-03-17T11:35:54Z

@PVince81 : In your requirements to merge the code, it still missing :

TODO: would be good to also have the "undo" feature. Basically don't perform the action before 7 seconds have expired. See how delete is done. Because disabling a user kills all their sessions which is a bit nasty.

I have don't time to add it for the moment. I will try to implement it when I will have more time.
It why a don't have ask for the moment for an another review.

PVince81 · 2017-03-17T12:13:17Z

I think the undo thing can be implemented separately.

Let me rereview.

PVince81 · 2017-03-17T12:37:23Z

settings/js/users/users.js

@@ -25,8 +26,11 @@ var UserList = {
 	initialize: function($el) {
 		this.$el = $el;

+		UserList.currentUser = document.getElementsByTagName('head')[0].getAttribute('data-user');


you can use OC.getCurrentUser().uid which would be slightly better

PVince81 · 2017-03-17T12:40:23Z

BUG: even though the checkbox "show enabled column" is disabled, if you refresh the page the column still appears. I couldn't spot the bug in the code after a quick look, maybe needs some debugging.

I've retested and apart from these two points I think this is good to go.

AlexLaroche · 2017-03-20T23:52:07Z

@PVince81 : All should be OK now. It was a single line of code that cause the bug. :)

PVince81 · 2017-03-21T08:42:07Z

Tested, works 👍
Great work, thanks a lot!

PVince81 · 2017-03-21T08:43:26Z

Added the feature list: https://github.com/owncloud/core/wiki/ownCloud-10.0-Features

lock · 2019-08-03T18:01:32Z

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

Enable / Disable user from web application

5896a5a

PVince81 added this to the 10.0 milestone Mar 8, 2017

PVince81 added 3 - To Review 2 - Developing and removed 3 - To Review labels Mar 8, 2017

Enable / Disable user : Remove ajax + correct UserController

9bbaeea

AlexLaroche added 5 commits March 8, 2017 18:46

Try to fix a test

fc22600

Fix typo

9438b3a

Fix tests

da08773

Fix typo

f0fb0e6

Minors fix

c25d379

PVince81 reviewed Mar 9, 2017

View reviewed changes

AlexLaroche added 8 commits March 10, 2017 18:14

Fix bug + code improvement

c0c08d4

UI : Remove possibility to disable itself

eeefa58

UI : Permit to hide the column Enabled in users settings

becc59d

Test : Admins and sub admins cannot disabled / enabled themselves

4aa1dd6

Test : Successfully enable / disable user

48c9bfa

Test : Successfully enable / disable user

aa3590b

Test : Successfully enable / disable user

ce4d369

Test : Sub admin cannot disable a user not accessible for him

6d8dfae

PVince81 added 3 - To Review and removed 2 - Developing labels Mar 17, 2017

PVince81 reviewed Mar 17, 2017

View reviewed changes

AlexLaroche added 2 commits March 17, 2017 18:00

Use OC.getCurrentUser().uid

ef59718

Update settings.css

d31f7e1

PVince81 merged commit 53c0129 into owncloud:master Mar 21, 2017

PVince81 mentioned this pull request Mar 21, 2017

[User Management] Disable a User #12601

Closed

lock bot locked as resolved and limited conversation to collaborators Aug 3, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Enable / Disable user from web application #27333

Enable / Disable user from web application #27333

AlexLaroche commented Mar 8, 2017 •

edited by DeepDiver1975

Loading

mention-bot commented Mar 8, 2017

CLAassistant commented Mar 8, 2017 •

edited

Loading

DeepDiver1975 commented Mar 8, 2017

PVince81 commented Mar 8, 2017

DeepDiver1975 commented Mar 8, 2017

DeepDiver1975 commented Mar 9, 2017

PVince81 commented Mar 9, 2017

AlexLaroche commented Mar 9, 2017

PVince81 commented Mar 9, 2017

PVince81 commented Mar 9, 2017

PVince81 left a comment

PVince81 Mar 9, 2017

PVince81 Mar 9, 2017

PVince81 Mar 9, 2017

PVince81 Mar 9, 2017

PVince81 Mar 9, 2017

PVince81 Mar 9, 2017

PVince81 commented Mar 17, 2017

AlexLaroche commented Mar 17, 2017

PVince81 commented Mar 17, 2017

PVince81 Mar 17, 2017

PVince81 commented Mar 17, 2017 •

edited

Loading

AlexLaroche commented Mar 20, 2017

PVince81 commented Mar 21, 2017

PVince81 commented Mar 21, 2017

lock bot commented Aug 3, 2019

Enable / Disable user from web application #27333

Enable / Disable user from web application #27333

Conversation

AlexLaroche commented Mar 8, 2017 • edited by DeepDiver1975 Loading

Description

Related Issue

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

Checklist:

mention-bot commented Mar 8, 2017

CLAassistant commented Mar 8, 2017 • edited Loading

DeepDiver1975 commented Mar 8, 2017

PVince81 commented Mar 8, 2017

DeepDiver1975 commented Mar 8, 2017

DeepDiver1975 commented Mar 9, 2017

PVince81 commented Mar 9, 2017

AlexLaroche commented Mar 9, 2017

PVince81 commented Mar 9, 2017

PVince81 commented Mar 9, 2017

PVince81 left a comment

Choose a reason for hiding this comment

PVince81 Mar 9, 2017

Choose a reason for hiding this comment

PVince81 Mar 9, 2017

Choose a reason for hiding this comment

PVince81 Mar 9, 2017

Choose a reason for hiding this comment

PVince81 Mar 9, 2017

Choose a reason for hiding this comment

PVince81 Mar 9, 2017

Choose a reason for hiding this comment

PVince81 Mar 9, 2017

Choose a reason for hiding this comment

PVince81 commented Mar 17, 2017

AlexLaroche commented Mar 17, 2017

PVince81 commented Mar 17, 2017

PVince81 Mar 17, 2017

Choose a reason for hiding this comment

PVince81 commented Mar 17, 2017 • edited Loading

AlexLaroche commented Mar 20, 2017

PVince81 commented Mar 21, 2017

PVince81 commented Mar 21, 2017

lock bot commented Aug 3, 2019

AlexLaroche commented Mar 8, 2017 •

edited by DeepDiver1975

Loading

CLAassistant commented Mar 8, 2017 •

edited

Loading

PVince81 commented Mar 17, 2017 •

edited

Loading